mercurial-scm/hg-stable: mercurial/crecord.py annotate

annotate mercurial/crecord.py @ 43425:be0f77fd274d stable

py3: fix handling of ctrl keys in crecord (issue6213) The "keypressed" value in handlekeypressed() is a key name obtained by curses's getkey(); this can be a multibyte string for special keys like CTRL keys. Calling curses.unctrl() with such a value fails on Python 3 with a TypeError as described in issue6213. (On Python 2, this does not crash, but I'm not sure the result is correct, though it does no matter here.) So instead of calling unctrl(), we compare "keypressed" with the expected "^L" obtained by curses.ascii.ctrl("L").

author	Denis Laxalde <denis.laxalde@logilab.fr>
date	Wed, 06 Nov 2019 16:54:34 +0100
parents	7cc913396f8c
children	9f70512ae2cf

rev	line source
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1 # stuff related specifically to patch manipulation / parsing
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2 #
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	3 # Copyright 2008 Mark Edgington <edgimar@gmail.com>
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	4 #
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	7 #
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	8 # This code is based on the Mark Edgington's crecord extension.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	9 # (Itself based on Bryan O'Sullivan's record extension.)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	10
25940 f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	11 from __future__ import absolute_import
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	12
25940 f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	13 import locale
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	14 import os
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	15 import re
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	16 import signal
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	17
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	18 from .i18n import _
43089 c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	19 from .pycompat import (
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	20 getattr,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	21 open,
c59eb1560c44 py3: manually import getattr where it is needed Gregory Szorc <gregory.szorc@gmail.com> parents: 43085 diff changeset	22 )
25940 f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	23 from . import (
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	24 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	25 error,
25940 f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	26 patch as patchmod,
30328 0911191dc4c9 crecord: use scmutil.termsize() Yuya Nishihara <yuya@tcha.org> parents: 29961 diff changeset	27 scmutil,
27156 55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	28 util,
25940 f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	29 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	30 from .utils import stringutil
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	31
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28638 diff changeset	32 stringio = util.stringio
24314 348492ba632a crecord: more import style Matt Mackall <mpm@selenic.com> parents: 24313 diff changeset	33
28637 4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	34 # patch comments based on the git one
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	35 diffhelptext = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	36 """# To remove '-' lines, make them ' ' lines (context).
28637 4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	37 # To remove '+' lines, delete them.
4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	38 # Lines starting with # will be removed from the patch.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	39 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	40 )
28637 4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	41
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	42 hunkhelptext = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	43 """#
28637 4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	44 # If the patch applies cleanly, the edited hunk will immediately be
4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	45 # added to the record list. If it does not apply cleanly, a rejects file
4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	46 # will be generated. You can use that when you try again. If all lines
4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	47 # of the hunk are removed, then the edit is aborted and the hunk is left
4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	48 # unchanged.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	49 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	50 )
28638 44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28637 diff changeset	51
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	52 patchhelptext = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	53 """#
28638 44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28637 diff changeset	54 # If the patch applies cleanly, the edited patch will immediately
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28637 diff changeset	55 # be finalised. If it does not apply cleanly, rejects files will be
44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28637 diff changeset	56 # generated. You can use those when you try again.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	57 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	58 )
28638 44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28637 diff changeset	59
27528 7cc654610204 crecord: use try/except for import of curses Sean Farley <sean@farley.io> parents: 26781 diff changeset	60 try:
24909 d71492ca2fdd crecord: fix mixed imports warning Matt Harbison <matt_harbison@yahoo.com> parents: 24840 diff changeset	61 import curses
43425 be0f77fd274d py3: fix handling of ctrl keys in crecord (issue6213) Denis Laxalde <denis.laxalde@logilab.fr> parents: 43424 diff changeset	62 import curses.ascii
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	63
27528 7cc654610204 crecord: use try/except for import of curses Sean Farley <sean@farley.io> parents: 26781 diff changeset	64 curses.error
7cc654610204 crecord: use try/except for import of curses Sean Farley <sean@farley.io> parents: 26781 diff changeset	65 except ImportError:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	66 # I have no idea if wcurses works with crecord...
24423 01b39e821d00 crecord: conditionalize the imports that are not available on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24351 diff changeset	67 try:
01b39e821d00 crecord: conditionalize the imports that are not available on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24351 diff changeset	68 import wcurses as curses
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	69
27528 7cc654610204 crecord: use try/except for import of curses Sean Farley <sean@farley.io> parents: 26781 diff changeset	70 curses.error
24423 01b39e821d00 crecord: conditionalize the imports that are not available on Windows Matt Harbison <matt_harbison@yahoo.com> parents: 24351 diff changeset	71 except ImportError:
27530 ba30ef5bba95 crecord: ensure that curses is False if not imported Sean Farley <sean@farley.io> parents: 27529 diff changeset	72 # wcurses is not shipped on Windows by default, or python is not
ba30ef5bba95 crecord: ensure that curses is False if not imported Sean Farley <sean@farley.io> parents: 27529 diff changeset	73 # compiled with curses
ba30ef5bba95 crecord: ensure that curses is False if not imported Sean Farley <sean@farley.io> parents: 27529 diff changeset	74 curses = False
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	75
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	76
38080 dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	77 class fallbackerror(error.Abort):
dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	78 """Error that indicates the client should try to fallback to text mode."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	79
38080 dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	80 # Inherits from error.Abort so that existing behavior is preserved if the
dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	81 # calling code does not know how to fallback.
dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	82
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	83
27529 940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	84 def checkcurses(ui):
940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	85 """Return True if the user wants to use curses
940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	86
940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	87 This method returns True if curses is found (and that python is built with
940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	88 it) and that the user has the correct flag for the ui.
940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	89 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	90 return curses and ui.interface(b"chunkselector") == b"curses"
27529 940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	91
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	92
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	93 class patchnode(object):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	94 """abstract class for patch graph nodes
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	95 (i.e. patchroot, header, hunk, hunkline)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	96 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	97
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	98 def firstchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	99 raise NotImplementedError(b"method must be implemented by subclass")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	100
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	101 def lastchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	102 raise NotImplementedError(b"method must be implemented by subclass")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	103
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	104 def allchildren(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	105 b"Return a list of all of the direct children of this node"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	106 raise NotImplementedError(b"method must be implemented by subclass")
29076 36d3535c6a47 crecord: add/remove blank lines (coding style) Anton Shestakov <av6@dwimlabs.net> parents: 28926 diff changeset	107
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	108 def nextsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	109 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	110 Return the closest next item of the same type where there are no items
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	111 of different types between the current item and this closest item.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	112 If no such item exists, return None.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	113 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	114 raise NotImplementedError(b"method must be implemented by subclass")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	115
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	116 def prevsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	117 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	118 Return the closest previous item of the same type where there are no
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	119 items of different types between the current item and this closest item.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	120 If no such item exists, return None.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	121 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	122 raise NotImplementedError(b"method must be implemented by subclass")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	123
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	124 def parentitem(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	125 raise NotImplementedError(b"method must be implemented by subclass")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	126
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	127 def nextitem(self, skipfolded=True):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	128 """
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	129 Try to return the next item closest to this item, regardless of item's
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	130 type (header, hunk, or hunkline).
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	131
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	132 If skipfolded == True, and the current item is folded, then the child
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	133 items that are hidden due to folding will be skipped when determining
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	134 the next item.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	135
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	136 If it is not possible to get the next item, return None.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	137 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	138 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	139 itemfolded = self.folded
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	140 except AttributeError:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	141 itemfolded = False
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	142 if skipfolded and itemfolded:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	143 nextitem = self.nextsibling()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	144 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	145 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	146 nextitem = self.parentitem().nextsibling()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	147 except AttributeError:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	148 nextitem = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	149 return nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	150 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	151 # try child
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	152 item = self.firstchild()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	153 if item is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	154 return item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	155
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	156 # else try next sibling
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	157 item = self.nextsibling()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	158 if item is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	159 return item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	160
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	161 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	162 # else try parent's next sibling
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	163 item = self.parentitem().nextsibling()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	164 if item is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	165 return item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	166
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	167 # else return grandparent's next sibling (or None)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	168 return self.parentitem().parentitem().nextsibling()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	169
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	170 except AttributeError: # parent and/or grandparent was None
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	171 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	172
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	173 def previtem(self):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	174 """
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	175 Try to return the previous item closest to this item, regardless of
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	176 item's type (header, hunk, or hunkline).
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	177
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	178 If it is not possible to get the previous item, return None.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	179 """
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	180 # try previous sibling's last child's last child,
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	181 # else try previous sibling's last child, else try previous sibling
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	182 prevsibling = self.prevsibling()
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	183 if prevsibling is not None:
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	184 prevsiblinglastchild = prevsibling.lastchild()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	185 if (prevsiblinglastchild is not None) and not prevsibling.folded:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	186 prevsiblinglclc = prevsiblinglastchild.lastchild()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	187 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	188 prevsiblinglclc is not None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	189 ) and not prevsiblinglastchild.folded:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	190 return prevsiblinglclc
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	191 else:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	192 return prevsiblinglastchild
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	193 else:
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	194 return prevsibling
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	195
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	196 # try parent (or None)
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	197 return self.parentitem()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	198
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	199
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	200 class patch(patchnode, list): # todo: rename patchroot
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	201 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	202 list of header objects representing the patch.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	203 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	204
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	205 def __init__(self, headerlist):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	206 self.extend(headerlist)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	207 # add parent patch object reference to each header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	208 for header in self:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	209 header.patch = self
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	210
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	211
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	212 class uiheader(patchnode):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	213 """patch header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	214
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26587 diff changeset	215 xxx shouldn't we move this to mercurial/patch.py ?
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	216 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	217
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	218 def __init__(self, header):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	219 self.nonuiheader = header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	220 # flag to indicate whether to apply this chunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	221 self.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	222 # flag which only affects the status display indicating if a node's
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	223 # children are partially applied (i.e. some applied, some not).
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	224 self.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	225
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	226 # flag to indicate whether to display as folded/unfolded to user
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	227 self.folded = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	228
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	229 # list of all headers in patch
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	230 self.patch = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	231
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	232 # flag is False if this header was ever unfolded from initial state
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	233 self.neverunfolded = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	234 self.hunks = [uihunk(h, self) for h in self.hunks]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	235
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	236 def prettystr(self):
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28638 diff changeset	237 x = stringio()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	238 self.pretty(x)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	239 return x.getvalue()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	240
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	241 def nextsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	242 numheadersinpatch = len(self.patch)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	243 indexofthisheader = self.patch.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	244
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	245 if indexofthisheader < numheadersinpatch - 1:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	246 nextheader = self.patch[indexofthisheader + 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	247 return nextheader
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	248 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	249 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	250
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	251 def prevsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	252 indexofthisheader = self.patch.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	253 if indexofthisheader > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	254 previousheader = self.patch[indexofthisheader - 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	255 return previousheader
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	256 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	257 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	258
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	259 def parentitem(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	260 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	261 there is no 'real' parent item of a header that can be selected,
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	262 so return None.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	263 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	264 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	265
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	266 def firstchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	267 b"return the first child of this item, if one exists. otherwise None."
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	268 if len(self.hunks) > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	269 return self.hunks[0]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	270 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	271 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	272
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	273 def lastchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	274 b"return the last child of this item, if one exists. otherwise None."
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	275 if len(self.hunks) > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	276 return self.hunks[-1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	277 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	278 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	279
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	280 def allchildren(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	281 b"return a list of all of the direct children of this node"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	282 return self.hunks
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	283
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	284 def __getattr__(self, name):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	285 return getattr(self.nonuiheader, name)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	286
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	287
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	288 class uihunkline(patchnode):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	289 b"represents a changed line in a hunk"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	290
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	291 def __init__(self, linetext, hunk):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	292 self.linetext = linetext
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	293 self.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	294 # the parent hunk to which this line belongs
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	295 self.hunk = hunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	296 # folding lines currently is not used/needed, but this flag is needed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	297 # in the previtem method.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	298 self.folded = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	299
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	300 def prettystr(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	301 return self.linetext
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	302
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	303 def nextsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	304 numlinesinhunk = len(self.hunk.changedlines)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	305 indexofthisline = self.hunk.changedlines.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	306
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	307 if indexofthisline < numlinesinhunk - 1:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	308 nextline = self.hunk.changedlines[indexofthisline + 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	309 return nextline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	310 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	311 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	312
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	313 def prevsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	314 indexofthisline = self.hunk.changedlines.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	315 if indexofthisline > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	316 previousline = self.hunk.changedlines[indexofthisline - 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	317 return previousline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	318 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	319 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	320
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	321 def parentitem(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	322 b"return the parent to the current item"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	323 return self.hunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	324
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	325 def firstchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	326 b"return the first child of this item, if one exists. otherwise None."
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	327 # hunk-lines don't have children
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	328 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	329
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	330 def lastchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	331 b"return the last child of this item, if one exists. otherwise None."
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	332 # hunk-lines don't have children
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	333 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	334
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	335
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	336 class uihunk(patchnode):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	337 """ui patch hunk, wraps a hunk and keep track of ui behavior """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	338
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	339 maxcontext = 3
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	340
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	341 def __init__(self, hunk, header):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	342 self._hunk = hunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	343 self.changedlines = [uihunkline(line, self) for line in hunk.hunk]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	344 self.header = header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	345 # used at end for detecting how many removed lines were un-applied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	346 self.originalremoved = self.removed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	347
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	348 # flag to indicate whether to display as folded/unfolded to user
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	349 self.folded = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	350 # flag to indicate whether to apply this chunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	351 self.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	352 # flag which only affects the status display indicating if a node's
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	353 # children are partially applied (i.e. some applied, some not).
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	354 self.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	355
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	356 def nextsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	357 numhunksinheader = len(self.header.hunks)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	358 indexofthishunk = self.header.hunks.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	359
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	360 if indexofthishunk < numhunksinheader - 1:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	361 nexthunk = self.header.hunks[indexofthishunk + 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	362 return nexthunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	363 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	364 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	365
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	366 def prevsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	367 indexofthishunk = self.header.hunks.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	368 if indexofthishunk > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	369 previoushunk = self.header.hunks[indexofthishunk - 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	370 return previoushunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	371 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	372 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	373
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	374 def parentitem(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	375 b"return the parent to the current item"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	376 return self.header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	377
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	378 def firstchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	379 b"return the first child of this item, if one exists. otherwise None."
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	380 if len(self.changedlines) > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	381 return self.changedlines[0]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	382 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	383 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	384
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	385 def lastchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	386 b"return the last child of this item, if one exists. otherwise None."
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	387 if len(self.changedlines) > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	388 return self.changedlines[-1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	389 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	390 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	391
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	392 def allchildren(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	393 b"return a list of all of the direct children of this node"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	394 return self.changedlines
29076 36d3535c6a47 crecord: add/remove blank lines (coding style) Anton Shestakov <av6@dwimlabs.net> parents: 28926 diff changeset	395
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	396 def countchanges(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	397 """changedlines -> (n+,n-)"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	398 add = len(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	399 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	400 l
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	401 for l in self.changedlines
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	402 if l.applied and l.prettystr().startswith(b'+')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	403 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	404 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	405 rem = len(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	406 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	407 l
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	408 for l in self.changedlines
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	409 if l.applied and l.prettystr().startswith(b'-')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	410 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	411 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	412 return add, rem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	413
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	414 def getfromtoline(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	415 # calculate the number of removed lines converted to context lines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	416 removedconvertedtocontext = self.originalremoved - self.removed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	417
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	418 contextlen = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	419 len(self.before) + len(self.after) + removedconvertedtocontext
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	420 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	421 if self.after and self.after[-1] == b'\\ No newline at end of file\n':
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	422 contextlen -= 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	423 fromlen = contextlen + self.removed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	424 tolen = contextlen + self.added
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	425
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	426 # diffutils manual, section "2.2.2.2 detailed description of unified
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	427 # format": "an empty hunk is considered to end at the line that
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	428 # precedes the hunk."
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	429 #
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	430 # so, if either of hunks is empty, decrease its line start. --immerrr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	431 # but only do this if fromline > 0, to avoid having, e.g fromline=-1.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	432 fromline, toline = self.fromline, self.toline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	433 if fromline != 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	434 if fromlen == 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	435 fromline -= 1
37875 03350f5234a4 crecord: fix line number in hunk header (issue5917) Jun Wu <quark@fb.com> parents: 37087 diff changeset	436 if tolen == 0 and toline > 0:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	437 toline -= 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	438
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	439 fromtoline = b'@@ -%d,%d +%d,%d @@%s\n' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	440 fromline,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	441 fromlen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	442 toline,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	443 tolen,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	444 self.proc and (b' ' + self.proc),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	445 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	446 return fromtoline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	447
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	448 def write(self, fp):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	449 # updated self.added/removed, which are used by getfromtoline()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	450 self.added, self.removed = self.countchanges()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	451 fp.write(self.getfromtoline())
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	452
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	453 hunklinelist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	454 # add the following to the list: (1) all applied lines, and
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	455 # (2) all unapplied removal lines (convert these to context lines)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	456 for changedline in self.changedlines:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	457 changedlinestr = changedline.prettystr()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	458 if changedline.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	459 hunklinelist.append(changedlinestr)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	460 elif changedlinestr.startswith(b"-"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	461 hunklinelist.append(b" " + changedlinestr[1:])
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	462
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	463 fp.write(b''.join(self.before + hunklinelist + self.after))
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	464
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	465 pretty = write
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	466
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	467 def prettystr(self):
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28638 diff changeset	468 x = stringio()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	469 self.pretty(x)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	470 return x.getvalue()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	471
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	472 def reversehunk(self):
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	473 """return a recordhunk which is the reverse of the hunk
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	474
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	475 Assuming the displayed patch is diff(A, B) result. The returned hunk is
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	476 intended to be applied to B, instead of A.
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	477
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	478 For example, when A is "0\n1\n2\n6\n" and B is "0\n3\n4\n5\n6\n", and
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	479 the user made the following selection:
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	480
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	481 0
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	482 [x] -1 [x]: selected
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	483 [ ] -2 [ ]: not selected
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	484 [x] +3
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	485 [ ] +4
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	486 [x] +5
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	487 6
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	488
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	489 This function returns a hunk like:
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	490
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	491 0
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	492 -3
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	493 -4
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	494 -5
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	495 +1
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	496 +4
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	497 6
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	498
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	499 Note "4" was first deleted then added. That's because "4" exists in B
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	500 side and "-4" must exist between "-3" and "-5" to make the patch
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	501 applicable to B.
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	502 """
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	503 dels = []
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	504 adds = []
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	505 for line in self.changedlines:
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	506 text = line.linetext
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	507 if line.applied:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	508 if text.startswith(b'+'):
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	509 dels.append(text[1:])
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	510 elif text.startswith(b'-'):
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	511 adds.append(text[1:])
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	512 elif text.startswith(b'+'):
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	513 dels.append(text[1:])
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	514 adds.append(text[1:])
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	515 hunk = [b'-%s' % l for l in dels] + [b'+%s' % l for l in adds]
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	516 h = self._hunk
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	517 return patchmod.recordhunk(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	518 h.header, h.toline, h.fromline, h.proc, h.before, hunk, h.after
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	519 )
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	520
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	521 def __getattr__(self, name):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	522 return getattr(self._hunk, name)
29076 36d3535c6a47 crecord: add/remove blank lines (coding style) Anton Shestakov <av6@dwimlabs.net> parents: 28926 diff changeset	523
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	524 def __repr__(self):
41439 5c73441a47e5 crecord: always return a str from uihunk.__repr__ Gregory Szorc <gregory.szorc@gmail.com> parents: 40413 diff changeset	525 return r'<hunk %r@%d>' % (self.filename(), self.fromline)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	526
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	527
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	528 def filterpatch(ui, chunks, chunkselector, operation=None):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	529 """interactively filter patch chunks into applied-only chunks"""
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	530 chunks = list(chunks)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	531 # convert chunks list into structure suitable for displaying/modifying
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	532 # with curses. create a list of headers only.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	533 headers = [c for c in chunks if isinstance(c, patchmod.header)]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	534
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	535 # if there are no changed files
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	536 if len(headers) == 0:
27321 dcdf0a52ad36 crecord: add dictionary to default return value of filterpatch Laurent Charignon <lcharignon@fb.com> parents: 27156 diff changeset	537 return [], {}
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	538 uiheaders = [uiheader(h) for h in headers]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	539 # let user choose headers/hunks/lines, and mark their applied flags
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	540 # accordingly
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	541 ret = chunkselector(ui, uiheaders, operation=operation)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	542 appliedhunklist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	543 for hdr in uiheaders:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	544 if hdr.applied and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	545 hdr.special() or len([h for h in hdr.hunks if h.applied]) > 0
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	546 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	547 appliedhunklist.append(hdr)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	548 fixoffset = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	549 for hnk in hdr.hunks:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	550 if hnk.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	551 appliedhunklist.append(hnk)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	552 # adjust the 'to'-line offset of the hunk to be correct
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	553 # after de-activating some of the other hunks for this file
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	554 if fixoffset:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	555 # hnk = copy.copy(hnk) # necessary??
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	556 hnk.toline += fixoffset
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	557 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	558 fixoffset += hnk.removed - hnk.added
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	559
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 26781 diff changeset	560 return (appliedhunklist, ret)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	561
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	562
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	563 def chunkselector(ui, headerlist, operation=None):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	564 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	565 curses interface to get selection of chunks, and mark the applied flags
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	566 of the chosen chunks.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	567 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	568 ui.write(_(b'starting interactive selection\n'))
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	569 chunkselector = curseschunkselector(headerlist, ui, operation)
42650 701341f57ceb curses: do not setlocale() at import time (issue5261) Yuya Nishihara <yuya@tcha.org> parents: 42573 diff changeset	570 # This is required for ncurses to display non-ASCII characters in
701341f57ceb curses: do not setlocale() at import time (issue5261) Yuya Nishihara <yuya@tcha.org> parents: 42573 diff changeset	571 # default user locale encoding correctly. --immerrr
701341f57ceb curses: do not setlocale() at import time (issue5261) Yuya Nishihara <yuya@tcha.org> parents: 42573 diff changeset	572 locale.setlocale(locale.LC_ALL, r'')
31933 b2478a996a82 crecord: avoid setting non-existing SIGTSTP signal on windows (issue5512) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31932 diff changeset	573 origsigtstp = sentinel = object()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	574 if util.safehasattr(signal, b'SIGTSTP'):
31933 b2478a996a82 crecord: avoid setting non-existing SIGTSTP signal on windows (issue5512) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31932 diff changeset	575 origsigtstp = signal.getsignal(signal.SIGTSTP)
31932 20a68f714f9b crecord: ensure we reinstall the SIGTSTP handler Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31931 diff changeset	576 try:
20a68f714f9b crecord: ensure we reinstall the SIGTSTP handler Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31931 diff changeset	577 curses.wrapper(chunkselector.main)
38080 dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	578 if chunkselector.initexc is not None:
dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	579 raise chunkselector.initexc
31932 20a68f714f9b crecord: ensure we reinstall the SIGTSTP handler Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31931 diff changeset	580 # ncurses does not restore signal handler for SIGTSTP
20a68f714f9b crecord: ensure we reinstall the SIGTSTP handler Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31931 diff changeset	581 finally:
31933 b2478a996a82 crecord: avoid setting non-existing SIGTSTP signal on windows (issue5512) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31932 diff changeset	582 if origsigtstp is not sentinel:
b2478a996a82 crecord: avoid setting non-existing SIGTSTP signal on windows (issue5512) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31932 diff changeset	583 signal.signal(signal.SIGTSTP, origsigtstp)
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 26781 diff changeset	584 return chunkselector.opts
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	585
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	586
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	587 def testdecorator(testfn, f):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	588 def u(args, *kwargs):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	589 return f(testfn, args, *kwargs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	590
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	591 return u
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	592
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	593
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	594 def testchunkselector(testfn, ui, headerlist, operation=None):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	595 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	596 test interface to get selection of chunks, and mark the applied flags
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	597 of the chosen chunks.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	598 """
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	599 chunkselector = curseschunkselector(headerlist, ui, operation)
41991 3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	600
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	601 class dummystdscr(object):
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	602 def clear(self):
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	603 pass
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	604
41991 3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	605 def refresh(self):
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	606 pass
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	607
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	608 chunkselector.stdscr = dummystdscr()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	609 if testfn and os.path.exists(testfn):
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	610 testf = open(testfn, 'r')
7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	611 testcommands = [x.rstrip('\n') for x in testf.readlines()]
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	612 testf.close()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	613 while True:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	614 if chunkselector.handlekeypressed(testcommands.pop(0), test=True):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	615 break
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 26781 diff changeset	616 return chunkselector.opts
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	617
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	618
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	619 _headermessages = { # {operation: text}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	620 b'apply': _(b'Select hunks to apply'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	621 b'discard': _(b'Select hunks to discard'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	622 b'keep': _(b'Select hunks to keep'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	623 None: _(b'Select hunks to record'),
30557 8d9745ff1e62 crecord: change the verb according to the operation Jun Wu <quark@fb.com> parents: 30556 diff changeset	624 }
8d9745ff1e62 crecord: change the verb according to the operation Jun Wu <quark@fb.com> parents: 30556 diff changeset	625
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	626
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	627 class curseschunkselector(object):
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	628 def __init__(self, headerlist, ui, operation=None):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	629 # put the headers into a patch object
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	630 self.headerlist = patch(headerlist)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	631
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	632 self.ui = ui
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 26781 diff changeset	633 self.opts = {}
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	634
25556 40f0e9e5b821 crecord: add mechanism for error reporting Laurent Charignon <lcharignon@fb.com> parents: 25555 diff changeset	635 self.errorstr = None
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	636 # list of all chunks
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	637 self.chunklist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	638 for h in headerlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	639 self.chunklist.append(h)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	640 self.chunklist.extend(h.hunks)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	641
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	642 # dictionary mapping (fgcolor, bgcolor) pairs to the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	643 # corresponding curses color-pair value.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	644 self.colorpairs = {}
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	645 # maps custom nicknames of color-pairs to curses color-pair values
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	646 self.colorpairnames = {}
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	647
35531 f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	648 # Honor color setting of ui section. Keep colored setup as
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	649 # long as not explicitly set to a falsy value - especially,
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	650 # when not set at all. This is to stay most compatible with
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	651 # previous (color only) behaviour.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	652 uicolor = stringutil.parsebool(self.ui.config(b'ui', b'color'))
35531 f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	653 self.usecolor = uicolor is not False
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	654
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	655 # the currently selected header, hunk, or hunk-line
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	656 self.currentselecteditem = self.headerlist[0]
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	657 self.lastapplieditem = None
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	658
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	659 # updated when printing out patch-display -- the 'lines' here are the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	660 # line positions in the pad, not on the screen.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	661 self.selecteditemstartline = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	662 self.selecteditemendline = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	663
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	664 # define indentation levels
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	665 self.headerindentnumchars = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	666 self.hunkindentnumchars = 3
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	667 self.hunklineindentnumchars = 6
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	668
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	669 # the first line of the pad to print to the screen
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	670 self.firstlineofpadtoprint = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	671
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	672 # keeps track of the number of lines in the pad
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	673 self.numpadlines = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	674
30554 f3cff00c7a00 crecord: make _getstatuslines update numstatuslines Jun Wu <quark@fb.com> parents: 30553 diff changeset	675 self.numstatuslines = 1
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	676
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	677 # keep a running count of the number of lines printed to the pad
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	678 # (used for determining when the selected item begins/ends)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	679 self.linesprintedtopadsofar = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	680
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	681 # stores optional text for a commit comment provided by the user
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	682 self.commenttext = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	683
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	684 # if the last 'toggle all' command caused all changes to be applied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	685 self.waslasttoggleallapplied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	686
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	687 # affects some ui text
30557 8d9745ff1e62 crecord: change the verb according to the operation Jun Wu <quark@fb.com> parents: 30556 diff changeset	688 if operation not in _headermessages:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	689 raise error.ProgrammingError(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	690 b'unexpected operation: %s' % operation
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	691 )
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	692 self.operation = operation
40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	693
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	694 def uparrowevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	695 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	696 try to select the previous item to the current item that has the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	697 most-indented level. for example, if a hunk is selected, try to select
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	698 the last hunkline of the hunk prior to the selected hunk. or, if
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	699 the first hunkline of a hunk is currently selected, then select the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	700 hunk itself.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	701 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	702 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	703
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	704 nextitem = currentitem.previtem()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	705
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	706 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	707 # if no parent item (i.e. currentitem is the first header), then
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	708 # no change...
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	709 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	710
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	711 self.currentselecteditem = nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	712
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	713 def uparrowshiftevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	714 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	715 select (if possible) the previous item on the same level as the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	716 currently selected item. otherwise, select (if possible) the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	717 parent-item of the currently selected item.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	718 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	719 currentitem = self.currentselecteditem
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	720 nextitem = currentitem.prevsibling()
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	721 # if there's no previous sibling, try choosing the parent
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	722 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	723 nextitem = currentitem.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	724 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	725 # if no parent item (i.e. currentitem is the first header), then
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	726 # no change...
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	727 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	728
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	729 self.currentselecteditem = nextitem
38419 96871ca32270 crecord: re-center display in interactive curses commit on pageup/down Matti Hamalainen <ccr@tnsp.org> parents: 38115 diff changeset	730 self.recenterdisplayedarea()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	731
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	732 def downarrowevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	733 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	734 try to select the next item to the current item that has the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	735 most-indented level. for example, if a hunk is selected, select
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	736 the first hunkline of the selected hunk. or, if the last hunkline of
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	737 a hunk is currently selected, then select the next hunk, if one exists,
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	738 or if not, the next header if one exists.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	739 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	740 # self.startprintline += 1 #debug
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	741 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	742
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	743 nextitem = currentitem.nextitem()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	744 # if there's no next item, keep the selection as-is
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	745 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	746 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	747
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	748 self.currentselecteditem = nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	749
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	750 def downarrowshiftevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	751 """
29081 4abca4cbe768 crecord: update downarrowshiftevent() docstring, remove todo Anton Shestakov <av6@dwimlabs.net> parents: 29080 diff changeset	752 select (if possible) the next item on the same level as the currently
4abca4cbe768 crecord: update downarrowshiftevent() docstring, remove todo Anton Shestakov <av6@dwimlabs.net> parents: 29080 diff changeset	753 selected item. otherwise, select (if possible) the next item on the
4abca4cbe768 crecord: update downarrowshiftevent() docstring, remove todo Anton Shestakov <av6@dwimlabs.net> parents: 29080 diff changeset	754 same level as the parent item of the currently selected item.
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	755 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	756 currentitem = self.currentselecteditem
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	757 nextitem = currentitem.nextsibling()
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	758 # if there's no next sibling, try choosing the parent's nextsibling
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	759 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	760 try:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	761 nextitem = currentitem.parentitem().nextsibling()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	762 except AttributeError:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	763 # parentitem returned None, so nextsibling() can't be called
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	764 nextitem = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	765 if nextitem is None:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	766 # if parent has no next sibling, then no change...
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	767 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	768
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	769 self.currentselecteditem = nextitem
38419 96871ca32270 crecord: re-center display in interactive curses commit on pageup/down Matti Hamalainen <ccr@tnsp.org> parents: 38115 diff changeset	770 self.recenterdisplayedarea()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	771
42572 cd4f1b7c3192 crecord: make KEY_ENTER usable in tests (by not updating UI) Kyle Lippincott <spectral@google.com> parents: 42571 diff changeset	772 def nextsametype(self, test=False):
40253 682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	773 currentitem = self.currentselecteditem
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	774 sametype = lambda item: isinstance(item, type(currentitem))
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	775 nextitem = currentitem.nextitem()
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	776
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	777 while nextitem is not None and not sametype(nextitem):
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	778 nextitem = nextitem.nextitem()
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	779
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	780 if nextitem is None:
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	781 nextitem = currentitem
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	782 else:
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	783 parent = nextitem.parentitem()
40413 7e4ffe2719e4 crecord: make nextsametype() check that parent item exists (issue6009) Anton Shestakov <av6@dwimlabs.net> parents: 40253 diff changeset	784 if parent is not None and parent.folded:
40253 682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	785 self.togglefolded(parent)
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	786
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	787 self.currentselecteditem = nextitem
42572 cd4f1b7c3192 crecord: make KEY_ENTER usable in tests (by not updating UI) Kyle Lippincott <spectral@google.com> parents: 42571 diff changeset	788 if not test:
cd4f1b7c3192 crecord: make KEY_ENTER usable in tests (by not updating UI) Kyle Lippincott <spectral@google.com> parents: 42571 diff changeset	789 self.recenterdisplayedarea()
40253 682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	790
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	791 def rightarrowevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	792 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	793 select (if possible) the first of this item's child-items.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	794 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	795 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	796 nextitem = currentitem.firstchild()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	797
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	798 # turn off folding if we want to show a child-item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	799 if currentitem.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	800 self.togglefolded(currentitem)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	801
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	802 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	803 # if no next item on parent-level, then no change...
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	804 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	805
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	806 self.currentselecteditem = nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	807
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	808 def leftarrowevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	809 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	810 if the current item can be folded (i.e. it is an unfolded header or
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	811 hunk), then fold it. otherwise try select (if possible) the parent
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	812 of this item.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	813 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	814 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	815
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	816 # try to fold the item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	817 if not isinstance(currentitem, uihunkline):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	818 if not currentitem.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	819 self.togglefolded(item=currentitem)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	820 return
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	821
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	822 # if it can't be folded, try to select the parent item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	823 nextitem = currentitem.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	824
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	825 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	826 # if no item on parent-level, then no change...
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	827 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	828 if not nextitem.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	829 self.togglefolded(item=nextitem)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	830
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	831 self.currentselecteditem = nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	832
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	833 def leftarrowshiftevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	834 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	835 select the header of the current item (or fold current item if the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	836 current item is already a header).
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	837 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	838 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	839
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	840 if isinstance(currentitem, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	841 if not currentitem.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	842 self.togglefolded(item=currentitem)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	843 return
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	844
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	845 # select the parent item recursively until we're at a header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	846 while True:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	847 nextitem = currentitem.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	848 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	849 break
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	850 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	851 currentitem = nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	852
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	853 self.currentselecteditem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	854
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	855 def updatescroll(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	856 b"scroll the screen to fully show the currently-selected"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	857 selstart = self.selecteditemstartline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	858 selend = self.selecteditemendline
29946 3664537386ab crecord: delete commented line Nathan Goldbaum <ngoldbau@illinois.edu> parents: 29941 diff changeset	859
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	860 padstart = self.firstlineofpadtoprint
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	861 padend = padstart + self.yscreensize - self.numstatuslines - 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	862 # 'buffered' pad start/end values which scroll with a certain
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	863 # top/bottom context margin
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	864 padstartbuffered = padstart + 3
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	865 padendbuffered = padend - 3
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	866
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	867 if selend > padendbuffered:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	868 self.scrolllines(selend - padendbuffered)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	869 elif selstart < padstartbuffered:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	870 # negative values scroll in pgup direction
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	871 self.scrolllines(selstart - padstartbuffered)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	872
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	873 def scrolllines(self, numlines):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	874 b"scroll the screen up (down) by numlines when numlines >0 (<0)."
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	875 self.firstlineofpadtoprint += numlines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	876 if self.firstlineofpadtoprint < 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	877 self.firstlineofpadtoprint = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	878 if self.firstlineofpadtoprint > self.numpadlines - 1:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	879 self.firstlineofpadtoprint = self.numpadlines - 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	880
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	881 def toggleapply(self, item=None):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	882 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	883 toggle the applied flag of the specified item. if no item is specified,
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	884 toggle the flag of the currently selected item.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	885 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	886 if item is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	887 item = self.currentselecteditem
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	888 # Only set this when NOT using 'toggleall'
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	889 self.lastapplieditem = item
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	890
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	891 item.applied = not item.applied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	892
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	893 if isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	894 item.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	895 if item.applied:
24492 efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	896 # apply all its hunks
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	897 for hnk in item.hunks:
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	898 hnk.applied = True
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	899 # apply all their hunklines
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	900 for hunkline in hnk.changedlines:
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	901 hunkline.applied = True
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	902 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	903 # un-apply all its hunks
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	904 for hnk in item.hunks:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	905 hnk.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	906 hnk.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	907 # un-apply all their hunklines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	908 for hunkline in hnk.changedlines:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	909 hunkline.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	910 elif isinstance(item, uihunk):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	911 item.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	912 # apply all it's hunklines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	913 for hunkline in item.changedlines:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	914 hunkline.applied = item.applied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	915
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	916 siblingappliedstatus = [hnk.applied for hnk in item.header.hunks]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	917 allsiblingsapplied = not (False in siblingappliedstatus)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	918 nosiblingsapplied = not (True in siblingappliedstatus)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	919
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	920 siblingspartialstatus = [hnk.partial for hnk in item.header.hunks]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	921 somesiblingspartial = True in siblingspartialstatus
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	922
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	923 # cases where applied or partial should be removed from header
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	924
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	925 # if no 'sibling' hunks are applied (including this hunk)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	926 if nosiblingsapplied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	927 if not item.header.special():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	928 item.header.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	929 item.header.partial = False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	930 else: # some/all parent siblings are applied
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	931 item.header.applied = True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	932 item.header.partial = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	933 somesiblingspartial or not allsiblingsapplied
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	934 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	935
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	936 elif isinstance(item, uihunkline):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	937 siblingappliedstatus = [ln.applied for ln in item.hunk.changedlines]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	938 allsiblingsapplied = not (False in siblingappliedstatus)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	939 nosiblingsapplied = not (True in siblingappliedstatus)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	940
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	941 # if no 'sibling' lines are applied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	942 if nosiblingsapplied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	943 item.hunk.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	944 item.hunk.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	945 elif allsiblingsapplied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	946 item.hunk.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	947 item.hunk.partial = False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	948 else: # some siblings applied
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	949 item.hunk.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	950 item.hunk.partial = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	951
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	952 parentsiblingsapplied = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	953 hnk.applied for hnk in item.hunk.header.hunks
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	954 ]
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	955 noparentsiblingsapplied = not (True in parentsiblingsapplied)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	956 allparentsiblingsapplied = not (False in parentsiblingsapplied)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	957
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	958 parentsiblingspartial = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	959 hnk.partial for hnk in item.hunk.header.hunks
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	960 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	961 someparentsiblingspartial = True in parentsiblingspartial
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	962
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	963 # if all parent hunks are not applied, un-apply header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	964 if noparentsiblingsapplied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	965 if not item.hunk.header.special():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	966 item.hunk.header.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	967 item.hunk.header.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	968 # set the applied and partial status of the header if needed
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	969 else: # some/all parent siblings are applied
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	970 item.hunk.header.applied = True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	971 item.hunk.header.partial = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	972 someparentsiblingspartial or not allparentsiblingsapplied
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	973 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	974
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	975 def toggleall(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	976 b"toggle the applied flag of all items."
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	977 if self.waslasttoggleallapplied: # then unapply them this time
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	978 for item in self.headerlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	979 if item.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	980 self.toggleapply(item)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	981 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	982 for item in self.headerlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	983 if not item.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	984 self.toggleapply(item)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	985 self.waslasttoggleallapplied = not self.waslasttoggleallapplied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	986
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	987 def toggleallbetween(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	988 b"toggle applied on or off for all items in range [lastapplied,current]."
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	989 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	990 not self.lastapplieditem
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	991 or self.currentselecteditem == self.lastapplieditem
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	992 ):
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	993 # Treat this like a normal 'x'/' '
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	994 self.toggleapply()
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	995 return
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	996
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	997 startitem = self.lastapplieditem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	998 enditem = self.currentselecteditem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	999 # Verify that enditem is "after" startitem, otherwise swap them.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1000 for direction in [b'forward', b'reverse']:
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1001 nextitem = startitem.nextitem()
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1002 while nextitem and nextitem != enditem:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1003 nextitem = nextitem.nextitem()
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1004 if nextitem:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1005 break
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1006 # Looks like we went the wrong direction :)
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1007 startitem, enditem = enditem, startitem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1008
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1009 if not nextitem:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1010 # We didn't find a path going either forward or backward? Don't know
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1011 # how this can happen, let's not crash though.
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1012 return
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1013
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1014 nextitem = startitem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1015 # Switch all items to be the opposite state of the currently selected
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1016 # item. Specifically:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1017 # [ ] startitem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1018 # [x] middleitem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1019 # [ ] enditem <-- currently selected
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1020 # This will turn all three on, since the currently selected item is off.
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1021 # This does not invert each item (i.e. middleitem stays marked/on)
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1022 desiredstate = not self.currentselecteditem.applied
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1023 while nextitem != enditem.nextitem():
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1024 if nextitem.applied != desiredstate:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1025 self.toggleapply(item=nextitem)
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1026 nextitem = nextitem.nextitem()
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1027
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1028 def togglefolded(self, item=None, foldparent=False):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1029 b"toggle folded flag of specified item (defaults to currently selected)"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1030 if item is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1031 item = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1032 if foldparent or (isinstance(item, uiheader) and item.neverunfolded):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1033 if not isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1034 # we need to select the parent item in this case
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1035 self.currentselecteditem = item = item.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1036 elif item.neverunfolded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1037 item.neverunfolded = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1038
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1039 # also fold any foldable children of the parent/current item
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1040 if isinstance(item, uiheader): # the original or 'new' item
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1041 for child in item.allchildren():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1042 child.folded = not item.folded
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1043
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1044 if isinstance(item, (uiheader, uihunk)):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1045 item.folded = not item.folded
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1046
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1047 def alignstring(self, instr, window):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1048 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1049 add whitespace to the end of a string in order to make it fill
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1050 the screen in the x direction. the current cursor position is
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1051 taken into account when making this calculation. the string can span
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1052 multiple lines.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1053 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1054 y, xstart = window.getyx()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1055 width = self.xscreensize
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1056 # turn tabs into spaces
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1057 instr = instr.expandtabs(4)
24351 cdc4f3af2497 crecord: use colwidth instead of ucolwidth Matt Mackall <mpm@selenic.com> parents: 24342 diff changeset	1058 strwidth = encoding.colwidth(instr)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1059 numspaces = width - ((strwidth + xstart) % width)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1060 return instr + b" " * numspaces
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1061
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1062 def printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1063 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1064 window,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1065 text,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1066 fgcolor=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1067 bgcolor=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1068 pair=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1069 pairname=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1070 attrlist=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1071 towin=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1072 align=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1073 showwhtspc=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1074 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1075 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1076 print the string, text, with the specified colors and attributes, to
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1077 the specified curses window object.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1078
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1079 the foreground and background colors are of the form
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1080 curses.color_xxxx, where xxxx is one of: [black, blue, cyan, green,
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1081 magenta, red, white, yellow]. if pairname is provided, a color
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1082 pair will be looked up in the self.colorpairnames dictionary.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1083
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1084 attrlist is a list containing text attributes in the form of
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1085 curses.a_xxxx, where xxxx can be: [bold, dim, normal, standout,
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1086 underline].
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1087
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1088 if align == True, whitespace is added to the printed string such that
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1089 the string stretches to the right border of the window.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1090
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1091 if showwhtspc == True, trailing whitespace of a string is highlighted.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1092 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1093 # preprocess the text, converting tabs to spaces
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1094 text = text.expandtabs(4)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1095 # strip \n, and convert control characters to ^[char] representation
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1096 text = re.sub(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1097 br'[\x00-\x08\x0a-\x1f]',
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1098 lambda m: b'^' + chr(ord(m.group()) + 64),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1099 text.strip(b'\n'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1100 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1101
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1102 if pair is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1103 colorpair = pair
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1104 elif pairname is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1105 colorpair = self.colorpairnames[pairname]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1106 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1107 if fgcolor is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1108 fgcolor = -1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1109 if bgcolor is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1110 bgcolor = -1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1111 if (fgcolor, bgcolor) in self.colorpairs:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1112 colorpair = self.colorpairs[(fgcolor, bgcolor)]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1113 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1114 colorpair = self.getcolorpair(fgcolor, bgcolor)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1115 # add attributes if possible
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1116 if attrlist is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1117 attrlist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1118 if colorpair < 256:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1119 # then it is safe to apply all attributes
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1120 for textattr in attrlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1121 colorpair \|= textattr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1122 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1123 # just apply a select few (safe?) attributes
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1124 for textattr in (curses.A_UNDERLINE, curses.A_BOLD):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1125 if textattr in attrlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1126 colorpair \|= textattr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1127
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1128 y, xstart = self.chunkpad.getyx()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1129 t = b"" # variable for counting lines printed
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1130 # if requested, show trailing whitespace
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1131 if showwhtspc:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1132 origlen = len(text)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1133 text = text.rstrip(b' \n') # tabs have already been expanded
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1134 strippedlen = len(text)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1135 numtrailingspaces = origlen - strippedlen
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1136
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1137 if towin:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1138 window.addstr(text, colorpair)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1139 t += text
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1140
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1141 if showwhtspc:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1142 wscolorpair = colorpair \| curses.A_REVERSE
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1143 if towin:
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1144 for i in range(numtrailingspaces):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1145 window.addch(curses.ACS_CKBOARD, wscolorpair)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1146 t += b" " * numtrailingspaces
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1147
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1148 if align:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1149 if towin:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1150 extrawhitespace = self.alignstring(b"", window)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1151 window.addstr(extrawhitespace, colorpair)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1152 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1153 # need to use t, since the x position hasn't incremented
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1154 extrawhitespace = self.alignstring(t, window)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1155 t += extrawhitespace
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1156
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1157 # is reset to 0 at the beginning of printitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1158
43159 b02387005515 py3: use integer division in curseschunkselector.printstring() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43158 diff changeset	1159 linesprinted = (xstart + len(t)) // self.xscreensize
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1160 self.linesprintedtopadsofar += linesprinted
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1161 return t
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1162
30555 9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1163 def _getstatuslinesegments(self):
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1164 """-> [str]. return segments"""
30556 5129ed3c2548 crecord: change help text for the space key dynamically Jun Wu <quark@fb.com> parents: 30555 diff changeset	1165 selected = self.currentselecteditem.applied
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1166 spaceselect = _(b'space/enter: select')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1167 spacedeselect = _(b'space/enter: deselect')
33834 1e71a27dee97 crecord: fixes the formatting of the select status in the status line Filip Filmar <filmil@gmail.com> parents: 32997 diff changeset	1168 # Format the selected label into a place as long as the longer of the
1e71a27dee97 crecord: fixes the formatting of the select status in the status line Filip Filmar <filmil@gmail.com> parents: 32997 diff changeset	1169 # two possible labels. This may vary by language.
1e71a27dee97 crecord: fixes the formatting of the select status in the status line Filip Filmar <filmil@gmail.com> parents: 32997 diff changeset	1170 spacelen = max(len(spaceselect), len(spacedeselect))
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1171 selectedlabel = b'%-*s' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1172 spacelen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1173 spacedeselect if selected else spaceselect,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1174 )
30555 9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1175 segments = [
30557 8d9745ff1e62 crecord: change the verb according to the operation Jun Wu <quark@fb.com> parents: 30556 diff changeset	1176 _headermessages[self.operation],
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1177 b'-',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1178 _(b'[x]=selected **=collapsed'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1179 _(b'c: confirm'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1180 _(b'q: abort'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1181 _(b'arrow keys: move/expand/collapse'),
33834 1e71a27dee97 crecord: fixes the formatting of the select status in the status line Filip Filmar <filmil@gmail.com> parents: 32997 diff changeset	1182 selectedlabel,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1183 _(b'?: help'),
30555 9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1184 ]
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1185 return segments
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1186
30553 d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1187 def _getstatuslines(self):
d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1188 """() -> [str]. return short help used in the top status window"""
d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1189 if self.errorstr is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1190 lines = [self.errorstr, _(b'Press any key to continue')]
30553 d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1191 else:
30555 9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1192 # wrap segments to lines
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1193 segments = self._getstatuslinesegments()
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1194 width = self.xscreensize
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1195 lines = []
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1196 lastwidth = width
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1197 for s in segments:
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1198 w = encoding.colwidth(s)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1199 sep = b' ' * (1 + (s and s[0] not in b'-['))
30555 9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1200 if lastwidth + w + len(sep) >= width:
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1201 lines.append(s)
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1202 lastwidth = w
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1203 else:
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1204 lines[-1] += sep + s
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1205 lastwidth += w + len(sep)
30554 f3cff00c7a00 crecord: make _getstatuslines update numstatuslines Jun Wu <quark@fb.com> parents: 30553 diff changeset	1206 if len(lines) != self.numstatuslines:
f3cff00c7a00 crecord: make _getstatuslines update numstatuslines Jun Wu <quark@fb.com> parents: 30553 diff changeset	1207 self.numstatuslines = len(lines)
f3cff00c7a00 crecord: make _getstatuslines update numstatuslines Jun Wu <quark@fb.com> parents: 30553 diff changeset	1208 self.statuswin.resize(self.numstatuslines, self.xscreensize)
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 36466 diff changeset	1209 return [stringutil.ellipsis(l, self.xscreensize - 1) for l in lines]
30553 d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1210
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1211 def updatescreen(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1212 self.statuswin.erase()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1213 self.chunkpad.erase()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1214
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1215 printstring = self.printstring
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1216
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1217 # print out the status lines at the top
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1218 try:
30553 d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1219 for line in self._getstatuslines():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1220 printstring(self.statuswin, line, pairname=b"legend")
30553 d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1221 self.statuswin.refresh()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1222 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1223 pass
30553 d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1224 if self.errorstr is not None:
d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1225 return
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1226
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1227 # print out the patch in the remaining part of the window
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1228 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1229 self.printitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1230 self.updatescroll()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1231 self.chunkpad.refresh(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1232 self.firstlineofpadtoprint,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1233 0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1234 self.numstatuslines,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1235 0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1236 self.yscreensize - self.numstatuslines,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1237 self.xscreensize,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1238 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1239 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1240 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1241
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1242 def getstatusprefixstring(self, item):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1243 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1244 create a string to prefix a line with which indicates whether 'item'
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1245 is applied and/or folded.
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1246 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1247
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1248 # create checkbox string
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1249 if item.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1250 if not isinstance(item, uihunkline) and item.partial:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1251 checkbox = b"[~]"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1252 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1253 checkbox = b"[x]"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1254 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1255 checkbox = b"[ ]"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1256
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1257 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1258 if item.folded:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1259 checkbox += b"**"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1260 if isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1261 # one of "m", "a", or "d" (modified, added, deleted)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1262 filestatus = item.changetype
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1263
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1264 checkbox += filestatus + b" "
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1265 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1266 checkbox += b" "
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1267 if isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1268 # add two more spaces for headers
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1269 checkbox += b" "
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1270 except AttributeError: # not foldable
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1271 checkbox += b" "
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1272
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1273 return checkbox
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1274
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1275 def printheader(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1276 self, header, selected=False, towin=True, ignorefolding=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1277 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1278 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1279 print the header to the pad. if countlines is True, don't print
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1280 anything, but just count the number of lines which would be printed.
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1281 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1282
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1283 outstr = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1284 text = header.prettystr()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1285 chunkindex = self.chunklist.index(header)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1286
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1287 if chunkindex != 0 and not header.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1288 # add separating line before headers
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1289 outstr += self.printstring(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1290 self.chunkpad, b'_' * self.xscreensize, towin=towin, align=False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1291 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1292 # select color-pair based on if the header is selected
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1293 colorpair = self.getcolorpair(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1294 name=selected and b"selected" or b"normal", attrlist=[curses.A_BOLD]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1295 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1296
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1297 # print out each line of the chunk, expanding it to screen width
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1298
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1299 # number of characters to indent lines on this level by
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1300 indentnumchars = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1301 checkbox = self.getstatusprefixstring(header)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1302 if not header.folded or ignorefolding:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1303 textlist = text.split(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1304 linestr = checkbox + textlist[0]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1305 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1306 linestr = checkbox + header.filename()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1307 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1308 self.chunkpad, linestr, pair=colorpair, towin=towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1309 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1310 if not header.folded or ignorefolding:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1311 if len(textlist) > 1:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1312 for line in textlist[1:]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1313 linestr = b" " * (indentnumchars + len(checkbox)) + line
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1314 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1315 self.chunkpad, linestr, pair=colorpair, towin=towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1316 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1317
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1318 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1319
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1320 def printhunklinesbefore(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1321 self, hunk, selected=False, towin=True, ignorefolding=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1322 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1323 b"includes start/end line indicator"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1324 outstr = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1325 # where hunk is in list of siblings
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1326 hunkindex = hunk.header.hunks.index(hunk)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1327
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1328 if hunkindex != 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1329 # add separating line before headers
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1330 outstr += self.printstring(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1331 self.chunkpad, b' ' * self.xscreensize, towin=towin, align=False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1332 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1333
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1334 colorpair = self.getcolorpair(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1335 name=selected and b"selected" or b"normal", attrlist=[curses.A_BOLD]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1336 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1337
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1338 # print out from-to line with checkbox
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1339 checkbox = self.getstatusprefixstring(hunk)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1340
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1341 lineprefix = b" " * self.hunkindentnumchars + checkbox
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1342 frtoline = b" " + hunk.getfromtoline().strip(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1343
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1344 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1345 self.chunkpad, lineprefix, towin=towin, align=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1346 ) # add uncolored checkbox/indent
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1347 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1348 self.chunkpad, frtoline, pair=colorpair, towin=towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1349 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1350
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1351 if hunk.folded and not ignorefolding:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1352 # skip remainder of output
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1353 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1354
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1355 # print out lines of the chunk preceeding changed-lines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1356 for line in hunk.before:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1357 linestr = (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1358 b" " * (self.hunklineindentnumchars + len(checkbox)) + line
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1359 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1360 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1361
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1362 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1363
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1364 def printhunklinesafter(self, hunk, towin=True, ignorefolding=False):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1365 outstr = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1366 if hunk.folded and not ignorefolding:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1367 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1368
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1369 # a bit superfluous, but to avoid hard-coding indent amount
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1370 checkbox = self.getstatusprefixstring(hunk)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1371 for line in hunk.after:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1372 linestr = (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1373 b" " * (self.hunklineindentnumchars + len(checkbox)) + line
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1374 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1375 outstr += self.printstring(self.chunkpad, linestr, towin=towin)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1376
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1377 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1378
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1379 def printhunkchangedline(self, hunkline, selected=False, towin=True):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1380 outstr = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1381 checkbox = self.getstatusprefixstring(hunkline)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1382
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1383 linestr = hunkline.prettystr().strip(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1384
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1385 # select color-pair based on whether line is an addition/removal
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1386 if selected:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1387 colorpair = self.getcolorpair(name=b"selected")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1388 elif linestr.startswith(b"+"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1389 colorpair = self.getcolorpair(name=b"addition")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1390 elif linestr.startswith(b"-"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1391 colorpair = self.getcolorpair(name=b"deletion")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1392 elif linestr.startswith(b"\\"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1393 colorpair = self.getcolorpair(name=b"normal")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1394
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1395 lineprefix = b" " * self.hunklineindentnumchars + checkbox
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1396 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1397 self.chunkpad, lineprefix, towin=towin, align=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1398 ) # add uncolored checkbox/indent
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1399 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1400 self.chunkpad, linestr, pair=colorpair, towin=towin, showwhtspc=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1401 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1402 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1403
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1404 def printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1405 self, item=None, ignorefolding=False, recursechildren=True, towin=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1406 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1407 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1408 use __printitem() to print the the specified item.applied.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1409 if item is not specified, then print the entire patch.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1410 (hiding folded elements, etc. -- see __printitem() docstring)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1411 """
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1412
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1413 if item is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1414 item = self.headerlist
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1415 if recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1416 self.linesprintedtopadsofar = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1417
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1418 outstr = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1419 self.__printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1420 item, ignorefolding, recursechildren, outstr, towin=towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1421 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1422 return b''.join(outstr)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1423
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1424 def outofdisplayedarea(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1425 y, _ = self.chunkpad.getyx() # cursor location
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1426 # * 2 here works but an optimization would be the max number of
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1427 # consecutive non selectable lines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1428 # i.e the max number of context line for any hunk in the patch
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1429 miny = min(0, self.firstlineofpadtoprint - self.yscreensize)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1430 maxy = self.firstlineofpadtoprint + self.yscreensize * 2
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1431 return y < miny or y > maxy
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1432
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1433 def handleselection(self, item, recursechildren):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1434 selected = item is self.currentselecteditem
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1435 if selected and recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1436 # assumes line numbering starting from line 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1437 self.selecteditemstartline = self.linesprintedtopadsofar
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1438 selecteditemlines = self.getnumlinesdisplayed(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1439 item, recursechildren=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1440 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1441 self.selecteditemendline = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1442 self.selecteditemstartline + selecteditemlines - 1
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1443 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1444 return selected
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1445
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1446 def __printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1447 self, item, ignorefolding, recursechildren, outstr, towin=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1448 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1449 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1450 recursive method for printing out patch/header/hunk/hunk-line data to
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1451 screen. also returns a string with all of the content of the displayed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1452 patch (not including coloring, etc.).
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1453
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1454 if ignorefolding is True, then folded items are printed out.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1455
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1456 if recursechildren is False, then only print the item without its
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1457 child items.
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1458 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1459
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1460 if towin and self.outofdisplayedarea():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1461 return
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1462
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1463 selected = self.handleselection(item, recursechildren)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1464
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1465 # patch object is a list of headers
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1466 if isinstance(item, patch):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1467 if recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1468 for hdr in item:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1469 self.__printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1470 hdr, ignorefolding, recursechildren, outstr, towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1471 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1472 # todo: eliminate all isinstance() calls
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1473 if isinstance(item, uiheader):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1474 outstr.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1475 self.printheader(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1476 item, selected, towin=towin, ignorefolding=ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1477 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1478 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1479 if recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1480 for hnk in item.hunks:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1481 self.__printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1482 hnk, ignorefolding, recursechildren, outstr, towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1483 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1484 elif isinstance(item, uihunk) and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1485 (not item.header.folded) or ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1486 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1487 # print the hunk data which comes before the changed-lines
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1488 outstr.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1489 self.printhunklinesbefore(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1490 item, selected, towin=towin, ignorefolding=ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1491 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1492 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1493 if recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1494 for l in item.changedlines:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1495 self.__printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1496 l, ignorefolding, recursechildren, outstr, towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1497 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1498 outstr.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1499 self.printhunklinesafter(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1500 item, towin=towin, ignorefolding=ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1501 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1502 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1503 elif isinstance(item, uihunkline) and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1504 (not item.hunk.folded) or ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1505 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1506 outstr.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1507 self.printhunkchangedline(item, selected, towin=towin)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1508 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1509
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1510 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1511
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1512 def getnumlinesdisplayed(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1513 self, item=None, ignorefolding=False, recursechildren=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1514 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1515 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1516 return the number of lines which would be displayed if the item were
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1517 to be printed to the display. the item will not be printed to the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1518 display (pad).
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1519 if no item is given, assume the entire patch.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1520 if ignorefolding is True, folded items will be unfolded when counting
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1521 the number of lines.
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1522 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1523
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1524 # temporarily disable printing to windows by printstring
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1525 patchdisplaystring = self.printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1526 item, ignorefolding, recursechildren, towin=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1527 )
36339 3496bffe266d py3: make sure we are doing integer division by using '//' Pulkit Goyal <7895pulkit@gmail.com> parents: 36338 diff changeset	1528 numlines = len(patchdisplaystring) // self.xscreensize
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1529 return numlines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1530
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1531 def sigwinchhandler(self, n, frame):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1532 b"handle window resizing"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1533 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1534 curses.endwin()
30328 0911191dc4c9 crecord: use scmutil.termsize() Yuya Nishihara <yuya@tcha.org> parents: 29961 diff changeset	1535 self.xscreensize, self.yscreensize = scmutil.termsize(self.ui)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1536 self.statuswin.resize(self.numstatuslines, self.xscreensize)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1537 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1538 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1539 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1540 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1541
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1542 def getcolorpair(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1543 self, fgcolor=None, bgcolor=None, name=None, attrlist=None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1544 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1545 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1546 get a curses color pair, adding it to self.colorpairs if it is not
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1547 already defined. an optional string, name, can be passed as a shortcut
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1548 for referring to the color-pair. by default, if no arguments are
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1549 specified, the white foreground / black background color-pair is
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1550 returned.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1551
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1552 it is expected that this function will be used exclusively for
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1553 initializing color pairs, and not curses.init_pair().
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1554
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1555 attrlist is used to 'flavor' the returned color-pair. this information
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1556 is not stored in self.colorpairs. it contains attribute values like
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1557 curses.A_BOLD.
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1558 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1559
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1560 if (name is not None) and name in self.colorpairnames:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1561 # then get the associated color pair and return it
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1562 colorpair = self.colorpairnames[name]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1563 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1564 if fgcolor is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1565 fgcolor = -1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1566 if bgcolor is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1567 bgcolor = -1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1568 if (fgcolor, bgcolor) in self.colorpairs:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1569 colorpair = self.colorpairs[(fgcolor, bgcolor)]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1570 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1571 pairindex = len(self.colorpairs) + 1
35531 f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1572 if self.usecolor:
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1573 curses.init_pair(pairindex, fgcolor, bgcolor)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1574 colorpair = self.colorpairs[
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1575 (fgcolor, bgcolor)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1576 ] = curses.color_pair(pairindex)
35531 f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1577 if name is not None:
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1578 self.colorpairnames[name] = curses.color_pair(pairindex)
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1579 else:
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1580 cval = 0
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1581 if name is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1582 if name == b'selected':
35531 f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1583 cval = curses.A_REVERSE
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1584 self.colorpairnames[name] = cval
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1585 colorpair = self.colorpairs[(fgcolor, bgcolor)] = cval
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1586
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1587 # add attributes if possible
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1588 if attrlist is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1589 attrlist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1590 if colorpair < 256:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1591 # then it is safe to apply all attributes
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1592 for textattr in attrlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1593 colorpair \|= textattr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1594 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1595 # just apply a select few (safe?) attributes
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1596 for textattrib in (curses.A_UNDERLINE, curses.A_BOLD):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1597 if textattrib in attrlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1598 colorpair \|= textattrib
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1599 return colorpair
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1600
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1601 def initcolorpair(self, args, *kwargs):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1602 b"same as getcolorpair."
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1603 self.getcolorpair(args, *kwargs)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1604
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1605 def helpwindow(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1606 b"print a help window to the screen. exit after any keypress."
30544 3899c358b45a crecord: filter text via i18n Jun Wu <quark@fb.com> parents: 30542 diff changeset	1607 helptext = _(
3899c358b45a crecord: filter text via i18n Jun Wu <quark@fb.com> parents: 30542 diff changeset	1608 """ [press any key to return to the patch-display]
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1609
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1610 crecord allows you to interactively choose among the changes you have made,
24840 a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1611 and confirm only those changes you select for further processing by the command
a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1612 you are running (commit/shelve/revert), after confirming the selected
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1613 changes, the unselected changes are still present in your working copy, so you
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1614 can use crecord multiple times to split large changes into smaller changesets.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1615 the following are valid keystrokes:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1616
42570 75fd9421440b crecord: add "x" alias for space, remove test-only "TOGGLE" alias Kyle Lippincott <spectral@google.com> parents: 42569 diff changeset	1617 x [space] : (un-)select item ([~]/[x] = partly/fully applied)
40253 682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	1618 [enter] : (un-)select item and go to next item of same type
27936 fedd81659643 crecord: fix typo in the help text Laurent Charignon <lcharignon@fb.com> parents: 27914 diff changeset	1619 A : (un-)select all items
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1620 X : (un-)select all items between current and most-recent
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1621 up/down-arrow [k/j] : go to previous/next unfolded item
25460 bd4bcfa48c9e crecord: fix three typos introduced while moving crecord into core Laurent Charignon <lcharignon@fb.com> parents: 25447 diff changeset	1622 pgup/pgdn [K/J] : go to previous/next item of same type
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1623 right/left-arrow [l/h] : go to child item / parent item
25460 bd4bcfa48c9e crecord: fix three typos introduced while moving crecord into core Laurent Charignon <lcharignon@fb.com> parents: 25447 diff changeset	1624 shift-left-arrow [H] : go to parent header / fold selected header
42073 80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1625 g : go to the top
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1626 G : go to the bottom
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1627 f : fold / unfold item, hiding/revealing its children
25447 093d38165e5a crecord: fix a typo introduced when moving crecord to core Laurent Charignon <lcharignon@fb.com> parents: 24840 diff changeset	1628 F : fold / unfold parent item and all of its ancestors
29961 7d053ba73178 crecord: add an event that scrolls the selected line to the top of the screen Nathan Goldbaum <ngoldbau@illinois.edu> parents: 29946 diff changeset	1629 ctrl-l : scroll the selected line to the top of the screen
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1630 m : edit / resume editing the commit message
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1631 e : edit the currently selected hunk
29077 6ecd1a00977e crecord: drop the version condition for amend Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29076 diff changeset	1632 a : toggle amend mode, only with commit -i
24840 a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1633 c : confirm selected changes
a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1634 r : review/edit and confirm selected changes
a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1635 q : quit without confirming (no changes will be made)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1636 ? : help (what you're currently reading)"""
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1637 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1638
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1639 helpwin = curses.newwin(self.yscreensize, 0, 0, 0)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1640 helplines = helptext.split(b"\n")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1641 helplines = helplines + [b" "] * (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1642 self.yscreensize - self.numstatuslines - len(helplines) - 1
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1643 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1644 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1645 for line in helplines:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1646 self.printstring(helpwin, line, pairname=b"legend")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1647 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1648 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1649 helpwin.refresh()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1650 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1651 with self.ui.timeblockedsection(b'crecord'):
31001 a0c4e57074fe crecord: log blocked time waiting for curses input Simon Farnsworth <simonfar@fb.com> parents: 30797 diff changeset	1652 helpwin.getkey()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1653 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1654 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1655
33991 a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1656 def commitMessageWindow(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1657 b"Create a temporary commit message editing window on the screen."
33991 a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1658
a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1659 curses.raw()
a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1660 curses.def_prog_mode()
a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1661 curses.endwin()
a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1662 self.commenttext = self.ui.edit(self.commenttext, self.ui.username())
a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1663 curses.cbreak()
a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1664 self.stdscr.refresh()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1665 self.stdscr.keypad(1) # allow arrow-keys to continue to function
33991 a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1666
42073 80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1667 def handlefirstlineevent(self):
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1668 """
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1669 Handle 'g' to navigate to the top most file in the ncurses window.
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1670 """
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1671 self.currentselecteditem = self.headerlist[0]
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1672 currentitem = self.currentselecteditem
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1673 # select the parent item recursively until we're at a header
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1674 while True:
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1675 nextitem = currentitem.parentitem()
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1676 if nextitem is None:
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1677 break
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1678 else:
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1679 currentitem = nextitem
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1680
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1681 self.currentselecteditem = currentitem
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1682
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1683 def handlelastlineevent(self):
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1684 """
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1685 Handle 'G' to navigate to the bottom most file/hunk/line depending
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1686 on the whether the fold is active or not.
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1687
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1688 If the bottom most file is folded, it navigates to that file and
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1689 stops there. If the bottom most file is unfolded, it navigates to
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1690 the bottom most hunk in that file and stops there. If the bottom most
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1691 hunk is unfolded, it navigates to the bottom most line in that hunk.
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1692 """
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1693 currentitem = self.currentselecteditem
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1694 nextitem = currentitem.nextitem()
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1695 # select the child item recursively until we're at a footer
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1696 while nextitem is not None:
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1697 nextitem = currentitem.nextitem()
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1698 if nextitem is None:
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1699 break
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1700 else:
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1701 currentitem = nextitem
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1702
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1703 self.currentselecteditem = currentitem
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1704 self.recenterdisplayedarea()
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1705
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1706 def confirmationwindow(self, windowtext):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1707 b"display an informational window, then wait for and return a keypress."
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1708
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1709 confirmwin = curses.newwin(self.yscreensize, 0, 0, 0)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1710 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1711 lines = windowtext.split(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1712 for line in lines:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1713 self.printstring(confirmwin, line, pairname=b"selected")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1714 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1715 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1716 self.stdscr.refresh()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1717 confirmwin.refresh()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1718 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1719 with self.ui.timeblockedsection(b'crecord'):
31001 a0c4e57074fe crecord: log blocked time waiting for curses input Simon Farnsworth <simonfar@fb.com> parents: 30797 diff changeset	1720 response = chr(self.stdscr.getch())
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1721 except ValueError:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1722 response = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1723
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1724 return response
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1725
28926 0411b7998d9b crecord: cleanup the remains of commit confirmation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28925 diff changeset	1726 def reviewcommit(self):
24840 a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1727 """ask for 'y' to be pressed to confirm selected. return True if
a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1728 confirmed."""
30544 3899c358b45a crecord: filter text via i18n Jun Wu <quark@fb.com> parents: 30542 diff changeset	1729 confirmtext = _(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1730 """If you answer yes to the following, your currently chosen patch chunks
41944 7e95ade0f369 chunkselector: fix typos in instructions when user reviews patch Kyle Lippincott <spectral@google.com> parents: 41848 diff changeset	1731 will be loaded into an editor. To modify the patch, make the changes in your
7e95ade0f369 chunkselector: fix typos in instructions when user reviews patch Kyle Lippincott <spectral@google.com> parents: 41848 diff changeset	1732 editor and save. To accept the current patch as-is, close the editor without
7e95ade0f369 chunkselector: fix typos in instructions when user reviews patch Kyle Lippincott <spectral@google.com> parents: 41848 diff changeset	1733 saving.
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1734
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1735 note: don't add/remove lines unless you also modify the range information.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1736 failing to follow this rule will result in the commit aborting.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1737
24840 a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1738 are you sure you want to review/edit and confirm the selected changes [yn]?
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1739 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1740 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1741 with self.ui.timeblockedsection(b'crecord'):
31001 a0c4e57074fe crecord: log blocked time waiting for curses input Simon Farnsworth <simonfar@fb.com> parents: 30797 diff changeset	1742 response = self.confirmationwindow(confirmtext)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1743 if response is None:
43423 117b41b1859d py3: compare response of crecord's confirmationwindow with str Denis Laxalde <denis.laxalde@logilab.fr> parents: 43364 diff changeset	1744 response = "n"
117b41b1859d py3: compare response of crecord's confirmationwindow with str Denis Laxalde <denis.laxalde@logilab.fr> parents: 43364 diff changeset	1745 if response.lower().startswith("y"):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1746 return True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1747 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1748 return False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1749
27156 55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1750 def toggleamend(self, opts, test):
55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1751 """Toggle the amend flag.
55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1752
55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1753 When the amend flag is set, a commit will modify the most recently
55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1754 committed changeset, instead of creating a new changeset. Otherwise, a
55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1755 new changeset will be created (the normal commit behavior).
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1756 """
27156 55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1757
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1758 if opts.get(b'amend') is None:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1759 opts[b'amend'] = True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1760 msg = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1761 b"Amend option is turned on -- committing the currently "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1762 b"selected changes will not create a new changeset, but "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1763 b"instead update the most recently committed changeset.\n\n"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1764 b"Press any key to continue."
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1765 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1766 elif opts.get(b'amend') is True:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1767 opts[b'amend'] = None
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1768 msg = _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1769 b"Amend option is turned off -- committing the currently "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1770 b"selected changes will create a new changeset.\n\n"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1771 b"Press any key to continue."
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1772 )
27156 55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1773 if not test:
55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1774 self.confirmationwindow(msg)
55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1775
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1776 def recenterdisplayedarea(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1777 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1778 once we scrolled with pg up pg down we can be pointing outside of the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1779 display zone. we print the patch with towin=False to compute the
26781 1aee2ab0f902 spelling: trivial spell checking Mads Kiilerich <madski@unity3d.com> parents: 26587 diff changeset	1780 location of the selected item even though it is outside of the displayed
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1781 zone and then update the scroll.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1782 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1783 self.printitem(towin=False)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1784 self.updatescroll()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1785
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1786 def toggleedit(self, item=None, test=False):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1787 """
28580 8b41ad798fb7 crecord: fix docblock indentation Ryan McElroy <rmcelroy@fb.com> parents: 28579 diff changeset	1788 edit the currently selected chunk
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1789 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1790
25555 838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1791 def updateui(self):
838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1792 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1793 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1794 self.updatescroll()
838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1795 self.stdscr.refresh()
838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1796 self.statuswin.refresh()
838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1797 self.stdscr.keypad(1)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1798
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1799 def editpatchwitheditor(self, chunk):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1800 if chunk is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1801 self.ui.write(_(b'cannot edit patch for whole file'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1802 self.ui.write(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1803 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1804 if chunk.header.binary():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1805 self.ui.write(_(b'cannot edit patch for binary file'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1806 self.ui.write(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1807 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1808
28636 de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1809 # write the initial patch
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28638 diff changeset	1810 patch = stringio()
28637 4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	1811 patch.write(diffhelptext + hunkhelptext)
28636 de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1812 chunk.header.write(patch)
de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1813 chunk.write(patch)
de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1814
de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1815 # start the editor and wait for it to complete
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1816 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1817 patch = self.ui.edit(patch.getvalue(), b"", action=b"diff")
28636 de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1818 except error.Abort as exc:
43364 dd64e229c46b py3: fix crecord.py's editpatchwitheditor exception message encoding Emmanuel Leblond <emmanuel.leblond@gmail.com> parents: 43159 diff changeset	1819 self.errorstr = stringutil.forcebytestr(exc)
28636 de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1820 return None
41991 3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	1821 finally:
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	1822 self.stdscr.clear()
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	1823 self.stdscr.refresh()
28636 de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1824
de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1825 # remove comment lines
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1826 patch = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1827 line + b'\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1828 for line in patch.splitlines()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1829 if not line.startswith(b'#')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1830 ]
28636 de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1831 return patchmod.parsepatch(patch)
de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1832
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1833 if item is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1834 item = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1835 if isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1836 return
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1837 if isinstance(item, uihunkline):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1838 item = item.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1839 if not isinstance(item, uihunk):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1840 return
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1841
27914 505a10b504ed crecord: edit during hg crecord should preserve cursor position (issue5041) Laurent Charignon <lcharignon@fb.com> parents: 27533 diff changeset	1842 # To go back to that hunk or its replacement at the end of the edit
505a10b504ed crecord: edit during hg crecord should preserve cursor position (issue5041) Laurent Charignon <lcharignon@fb.com> parents: 27533 diff changeset	1843 itemindex = item.parentitem().hunks.index(item)
505a10b504ed crecord: edit during hg crecord should preserve cursor position (issue5041) Laurent Charignon <lcharignon@fb.com> parents: 27533 diff changeset	1844
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1845 beforeadded, beforeremoved = item.added, item.removed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1846 newpatches = editpatchwitheditor(self, item)
25557 52c552a05414 crecord: exit edition of hunk with non-zero status does not interrupt session Laurent Charignon <lcharignon@fb.com> parents: 25556 diff changeset	1847 if newpatches is None:
52c552a05414 crecord: exit edition of hunk with non-zero status does not interrupt session Laurent Charignon <lcharignon@fb.com> parents: 25556 diff changeset	1848 if not test:
52c552a05414 crecord: exit edition of hunk with non-zero status does not interrupt session Laurent Charignon <lcharignon@fb.com> parents: 25556 diff changeset	1849 updateui(self)
52c552a05414 crecord: exit edition of hunk with non-zero status does not interrupt session Laurent Charignon <lcharignon@fb.com> parents: 25556 diff changeset	1850 return
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1851 header = item.header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1852 editedhunkindex = header.hunks.index(item)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1853 hunksbefore = header.hunks[:editedhunkindex]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1854 hunksafter = header.hunks[editedhunkindex + 1 :]
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1855 newpatchheader = newpatches[0]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1856 newhunks = [uihunk(h, header) for h in newpatchheader.hunks]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1857 newadded = sum([h.added for h in newhunks])
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1858 newremoved = sum([h.removed for h in newhunks])
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1859 offset = (newadded - beforeadded) - (newremoved - beforeremoved)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1860
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1861 for h in hunksafter:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1862 h.toline += offset
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1863 for h in newhunks:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1864 h.folded = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1865 header.hunks = hunksbefore + newhunks + hunksafter
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1866 if self.emptypatch():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1867 header.hunks = hunksbefore + [item] + hunksafter
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1868 self.currentselecteditem = header
27914 505a10b504ed crecord: edit during hg crecord should preserve cursor position (issue5041) Laurent Charignon <lcharignon@fb.com> parents: 27533 diff changeset	1869 if len(header.hunks) > itemindex:
505a10b504ed crecord: edit during hg crecord should preserve cursor position (issue5041) Laurent Charignon <lcharignon@fb.com> parents: 27533 diff changeset	1870 self.currentselecteditem = header.hunks[itemindex]
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1871
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1872 if not test:
25555 838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1873 updateui(self)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1874
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1875 def emptypatch(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1876 item = self.headerlist
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1877 if not item:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1878 return True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1879 for header in item:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1880 if header.hunks:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1881 return False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1882 return True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1883
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1884 def handlekeypressed(self, keypressed, test=False):
28581 3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1885 """
3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1886 Perform actions based on pressed keys.
3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1887
3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1888 Return true to exit the main loop.
3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1889 """
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1890 if keypressed in ["k", "KEY_UP"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1891 self.uparrowevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1892 elif keypressed in ["K", "KEY_PPAGE"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1893 self.uparrowshiftevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1894 elif keypressed in ["j", "KEY_DOWN"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1895 self.downarrowevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1896 elif keypressed in ["J", "KEY_NPAGE"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1897 self.downarrowshiftevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1898 elif keypressed in ["l", "KEY_RIGHT"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1899 self.rightarrowevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1900 elif keypressed in ["h", "KEY_LEFT"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1901 self.leftarrowevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1902 elif keypressed in ["H", "KEY_SLEFT"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1903 self.leftarrowshiftevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1904 elif keypressed in ["q"]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1905 raise error.Abort(_(b'user quit'))
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1906 elif keypressed in ['a']:
27156 55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	1907 self.toggleamend(self.opts, test)
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1908 elif keypressed in ["c"]:
28925 ee56a86e2782 crecord: drop the extra confirmation screen Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28861 diff changeset	1909 return True
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1910 elif keypressed in ["r"]:
28926 0411b7998d9b crecord: cleanup the remains of commit confirmation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28925 diff changeset	1911 if self.reviewcommit():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1912 self.opts[b'review'] = True
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1913 return True
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1914 elif test and keypressed in ["R"]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1915 self.opts[b'review'] = True
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1916 return True
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1917 elif keypressed in [" ", "x"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1918 self.toggleapply()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1919 elif keypressed in ["\n", "KEY_ENTER"]:
40253 682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	1920 self.toggleapply()
42572 cd4f1b7c3192 crecord: make KEY_ENTER usable in tests (by not updating UI) Kyle Lippincott <spectral@google.com> parents: 42571 diff changeset	1921 self.nextsametype(test=test)
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1922 elif keypressed in ["X"]:
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1923 self.toggleallbetween()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1924 elif keypressed in ["A"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1925 self.toggleall()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1926 elif keypressed in ["e"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1927 self.toggleedit(test=test)
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1928 elif keypressed in ["f"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1929 self.togglefolded()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1930 elif keypressed in ["F"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1931 self.togglefolded(foldparent=True)
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1932 elif keypressed in ["m"]:
33991 a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	1933 self.commitMessageWindow()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1934 elif keypressed in ["g", "KEY_HOME"]:
42073 80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1935 self.handlefirstlineevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1936 elif keypressed in ["G", "KEY_END"]:
42073 80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1937 self.handlelastlineevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1938 elif keypressed in ["?"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1939 self.helpwindow()
25419 6e62a5b3442d crecord: fix blue artifact bug coming back from help screen Laurent Charignon <lcharignon@fb.com> parents: 25359 diff changeset	1940 self.stdscr.clear()
6e62a5b3442d crecord: fix blue artifact bug coming back from help screen Laurent Charignon <lcharignon@fb.com> parents: 25359 diff changeset	1941 self.stdscr.refresh()
43425 be0f77fd274d py3: fix handling of ctrl keys in crecord (issue6213) Denis Laxalde <denis.laxalde@logilab.fr> parents: 43424 diff changeset	1942 elif keypressed in [curses.ascii.ctrl("L")]:
41992 fa3b0ca9d74f crecord: redraw the screen on ctrl-L Kyle Lippincott <spectral@google.com> parents: 41991 diff changeset	1943 # scroll the current line to the top of the screen, and redraw
fa3b0ca9d74f crecord: redraw the screen on ctrl-L Kyle Lippincott <spectral@google.com> parents: 41991 diff changeset	1944 # everything
29961 7d053ba73178 crecord: add an event that scrolls the selected line to the top of the screen Nathan Goldbaum <ngoldbau@illinois.edu> parents: 29946 diff changeset	1945 self.scrolllines(self.selecteditemstartline)
41992 fa3b0ca9d74f crecord: redraw the screen on ctrl-L Kyle Lippincott <spectral@google.com> parents: 41991 diff changeset	1946 self.stdscr.clear()
fa3b0ca9d74f crecord: redraw the screen on ctrl-L Kyle Lippincott <spectral@google.com> parents: 41991 diff changeset	1947 self.stdscr.refresh()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1948
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1949 def main(self, stdscr):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1950 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1951 method to be wrapped by curses.wrapper() for selecting chunks.
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1952 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1953
31931 0130c3e1b1d9 crecord: avoid setting non-existing signal SIGWINCH on windows Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31930 diff changeset	1954 origsigwinch = sentinel = object()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1955 if util.safehasattr(signal, b'SIGWINCH'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1956 origsigwinch = signal.signal(signal.SIGWINCH, self.sigwinchhandler)
31930 7e7743a01103 crecord: ensure we reinstall the SIGWINCH handler Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31929 diff changeset	1957 try:
7e7743a01103 crecord: ensure we reinstall the SIGWINCH handler Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31929 diff changeset	1958 return self._main(stdscr)
7e7743a01103 crecord: ensure we reinstall the SIGWINCH handler Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31929 diff changeset	1959 finally:
31931 0130c3e1b1d9 crecord: avoid setting non-existing signal SIGWINCH on windows Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31930 diff changeset	1960 if origsigwinch is not sentinel:
0130c3e1b1d9 crecord: avoid setting non-existing signal SIGWINCH on windows Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31930 diff changeset	1961 signal.signal(signal.SIGWINCH, origsigwinch)
31929 bf6b44da1d8e crecord: extract most of 'main' into a sub function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31654 diff changeset	1962
bf6b44da1d8e crecord: extract most of 'main' into a sub function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31654 diff changeset	1963 def _main(self, stdscr):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1964 self.stdscr = stdscr
25820 701d8c362aa2 crecord: add error reporting for failure in curses interface initialization Laurent Charignon <lcharignon@fb.com> parents: 25807 diff changeset	1965 # error during initialization, cannot be printed in the curses
701d8c362aa2 crecord: add error reporting for failure in curses interface initialization Laurent Charignon <lcharignon@fb.com> parents: 25807 diff changeset	1966 # interface, it should be printed by the calling code
38080 dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	1967 self.initexc = None
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1968 self.yscreensize, self.xscreensize = self.stdscr.getmaxyx()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1969
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1970 curses.start_color()
35532 fb2e59e92651 crecord: fallback to color = no when curses.use_default_colors() fails Elmar Bartel <elb_hg@leo.org> parents: 35531 diff changeset	1971 try:
fb2e59e92651 crecord: fallback to color = no when curses.use_default_colors() fails Elmar Bartel <elb_hg@leo.org> parents: 35531 diff changeset	1972 curses.use_default_colors()
fb2e59e92651 crecord: fallback to color = no when curses.use_default_colors() fails Elmar Bartel <elb_hg@leo.org> parents: 35531 diff changeset	1973 except curses.error:
fb2e59e92651 crecord: fallback to color = no when curses.use_default_colors() fails Elmar Bartel <elb_hg@leo.org> parents: 35531 diff changeset	1974 self.usecolor = False
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1975
41993 cde5827d09a7 crecord: redraw the screen when starting up chunkselector Kyle Lippincott <spectral@google.com> parents: 41992 diff changeset	1976 # In some situations we may have some cruft left on the "alternate
cde5827d09a7 crecord: redraw the screen when starting up chunkselector Kyle Lippincott <spectral@google.com> parents: 41992 diff changeset	1977 # screen" from another program (or previous iterations of ourself), and
cde5827d09a7 crecord: redraw the screen when starting up chunkselector Kyle Lippincott <spectral@google.com> parents: 41992 diff changeset	1978 # we won't clear it if the scroll region is small enough to comfortably
cde5827d09a7 crecord: redraw the screen when starting up chunkselector Kyle Lippincott <spectral@google.com> parents: 41992 diff changeset	1979 # fit on the terminal.
cde5827d09a7 crecord: redraw the screen when starting up chunkselector Kyle Lippincott <spectral@google.com> parents: 41992 diff changeset	1980 self.stdscr.clear()
cde5827d09a7 crecord: redraw the screen when starting up chunkselector Kyle Lippincott <spectral@google.com> parents: 41992 diff changeset	1981
42025 66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	1982 # don't display the cursor
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	1983 try:
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	1984 curses.curs_set(0)
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	1985 except curses.error:
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	1986 pass
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	1987
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1988 # available colors: black, blue, cyan, green, magenta, white, yellow
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1989 # init_pair(color_id, foreground_color, background_color)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1990 self.initcolorpair(None, None, name=b"normal")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1991 self.initcolorpair(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1992 curses.COLOR_WHITE, curses.COLOR_MAGENTA, name=b"selected"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1993 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1994 self.initcolorpair(curses.COLOR_RED, None, name=b"deletion")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1995 self.initcolorpair(curses.COLOR_GREEN, None, name=b"addition")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1996 self.initcolorpair(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1997 curses.COLOR_WHITE, curses.COLOR_BLUE, name=b"legend"
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1998 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1999 # newwin([height, width,] begin_y, begin_x)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2000 self.statuswin = curses.newwin(self.numstatuslines, 0, 0, 0)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2001 self.statuswin.keypad(1) # interpret arrow-key, etc. esc sequences
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2002
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2003 # figure out how much space to allocate for the chunk-pad which is
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2004 # used for displaying the patch
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2005
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2006 # stupid hack to prevent getnumlinesdisplayed from failing
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2007 self.chunkpad = curses.newpad(1, self.xscreensize)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2008
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2009 # add 1 so to account for last line text reaching end of line
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2010 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2011
25821 d68544b69736 crecord: throws error instead of crashing for large diffs Laurent Charignon <lcharignon@fb.com> parents: 25820 diff changeset	2012 try:
d68544b69736 crecord: throws error instead of crashing for large diffs Laurent Charignon <lcharignon@fb.com> parents: 25820 diff changeset	2013 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize)
d68544b69736 crecord: throws error instead of crashing for large diffs Laurent Charignon <lcharignon@fb.com> parents: 25820 diff changeset	2014 except curses.error:
38080 dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	2015 self.initexc = fallbackerror(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2016 _(b'this diff is too large to be displayed')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2017 )
25821 d68544b69736 crecord: throws error instead of crashing for large diffs Laurent Charignon <lcharignon@fb.com> parents: 25820 diff changeset	2018 return
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30328 diff changeset	2019 # initialize selecteditemendline (initial start-line is 0)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2020 self.selecteditemendline = self.getnumlinesdisplayed(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2021 self.currentselecteditem, recursechildren=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2022 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2023
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2024 while True:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2025 self.updatescreen()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2026 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2027 with self.ui.timeblockedsection(b'crecord'):
31001 a0c4e57074fe crecord: log blocked time waiting for curses input Simon Farnsworth <simonfar@fb.com> parents: 30797 diff changeset	2028 keypressed = self.statuswin.getkey()
25556 40f0e9e5b821 crecord: add mechanism for error reporting Laurent Charignon <lcharignon@fb.com> parents: 25555 diff changeset	2029 if self.errorstr is not None:
40f0e9e5b821 crecord: add mechanism for error reporting Laurent Charignon <lcharignon@fb.com> parents: 25555 diff changeset	2030 self.errorstr = None
40f0e9e5b821 crecord: add mechanism for error reporting Laurent Charignon <lcharignon@fb.com> parents: 25555 diff changeset	2031 continue
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2032 except curses.error:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2033 keypressed = b"foobar"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2034 if self.handlekeypressed(keypressed):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2035 break
33991 a1cd6eae2ad3 record: make the m key open an editor for the commit message (issue5667) Peter Vitt <peter.vitt2@uni-siegen.de> parents: 33834 diff changeset	2036
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2037 if self.commenttext != b"":
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2038 whitespaceremoved = re.sub(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2039 br"(?m)^\s.*(\n\|$)", b"", self.commenttext
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2040 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2041 if whitespaceremoved != b"":
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2042 self.opts[b'message'] = self.commenttext

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/crecord.py @ 43425:be0f77fd274d stable