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

annotate mercurial/crecord.py @ 53040:cdd7bf612c7b stable tip

bundle-spec: properly format boolean parameter (issue6960) This was breaking automatic clone bundle generation. This changeset fixes it and add a test to catch it in the future.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 11 Mar 2025 02:29:42 +0100
parents	3e84e001b6c1
children

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
51901 f4733654f144 typing: add `from __future__ import annotations` to most files Matt Harbison <matt_harbison@yahoo.com> parents: 51443 diff changeset	11 from __future__ import annotations
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 os
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	14 import re
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	15 import signal
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	16
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	17 from .i18n import _
f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	18 from . import (
45154 10f48720ef95 diff: move no-eol text constant to a common location Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45153 diff changeset	19 diffhelper,
25940 f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	20 encoding,
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26421 diff changeset	21 error,
25940 f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	22 patch as patchmod,
44135 ae596fac8ba0 crecord: fix a concatenation of bytes and str on py3 Kyle Lippincott <spectral@google.com> parents: 43894 diff changeset	23 pycompat,
30328 0911191dc4c9 crecord: use scmutil.termsize() Yuya Nishihara <yuya@tcha.org> parents: 29961 diff changeset	24 scmutil,
27156 55fa7c3900ae commit: add amend mode for commit -i Laurent Charignon <lcharignon@fb.com> parents: 27155 diff changeset	25 util,
25940 f4356e5094ba crecord: use absolute_import Gregory Szorc <gregory.szorc@gmail.com> parents: 25821 diff changeset	26 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	27 from .utils import stringutil
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	28
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28638 diff changeset	29 stringio = util.stringio
24314 348492ba632a crecord: more import style Matt Mackall <mpm@selenic.com> parents: 24313 diff changeset	30
28637 4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	31 # patch comments based on the git one
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	32 diffhelptext = _(
46407 279edaaea711 crecord: change str literals to byte literals Matt Harbison <matt_harbison@yahoo.com> parents: 45957 diff changeset	33 b"""# 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	34 # 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	35 # Lines starting with # will be removed from the patch.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	36 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	37 )
28637 4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	38
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	39 hunkhelptext = _(
46407 279edaaea711 crecord: change str literals to byte literals Matt Harbison <matt_harbison@yahoo.com> parents: 45957 diff changeset	40 b"""#
28637 4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	41 # 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	42 # 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	43 # 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	44 # 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	45 # unchanged.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	46 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	47 )
28638 44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28637 diff changeset	48
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	49 patchhelptext = _(
46407 279edaaea711 crecord: change str literals to byte literals Matt Harbison <matt_harbison@yahoo.com> parents: 45957 diff changeset	50 b"""#
28638 44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28637 diff changeset	51 # 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	52 # 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	53 # generated. You can use those when you try again.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	54 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	55 )
28638 44319097e7b9 crecord: re-enable reviewing a patch before comitting it Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28637 diff changeset	56
27528 7cc654610204 crecord: use try/except for import of curses Sean Farley <sean@farley.io> parents: 26781 diff changeset	57 try:
24909 d71492ca2fdd crecord: fix mixed imports warning Matt Harbison <matt_harbison@yahoo.com> parents: 24840 diff changeset	58 import curses
43425 be0f77fd274d py3: fix handling of ctrl keys in crecord (issue6213) Denis Laxalde <denis.laxalde@logilab.fr> parents: 43424 diff changeset	59 import curses.ascii
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	60
27528 7cc654610204 crecord: use try/except for import of curses Sean Farley <sean@farley.io> parents: 26781 diff changeset	61 curses.error
44311 d3f776c4760e py3: catch AttributeError too with ImportError Pulkit Goyal <7895pulkit@gmail.com> parents: 44135 diff changeset	62 except (ImportError, AttributeError):
46416 693991ccfc49 crecord: null out the curses attribute with `None` on failure to import Matt Harbison <matt_harbison@yahoo.com> parents: 46408 diff changeset	63 curses = None
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	64
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	65
38080 dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	66 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	67 """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	68
38080 dabc2237963c crecord: fallback to text mode if diffs are too big for curses mode Kyle Lippincott <spectral@google.com> parents: 37087 diff changeset	69 # 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	70 # 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	71
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	72
27529 940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	73 def checkcurses(ui):
940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	74 """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	75
940cedaee988 crecord: add helper function to determine if we should use curses Sean Farley <sean@farley.io> parents: 27528 diff changeset	76 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	77 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	78 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	79 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	80
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	81
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	82 class patchnode:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	83 """abstract class for patch graph nodes
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	84 (i.e. patchroot, header, hunk, hunkline)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	85 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	86
51383 1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	87 @property
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	88 def content(self):
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	89 return b''
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	90
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	91 def firstchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	92 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	93
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	94 def lastchild(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	95 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	96
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	97 def allchildren(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	98 """Return a list of all of the direct children of this node"""
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")
29076 36d3535c6a47 crecord: add/remove blank lines (coding style) Anton Shestakov <av6@dwimlabs.net> parents: 28926 diff changeset	100
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	101 def nextsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	102 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	103 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	104 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	105 If no such item exists, return None.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	106 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	107 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	108
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	109 def prevsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	110 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	111 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	112 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	113 If no such item exists, return None.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	114 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	115 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	116
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	117 def parentitem(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	118 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	119
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	120 def nextitem(self, skipfolded=True):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	121 """
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	122 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	123 type (header, hunk, or hunkline).
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	124
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	125 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	126 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	127 the next item.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	128
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	129 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	130 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	131 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	132 itemfolded = self.folded
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	133 except AttributeError:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	134 itemfolded = False
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	135 if skipfolded and itemfolded:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	136 nextitem = self.nextsibling()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	137 if nextitem is None:
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 nextitem = self.parentitem().nextsibling()
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 nextitem = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	142 return nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	143 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	144 # try child
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	145 item = self.firstchild()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	146 if item is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	147 return item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	148
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	149 # else try next sibling
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	150 item = self.nextsibling()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	151 if item is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	152 return item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	153
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	154 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	155 # else try parent's next sibling
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	156 item = self.parentitem().nextsibling()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	157 if item is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	158 return item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	159
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	160 # 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	161 return self.parentitem().parentitem().nextsibling()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	162
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	163 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	164 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	165
51381 7d85c6e59dd1 crecord: add skipfolded param to previtem Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 50952 diff changeset	166 def previtem(self, skipfolded=None):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	167 """
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	168 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	169 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	170
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	171 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	172 """
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	173 # 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	174 # 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	175 prevsibling = self.prevsibling()
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	176 if prevsibling is not None:
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	177 prevsiblinglastchild = prevsibling.lastchild()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	178 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	179 prevsiblinglclc = prevsiblinglastchild.lastchild()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	180 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	181 prevsiblinglclc is not None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	182 ) and not prevsiblinglastchild.folded:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	183 return prevsiblinglclc
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	184 else:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	185 return prevsiblinglastchild
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	186 else:
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	187 return prevsibling
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	188
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	189 # try parent (or None)
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	190 return self.parentitem()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	191
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	192
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	193 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	194 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	195 list of header objects representing the patch.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	196 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	197
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	198 def __init__(self, headerlist):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	199 self.extend(headerlist)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	200 # 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	201 for header in self:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	202 header.patch = self
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 class uiheader(patchnode):
51382 e68908edebba crecord: update uiheader docstring Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51381 diff changeset	206 """
e68908edebba crecord: update uiheader docstring Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51381 diff changeset	207 patchnode class wrapping a patch.header
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	208 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	209
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	210 def __init__(self, header):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	211 self.nonuiheader = header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	212 # 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	213 self.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	214 # 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	215 # 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	216 self.partial = False
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 # 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	219 self.folded = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	220
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	221 # list of all headers in patch
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	222 self.patch = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	223
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	224 # 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	225 self.neverunfolded = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	226 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	227
51383 1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	228 @property
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	229 def content(self):
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	230 return self.filename()
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	231
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	232 def prettystr(self):
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28638 diff changeset	233 x = stringio()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	234 self.pretty(x)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	235 return x.getvalue()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	236
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	237 def nextsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	238 numheadersinpatch = len(self.patch)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	239 indexofthisheader = self.patch.index(self)
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 if indexofthisheader < numheadersinpatch - 1:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	242 nextheader = self.patch[indexofthisheader + 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	243 return nextheader
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	244 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	245 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	246
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	247 def prevsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	248 indexofthisheader = self.patch.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	249 if indexofthisheader > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	250 previousheader = self.patch[indexofthisheader - 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	251 return previousheader
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	252 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	253 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	254
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	255 def parentitem(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	256 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	257 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	258 so return None.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	259 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	260 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	261
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	262 def firstchild(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	263 """return the first child of this item, if one exists. otherwise
be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	264 None."""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	265 if len(self.hunks) > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	266 return self.hunks[0]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	267 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	268 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	269
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	270 def lastchild(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	271 """return the last child of this item, if one exists. otherwise
be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	272 None."""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	273 if len(self.hunks) > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	274 return self.hunks[-1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	275 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	276 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	277
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	278 def allchildren(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	279 """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	280 return self.hunks
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	281
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	282 def __getattr__(self, name):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	283 return getattr(self.nonuiheader, name)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	284
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	285
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	286 class uihunkline(patchnode):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	287 """represents a changed line in a hunk"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	288
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	289 def __init__(self, linetext, hunk):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	290 self.linetext = linetext
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	291 self.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	292 # 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	293 self.hunk = hunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	294 # 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	295 # in the previtem method.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	296 self.folded = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	297
51383 1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	298 @property
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	299 def content(self):
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	300 return self.linetext
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	301
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	302 def prettystr(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	303 return self.linetext
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	304
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	305 def nextsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	306 numlinesinhunk = len(self.hunk.changedlines)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	307 indexofthisline = self.hunk.changedlines.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	308
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	309 if indexofthisline < numlinesinhunk - 1:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	310 nextline = self.hunk.changedlines[indexofthisline + 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	311 return nextline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	312 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	313 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	314
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	315 def prevsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	316 indexofthisline = self.hunk.changedlines.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	317 if indexofthisline > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	318 previousline = self.hunk.changedlines[indexofthisline - 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	319 return previousline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	320 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	321 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	322
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	323 def parentitem(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	324 """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	325 return self.hunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	326
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	327 def firstchild(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	328 """return the first child of this item, if one exists. otherwise
be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	329 None."""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	330 # hunk-lines don't have children
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	331 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	332
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	333 def lastchild(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	334 """return the last child of this item, if one exists. otherwise
be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	335 None."""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	336 # hunk-lines don't have children
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	337 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	338
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	339
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	340 class uihunk(patchnode):
47031 f38bf44e077f black: make codebase compatible with black v21.4b2 and v20.8b1 Kyle Lippincott <spectral@google.com> parents: 46416 diff changeset	341 """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	342
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	343 maxcontext = 3
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	344
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	345 def __init__(self, hunk, header):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	346 self._hunk = hunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	347 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	348 self.header = header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	349 # 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	350 self.originalremoved = self.removed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	351
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	352 # 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	353 self.folded = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	354 # 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	355 self.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	356 # 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	357 # 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	358 self.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	359
51383 1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	360 @property
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	361 def content(self):
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	362 return self.proc if self.proc else b''
1d488f7be492 crecord: add `content` properties to all nodes Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51382 diff changeset	363
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	364 def nextsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	365 numhunksinheader = len(self.header.hunks)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	366 indexofthishunk = self.header.hunks.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	367
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	368 if indexofthishunk < numhunksinheader - 1:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	369 nexthunk = self.header.hunks[indexofthishunk + 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	370 return nexthunk
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 prevsibling(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	375 indexofthishunk = self.header.hunks.index(self)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	376 if indexofthishunk > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	377 previoushunk = self.header.hunks[indexofthishunk - 1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	378 return previoushunk
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	379 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	380 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	381
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	382 def parentitem(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	383 """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	384 return self.header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	385
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	386 def firstchild(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	387 """return the first child of this item, if one exists. otherwise
be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	388 None."""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	389 if len(self.changedlines) > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	390 return self.changedlines[0]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	391 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	392 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	393
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	394 def lastchild(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	395 """return the last child of this item, if one exists. otherwise
be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	396 None."""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	397 if len(self.changedlines) > 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	398 return self.changedlines[-1]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	399 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	400 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	401
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	402 def allchildren(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	403 """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	404 return self.changedlines
29076 36d3535c6a47 crecord: add/remove blank lines (coding style) Anton Shestakov <av6@dwimlabs.net> parents: 28926 diff changeset	405
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	406 def countchanges(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	407 """changedlines -> (n+,n-)"""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	408 add = len(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	409 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	410 l
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	411 for l in self.changedlines
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	412 if l.applied and l.prettystr().startswith(b'+')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	413 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	414 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	415 rem = len(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	416 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	417 l
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	418 for l in self.changedlines
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	419 if l.applied and l.prettystr().startswith(b'-')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	420 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	421 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	422 return add, rem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	423
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	424 def getfromtoline(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	425 # 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	426 removedconvertedtocontext = self.originalremoved - self.removed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	427
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	428 contextlen = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	429 len(self.before) + len(self.after) + removedconvertedtocontext
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	430 )
45154 10f48720ef95 diff: move no-eol text constant to a common location Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45153 diff changeset	431 if self.after and self.after[-1] == diffhelper.MISSING_NEWLINE_MARKER:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	432 contextlen -= 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	433 fromlen = contextlen + self.removed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	434 tolen = contextlen + self.added
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	435
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	436 # 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	437 # 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	438 # precedes the hunk."
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	439 #
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	440 # 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	441 # 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	442 fromline, toline = self.fromline, self.toline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	443 if fromline != 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	444 if fromlen == 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	445 fromline -= 1
37875 03350f5234a4 crecord: fix line number in hunk header (issue5917) Jun Wu <quark@fb.com> parents: 37087 diff changeset	446 if tolen == 0 and toline > 0:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	447 toline -= 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	448
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	449 fromtoline = b'@@ -%d,%d +%d,%d @@%s\n' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	450 fromline,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	451 fromlen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	452 toline,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	453 tolen,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	454 self.proc and (b' ' + self.proc),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	455 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	456 return fromtoline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	457
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	458 def write(self, fp):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	459 # 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	460 self.added, self.removed = self.countchanges()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	461 fp.write(self.getfromtoline())
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	462
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	463 hunklinelist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	464 # 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	465 # (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	466 for changedline in self.changedlines:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	467 changedlinestr = changedline.prettystr()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	468 if changedline.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	469 hunklinelist.append(changedlinestr)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	470 elif changedlinestr.startswith(b"-"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	471 hunklinelist.append(b" " + changedlinestr[1:])
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	472
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	473 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	474
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	475 pretty = write
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	476
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	477 def prettystr(self):
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28638 diff changeset	478 x = stringio()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	479 self.pretty(x)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	480 return x.getvalue()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	481
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	482 def reversehunk(self):
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	483 """return a recordhunk which is the reverse of the hunk
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	484
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	485 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	486 intended to be applied to B, instead of A.
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	487
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	488 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	489 the user made the following selection:
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 [x] -1 [x]: selected
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	493 [ ] -2 [ ]: not selected
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	494 [x] +3
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	495 [ ] +4
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	496 [x] +5
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 This function returns a hunk like:
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	500
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	501 0
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	502 -3
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	503 -4
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	504 -5
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	505 +1
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	506 +4
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	507 6
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	508
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	509 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	510 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	511 applicable to B.
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	512 """
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	513 dels = []
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	514 adds = []
45153 8b6a446508c2 revert: fix interactive reverting of end-of-file newline changes Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45034 diff changeset	515 noeol = False
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	516 for line in self.changedlines:
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	517 text = line.linetext
45154 10f48720ef95 diff: move no-eol text constant to a common location Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45153 diff changeset	518 if line.linetext == diffhelper.MISSING_NEWLINE_MARKER:
45153 8b6a446508c2 revert: fix interactive reverting of end-of-file newline changes Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45034 diff changeset	519 noeol = True
49099 079197e94b24 crecord: avoid duplicating lines when reverting noeol->eol change Kyle Lippincott <spectral@google.com> parents: 49037 diff changeset	520 continue
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	521 if line.applied:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	522 if text.startswith(b'+'):
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	523 dels.append(text[1:])
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	524 elif text.startswith(b'-'):
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	525 adds.append(text[1:])
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	526 elif text.startswith(b'+'):
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	527 dels.append(text[1:])
66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	528 adds.append(text[1:])
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	529 hunk = [b'-%s' % l for l in dels] + [b'+%s' % l for l in adds]
45153 8b6a446508c2 revert: fix interactive reverting of end-of-file newline changes Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45034 diff changeset	530 if noeol and hunk:
8b6a446508c2 revert: fix interactive reverting of end-of-file newline changes Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45034 diff changeset	531 # Remove the newline from the end of the hunk.
8b6a446508c2 revert: fix interactive reverting of end-of-file newline changes Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 45034 diff changeset	532 hunk[-1] = hunk[-1][:-1]
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	533 h = self._hunk
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	534 return patchmod.recordhunk(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	535 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	536 )
32997 66117dae87f9 patch: rewrite reversehunks (issue5337) Jun Wu <quark@fb.com> parents: 31933 diff changeset	537
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	538 def __getattr__(self, name):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	539 return getattr(self._hunk, name)
29076 36d3535c6a47 crecord: add/remove blank lines (coding style) Anton Shestakov <av6@dwimlabs.net> parents: 28926 diff changeset	540
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	541 def __repr__(self):
43554 9f70512ae2cf cleanup: remove pointless r-prefixes on single-quoted strings Augie Fackler <augie@google.com> parents: 43425 diff changeset	542 return '<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	543
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	544
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	545 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	546 """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	547 chunks = list(chunks)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	548 # 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	549 # 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	550 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	551
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	552 # if there are no changed files
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	553 if len(headers) == 0:
27321 dcdf0a52ad36 crecord: add dictionary to default return value of filterpatch Laurent Charignon <lcharignon@fb.com> parents: 27156 diff changeset	554 return [], {}
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	555 uiheaders = [uiheader(h) for h in headers]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	556 # 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	557 # accordingly
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	558 ret = chunkselector(ui, uiheaders, operation=operation)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	559 appliedhunklist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	560 for hdr in uiheaders:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	561 if hdr.applied and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	562 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	563 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	564 appliedhunklist.append(hdr)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	565 fixoffset = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	566 for hnk in hdr.hunks:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	567 if hnk.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	568 appliedhunklist.append(hnk)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	569 # 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	570 # 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	571 if fixoffset:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	572 # hnk = copy.copy(hnk) # necessary??
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	573 hnk.toline += fixoffset
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	574 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	575 fixoffset += hnk.removed - hnk.added
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	576
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 26781 diff changeset	577 return (appliedhunklist, ret)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	578
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	579
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	580 def chunkselector(ui, headerlist, operation=None):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	581 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	582 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	583 of the chosen chunks.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	584 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	585 ui.write(_(b'starting interactive selection\n'))
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	586 chunkselector = curseschunkselector(headerlist, ui, operation)
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	587 origsigtstp = sentinel = object()
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50593 diff changeset	588 if hasattr(signal, '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	589 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	590 try:
44826 1bab6b61b62b curses: do not initialize LC_ALL to user settings (issue6358) Manuel Jacob <me@manueljacob.de> parents: 44311 diff changeset	591 with util.with_lc_ctype():
1bab6b61b62b curses: do not initialize LC_ALL to user settings (issue6358) Manuel Jacob <me@manueljacob.de> parents: 44311 diff changeset	592 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	593 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	594 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	595 # 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	596 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	597 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	598 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	599 return chunkselector.opts
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	600
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	601
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	602 def testdecorator(testfn, f):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	603 def u(args, *kwargs):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	604 return f(testfn, args, *kwargs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	605
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	606 return u
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	607
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	608
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	609 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	610 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	611 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	612 of the chosen chunks.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	613 """
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	614 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	615
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	616 class dummystdscr:
41991 3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	617 def clear(self):
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	618 pass
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	619
41991 3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	620 def refresh(self):
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	621 pass
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	622
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	623 chunkselector.stdscr = dummystdscr()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	624 if testfn and os.path.exists(testfn):
52599 006feec78d52 crecord: don't leak a file descriptor when I/O fails Matt Harbison <matt_harbison@yahoo.com> parents: 52401 diff changeset	625 # This file is purposely NOT opened in binary mode
52681 3e84e001b6c1 pyupgrade: drop redundant `open()` modes Matt Harbison <matt_harbison@yahoo.com> parents: 52599 diff changeset	626 with open(testfn) as testf:
52599 006feec78d52 crecord: don't leak a file descriptor when I/O fails Matt Harbison <matt_harbison@yahoo.com> parents: 52401 diff changeset	627 testcommands = [x.rstrip('\n') for x in testf.readlines()]
006feec78d52 crecord: don't leak a file descriptor when I/O fails Matt Harbison <matt_harbison@yahoo.com> parents: 52401 diff changeset	628
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	629 while True:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	630 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	631 break
27155 8d3c5797a175 commit: add a way to return more information from the chunkselector Laurent Charignon <lcharignon@fb.com> parents: 26781 diff changeset	632 return chunkselector.opts
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	633
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	634
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	635 _headermessages = { # {operation: text}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	636 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	637 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	638 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	639 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	640 }
8d9745ff1e62 crecord: change the verb according to the operation Jun Wu <quark@fb.com> parents: 30556 diff changeset	641
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	642
49037 642e31cb55f0 py3: use class X: instead of class X(object): Gregory Szorc <gregory.szorc@gmail.com> parents: 48966 diff changeset	643 class curseschunkselector:
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	644 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	645 # put the headers into a patch object
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	646 self.headerlist = patch(headerlist)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	647
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	648 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	649 self.opts = {}
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	650
25556 40f0e9e5b821 crecord: add mechanism for error reporting Laurent Charignon <lcharignon@fb.com> parents: 25555 diff changeset	651 self.errorstr = None
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	652 # list of all chunks
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	653 self.chunklist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	654 for h in headerlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	655 self.chunklist.append(h)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	656 self.chunklist.extend(h.hunks)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	657
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	658 # dictionary mapping (fgcolor, bgcolor) pairs to the
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	659 # corresponding curses color-pair value.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	660 self.colorpairs = {}
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	661 # 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	662 self.colorpairnames = {}
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	663
35531 f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	664 # 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	665 # 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	666 # 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	667 # previous (color only) behaviour.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	668 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	669 self.usecolor = uicolor is not False
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	670
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	671 # 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	672 self.currentselecteditem = self.headerlist[0]
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	673 self.lastapplieditem = None
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	674
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	675 # 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	676 # 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	677 self.selecteditemstartline = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	678 self.selecteditemendline = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	679
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	680 # define indentation levels
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	681 self.headerindentnumchars = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	682 self.hunkindentnumchars = 3
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	683 self.hunklineindentnumchars = 6
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	684
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	685 # 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	686 self.firstlineofpadtoprint = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	687
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	688 # 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	689 self.numpadlines = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	690
30554 f3cff00c7a00 crecord: make _getstatuslines update numstatuslines Jun Wu <quark@fb.com> parents: 30553 diff changeset	691 self.numstatuslines = 1
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	692
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	693 # 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	694 # (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	695 self.linesprintedtopadsofar = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	696
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	697 # 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	698 self.commenttext = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	699
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	700 # 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	701 self.waslasttoggleallapplied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	702
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	703 # affects some ui text
30557 8d9745ff1e62 crecord: change the verb according to the operation Jun Wu <quark@fb.com> parents: 30556 diff changeset	704 if operation not in _headermessages:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	705 raise error.ProgrammingError(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	706 b'unexpected operation: %s' % operation
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	707 )
30542 40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	708 self.operation = operation
40fe96fc7cd2 crecord: add an "operation" field Jun Wu <quark@fb.com> parents: 30342 diff changeset	709
51384 ed0b78b2a3aa crecord: add a default regex to curseschunkselector Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51383 diff changeset	710 self.regex = None
ed0b78b2a3aa crecord: add a default regex to curseschunkselector Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51383 diff changeset	711
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	712 def uparrowevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	713 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	714 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	715 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	716 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	717 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	718 hunk itself.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	719 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	720 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	721
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	722 nextitem = currentitem.previtem()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	723
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
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	730
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	731 def uparrowshiftevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	732 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	733 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	734 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	735 parent-item of the currently selected item.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	736 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	737 currentitem = self.currentselecteditem
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	738 nextitem = currentitem.prevsibling()
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	739 # 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	740 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	741 nextitem = currentitem.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	742 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	743 # 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	744 # no change...
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	745 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	746
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	747 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	748 self.recenterdisplayedarea()
24310 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 downarrowevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	751 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	752 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	753 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	754 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	755 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	756 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	757 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	758 # self.startprintline += 1 #debug
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	759 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	760
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	761 nextitem = currentitem.nextitem()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	762 # 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	763 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	764 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	765
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	766 self.currentselecteditem = nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	767
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	768 def downarrowshiftevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	769 """
29081 4abca4cbe768 crecord: update downarrowshiftevent() docstring, remove todo Anton Shestakov <av6@dwimlabs.net> parents: 29080 diff changeset	770 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	771 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	772 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	773 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	774 currentitem = self.currentselecteditem
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	775 nextitem = currentitem.nextsibling()
ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	776 # 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	777 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	778 try:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	779 nextitem = currentitem.parentitem().nextsibling()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	780 except AttributeError:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	781 # 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	782 nextitem = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	783 if nextitem is None:
29130 ed2a3818c1fc crecord: call prevsibling() and nextsibling() directly Anton Shestakov <av6@dwimlabs.net> parents: 29081 diff changeset	784 # 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	785 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	786
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	787 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	788 self.recenterdisplayedarea()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	789
42572 cd4f1b7c3192 crecord: make KEY_ENTER usable in tests (by not updating UI) Kyle Lippincott <spectral@google.com> parents: 42571 diff changeset	790 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	791 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	792 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	793 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	794
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	795 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	796 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	797
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	798 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	799 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	800 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	801 parent = nextitem.parentitem()
40413 7e4ffe2719e4 crecord: make nextsametype() check that parent item exists (issue6009) Anton Shestakov <av6@dwimlabs.net> parents: 40253 diff changeset	802 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	803 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	804
682f73fa924a crecord: make enter move cursor down to the next item of the same type Anton Shestakov <av6@dwimlabs.net> parents: 38431 diff changeset	805 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	806 if not test:
cd4f1b7c3192 crecord: make KEY_ENTER usable in tests (by not updating UI) Kyle Lippincott <spectral@google.com> parents: 42571 diff changeset	807 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	808
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	809 def rightarrowevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	810 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	811 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	812 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	813 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	814 nextitem = currentitem.firstchild()
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 # 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	817 if currentitem.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	818 self.togglefolded(currentitem)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	819
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	820 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	821 # 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	822 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	823
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	824 self.currentselecteditem = nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	825
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	826 def leftarrowevent(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	827 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	828 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	829 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	830 of this item.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	831 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	832 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	833
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	834 # try to fold the item
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	835 if not isinstance(currentitem, uihunkline):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	836 if not currentitem.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	837 self.togglefolded(item=currentitem)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	838 return
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 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	841 nextitem = currentitem.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	842
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	843 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	844 # 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	845 nextitem = currentitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	846 if not nextitem.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	847 self.togglefolded(item=nextitem)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	848
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	849 self.currentselecteditem = nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	850
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	851 def leftarrowshiftevent(self):
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 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	854 current item is already a header).
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	855 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	856 currentitem = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	857
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	858 if isinstance(currentitem, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	859 if not currentitem.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	860 self.togglefolded(item=currentitem)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	861 return
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	862
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	863 # 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	864 while True:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	865 nextitem = currentitem.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	866 if nextitem is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	867 break
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	868 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	869 currentitem = nextitem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	870
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	871 self.currentselecteditem = currentitem
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 updatescroll(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	874 """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	875 selstart = self.selecteditemstartline
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	876 selend = self.selecteditemendline
29946 3664537386ab crecord: delete commented line Nathan Goldbaum <ngoldbau@illinois.edu> parents: 29941 diff changeset	877
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	878 padstart = self.firstlineofpadtoprint
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	879 padend = padstart + self.yscreensize - self.numstatuslines - 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	880 # '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	881 # top/bottom context margin
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	882 padstartbuffered = padstart + 3
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	883 padendbuffered = padend - 3
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	884
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	885 if selend > padendbuffered:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	886 self.scrolllines(selend - padendbuffered)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	887 elif selstart < padstartbuffered:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	888 # negative values scroll in pgup direction
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	889 self.scrolllines(selstart - padstartbuffered)
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 def scrolllines(self, numlines):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	892 """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	893 self.firstlineofpadtoprint += numlines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	894 if self.firstlineofpadtoprint < 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	895 self.firstlineofpadtoprint = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	896 if self.firstlineofpadtoprint > self.numpadlines - 1:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	897 self.firstlineofpadtoprint = self.numpadlines - 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	898
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	899 def toggleapply(self, item=None):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	900 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	901 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	902 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	903 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	904 if item is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	905 item = self.currentselecteditem
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	906 # 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	907 self.lastapplieditem = item
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	908
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	909 item.applied = not item.applied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	910
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	911 if isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	912 item.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	913 if item.applied:
24492 efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	914 # apply all its hunks
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	915 for hnk in item.hunks:
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	916 hnk.applied = True
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	917 # apply all their hunklines
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	918 for hunkline in hnk.changedlines:
efa094701a05 record_curses: fix ui bug for newly added file Laurent Charignon <lcharignon@fb.com> parents: 24425 diff changeset	919 hunkline.applied = True
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	920 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	921 # un-apply all its hunks
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	922 for hnk in item.hunks:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	923 hnk.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	924 hnk.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	925 # un-apply all their hunklines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	926 for hunkline in hnk.changedlines:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	927 hunkline.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	928 elif isinstance(item, uihunk):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	929 item.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	930 # apply all it's hunklines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	931 for hunkline in item.changedlines:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	932 hunkline.applied = item.applied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	933
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	934 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	935 allsiblingsapplied = not (False in siblingappliedstatus)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	936 nosiblingsapplied = not (True in siblingappliedstatus)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	937
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	938 siblingspartialstatus = [hnk.partial for hnk in item.header.hunks]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	939 somesiblingspartial = True in siblingspartialstatus
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	940
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	941 # 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	942
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	943 # 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	944 if nosiblingsapplied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	945 if not item.header.special():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	946 item.header.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	947 item.header.partial = False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	948 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	949 item.header.applied = True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	950 item.header.partial = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	951 somesiblingspartial or not allsiblingsapplied
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	952 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	953
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	954 elif isinstance(item, uihunkline):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	955 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	956 allsiblingsapplied = not (False in siblingappliedstatus)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	957 nosiblingsapplied = not (True in siblingappliedstatus)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	958
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	959 # if no 'sibling' lines are applied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	960 if nosiblingsapplied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	961 item.hunk.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	962 item.hunk.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	963 elif allsiblingsapplied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	964 item.hunk.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	965 item.hunk.partial = False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	966 else: # some siblings applied
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	967 item.hunk.applied = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	968 item.hunk.partial = True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	969
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	970 parentsiblingsapplied = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	971 hnk.applied for hnk in item.hunk.header.hunks
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	972 ]
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	973 noparentsiblingsapplied = not (True in parentsiblingsapplied)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	974 allparentsiblingsapplied = not (False in parentsiblingsapplied)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	975
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	976 parentsiblingspartial = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	977 hnk.partial for hnk in item.hunk.header.hunks
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	978 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	979 someparentsiblingspartial = True in parentsiblingspartial
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	980
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	981 # 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	982 if noparentsiblingsapplied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	983 if not item.hunk.header.special():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	984 item.hunk.header.applied = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	985 item.hunk.header.partial = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	986 # 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	987 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	988 item.hunk.header.applied = True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	989 item.hunk.header.partial = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	990 someparentsiblingspartial or not allparentsiblingsapplied
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	991 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	992
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	993 def toggleall(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	994 """toggle the applied flag of all items."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	995 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	996 for item in self.headerlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	997 if item.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	998 self.toggleapply(item)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	999 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1000 for item in self.headerlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1001 if not item.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1002 self.toggleapply(item)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1003 self.waslasttoggleallapplied = not self.waslasttoggleallapplied
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1004
43893 c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1005 def flipselections(self):
c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1006 """
c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1007 Flip all selections. Every selected line is unselected and vice
c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1008 versa.
c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1009 """
c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1010 for header in self.headerlist:
c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1011 for hunk in header.allchildren():
c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1012 for line in hunk.allchildren():
c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1013 self.toggleapply(line)
c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1014
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1015 def toggleallbetween(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1016 """toggle applied on or off for all items in range [lastapplied,
45957 89a2afe31e82 formating: upgrade to black 20.8b1 Augie Fackler <raf@durin42.com> parents: 45892 diff changeset	1017 current]."""
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1018 if (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1019 not self.lastapplieditem
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1020 or self.currentselecteditem == self.lastapplieditem
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1021 ):
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1022 # Treat this like a normal 'x'/' '
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1023 self.toggleapply()
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1024 return
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1025
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1026 startitem = self.lastapplieditem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1027 enditem = self.currentselecteditem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1028 # 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	1029 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	1030 nextitem = startitem.nextitem()
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1031 while nextitem and nextitem != enditem:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1032 nextitem = nextitem.nextitem()
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1033 if nextitem:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1034 break
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1035 # 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	1036 startitem, enditem = enditem, startitem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1037
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1038 if not nextitem:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1039 # 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	1040 # 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	1041 return
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1042
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1043 nextitem = startitem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1044 # 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	1045 # item. Specifically:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1046 # [ ] startitem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1047 # [x] middleitem
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1048 # [ ] enditem <-- currently selected
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1049 # 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	1050 # 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	1051 desiredstate = not self.currentselecteditem.applied
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1052 while nextitem != enditem.nextitem():
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1053 if nextitem.applied != desiredstate:
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1054 self.toggleapply(item=nextitem)
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1055 nextitem = nextitem.nextitem()
9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1056
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1057 def togglefolded(self, item=None, foldparent=False):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1058 """toggle folded flag of specified item (defaults to currently
be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1059 selected)"""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1060 if item is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1061 item = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1062 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	1063 if not isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1064 # 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	1065 self.currentselecteditem = item = item.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1066 elif item.neverunfolded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1067 item.neverunfolded = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1068
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1069 # 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	1070 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	1071 for child in item.allchildren():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1072 child.folded = not item.folded
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1073
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1074 if isinstance(item, (uiheader, uihunk)):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1075 item.folded = not item.folded
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1076
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1077 def alignstring(self, instr, window):
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 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	1080 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	1081 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	1082 multiple lines.
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 y, xstart = window.getyx()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1085 width = self.xscreensize
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1086 # turn tabs into spaces
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1087 instr = instr.expandtabs(4)
24351 cdc4f3af2497 crecord: use colwidth instead of ucolwidth Matt Mackall <mpm@selenic.com> parents: 24342 diff changeset	1088 strwidth = encoding.colwidth(instr)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1089 numspaces = width - ((strwidth + xstart) % width)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1090 return instr + b" " * numspaces
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1091
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1092 def printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1093 self,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1094 window,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1095 text,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1096 fgcolor=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1097 bgcolor=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1098 pair=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1099 pairname=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1100 attrlist=None,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1101 towin=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1102 align=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1103 showwhtspc=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1104 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1105 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1106 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	1107 the specified curses window object.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1108
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1109 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	1110 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	1111 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	1112 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	1113
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1114 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	1115 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	1116 underline].
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1117
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1118 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	1119 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	1120
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1121 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	1122 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1123 # preprocess the text, converting tabs to spaces
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1124 text = text.expandtabs(4)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1125 # strip \n, and convert control characters to ^[char] representation
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1126 text = re.sub(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1127 br'[\x00-\x08\x0a-\x1f]',
44135 ae596fac8ba0 crecord: fix a concatenation of bytes and str on py3 Kyle Lippincott <spectral@google.com> parents: 43894 diff changeset	1128 lambda m: b'^' + pycompat.sysbytes(chr(ord(m.group()) + 64)),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1129 text.strip(b'\n'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1130 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1131
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1132 if pair is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1133 colorpair = pair
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1134 elif pairname is not None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1135 colorpair = self.colorpairnames[pairname]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1136 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1137 if fgcolor is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1138 fgcolor = -1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1139 if bgcolor is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1140 bgcolor = -1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1141 if (fgcolor, bgcolor) in self.colorpairs:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1142 colorpair = self.colorpairs[(fgcolor, bgcolor)]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1143 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1144 colorpair = self.getcolorpair(fgcolor, bgcolor)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1145 # add attributes if possible
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1146 if attrlist is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1147 attrlist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1148 if colorpair < 256:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1149 # 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	1150 for textattr in attrlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1151 colorpair \|= textattr
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 # just apply a select few (safe?) attributes
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1154 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	1155 if textattr in attrlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1156 colorpair \|= textattr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1157
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1158 y, xstart = self.chunkpad.getyx()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1159 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	1160 # if requested, show trailing whitespace
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1161 if showwhtspc:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1162 origlen = len(text)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1163 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	1164 strippedlen = len(text)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1165 numtrailingspaces = origlen - strippedlen
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1166
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1167 if towin:
46408 c6d9948e865f crecord: convert an instance of bytes to str Matt Harbison <matt_harbison@yahoo.com> parents: 46407 diff changeset	1168 window.addstr(encoding.strfromlocal(text), colorpair)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1169 t += text
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1170
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1171 if showwhtspc:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1172 wscolorpair = colorpair \| curses.A_REVERSE
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1173 if towin:
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1174 for i in range(numtrailingspaces):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1175 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	1176 t += b" " * numtrailingspaces
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1177
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1178 if align:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1179 if towin:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1180 extrawhitespace = self.alignstring(b"", window)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1181 window.addstr(extrawhitespace, colorpair)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1182 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1183 # 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	1184 extrawhitespace = self.alignstring(t, window)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1185 t += extrawhitespace
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1186
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1187 # 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	1188
43159 b02387005515 py3: use integer division in curseschunkselector.printstring() Denis Laxalde <denis.laxalde@logilab.fr> parents: 43158 diff changeset	1189 linesprinted = (xstart + len(t)) // self.xscreensize
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1190 self.linesprintedtopadsofar += linesprinted
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1191 return t
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1192
30555 9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1193 def _getstatuslinesegments(self):
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1194 """-> [str]. return segments"""
30556 5129ed3c2548 crecord: change help text for the space key dynamically Jun Wu <quark@fb.com> parents: 30555 diff changeset	1195 selected = self.currentselecteditem.applied
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1196 spaceselect = _(b'space/enter: select')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1197 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	1198 # 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	1199 # 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	1200 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	1201 selectedlabel = b'%-*s' % (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1202 spacelen,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1203 spacedeselect if selected else spaceselect,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1204 )
30555 9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1205 segments = [
30557 8d9745ff1e62 crecord: change the verb according to the operation Jun Wu <quark@fb.com> parents: 30556 diff changeset	1206 _headermessages[self.operation],
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1207 b'-',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1208 _(b'[x]=selected **=collapsed'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1209 _(b'c: confirm'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1210 _(b'q: abort'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1211 _(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	1212 selectedlabel,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1213 _(b'?: help'),
30555 9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1214 ]
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1215 return segments
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1216
30553 d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1217 def _getstatuslines(self):
d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1218 """() -> [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	1219 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	1220 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	1221 else:
30555 9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1222 # wrap segments to lines
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1223 segments = self._getstatuslinesegments()
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1224 width = self.xscreensize
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1225 lines = []
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1226 lastwidth = width
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1227 for s in segments:
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1228 w = encoding.colwidth(s)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1229 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	1230 if lastwidth + w + len(sep) >= width:
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1231 lines.append(s)
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1232 lastwidth = w
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1233 else:
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1234 lines[-1] += sep + s
9b674957e2e4 crecord: rewrite status line text (BC) Jun Wu <quark@fb.com> parents: 30554 diff changeset	1235 lastwidth += w + len(sep)
30554 f3cff00c7a00 crecord: make _getstatuslines update numstatuslines Jun Wu <quark@fb.com> parents: 30553 diff changeset	1236 if len(lines) != self.numstatuslines:
f3cff00c7a00 crecord: make _getstatuslines update numstatuslines Jun Wu <quark@fb.com> parents: 30553 diff changeset	1237 self.numstatuslines = len(lines)
f3cff00c7a00 crecord: make _getstatuslines update numstatuslines Jun Wu <quark@fb.com> parents: 30553 diff changeset	1238 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	1239 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	1240
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1241 def updatescreen(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1242 self.statuswin.erase()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1243 self.chunkpad.erase()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1244
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1245 printstring = self.printstring
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1246
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1247 # 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	1248 try:
30553 d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1249 for line in self._getstatuslines():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1250 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	1251 self.statuswin.refresh()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1252 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1253 pass
30553 d4035372db8d crecord: move status window text calculation to a separate method Jun Wu <quark@fb.com> parents: 30544 diff changeset	1254 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	1255 return
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 # 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	1258 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1259 self.printitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1260 self.updatescroll()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1261 self.chunkpad.refresh(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1262 self.firstlineofpadtoprint,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1263 0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1264 self.numstatuslines,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1265 0,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1266 self.yscreensize - self.numstatuslines,
45766 91c41ea14598 crecord: render chunkpad on Windows (issue6427) Barret Rennie <barret@brennie.ca> parents: 45682 diff changeset	1267 self.xscreensize - 1,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1268 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1269 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1270 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1271
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1272 def getstatusprefixstring(self, item):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1273 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1274 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	1275 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	1276 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1277
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1278 # create checkbox string
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1279 if item.applied:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1280 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	1281 checkbox = b"[~]"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1282 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1283 checkbox = b"[x]"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1284 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1285 checkbox = b"[ ]"
24310 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 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1288 if item.folded:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1289 checkbox += b"**"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1290 if isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1291 # 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	1292 filestatus = item.changetype
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1293
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1294 checkbox += filestatus + b" "
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1295 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1296 checkbox += b" "
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1297 if isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1298 # 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	1299 checkbox += b" "
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1300 except AttributeError: # not foldable
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1301 checkbox += b" "
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1302
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1303 return checkbox
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1304
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1305 def printheader(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1306 self, header, selected=False, towin=True, ignorefolding=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1307 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1308 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1309 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	1310 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	1311 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1312
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1313 outstr = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1314 text = header.prettystr()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1315 chunkindex = self.chunklist.index(header)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1316
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1317 if chunkindex != 0 and not header.folded:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1318 # add separating line before headers
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1319 outstr += self.printstring(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1320 self.chunkpad, b'_' * self.xscreensize, towin=towin, align=False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1321 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1322 # 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	1323 colorpair = self.getcolorpair(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1324 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	1325 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1326
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1327 # 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	1328
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1329 # 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	1330 indentnumchars = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1331 checkbox = self.getstatusprefixstring(header)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1332 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	1333 textlist = text.split(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1334 linestr = checkbox + textlist[0]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1335 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1336 linestr = checkbox + header.filename()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1337 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1338 self.chunkpad, linestr, pair=colorpair, towin=towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1339 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1340 if not header.folded or ignorefolding:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1341 if len(textlist) > 1:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1342 for line in textlist[1:]:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1343 linestr = b" " * (indentnumchars + len(checkbox)) + line
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, linestr, pair=colorpair, towin=towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1346 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1347
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1348 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1349
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1350 def printhunklinesbefore(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1351 self, hunk, selected=False, towin=True, ignorefolding=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1352 ):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1353 """includes start/end line indicator"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1354 outstr = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1355 # where hunk is in list of siblings
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1356 hunkindex = hunk.header.hunks.index(hunk)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1357
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1358 if hunkindex != 0:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1359 # add separating line before headers
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1360 outstr += self.printstring(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1361 self.chunkpad, b' ' * self.xscreensize, towin=towin, align=False
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1362 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1363
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1364 colorpair = self.getcolorpair(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1365 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	1366 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1367
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1368 # print out from-to line with checkbox
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1369 checkbox = self.getstatusprefixstring(hunk)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1370
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1371 lineprefix = b" " * self.hunkindentnumchars + checkbox
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1372 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	1373
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1374 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1375 self.chunkpad, lineprefix, towin=towin, align=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1376 ) # add uncolored checkbox/indent
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1377 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1378 self.chunkpad, frtoline, pair=colorpair, towin=towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1379 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1380
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1381 if hunk.folded and not ignorefolding:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1382 # skip remainder of output
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1383 return outstr
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 # 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	1386 for line in hunk.before:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1387 linestr = (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1388 b" " * (self.hunklineindentnumchars + len(checkbox)) + line
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1389 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1390 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	1391
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1392 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1393
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1394 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	1395 outstr = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1396 if hunk.folded and not ignorefolding:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1397 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1398
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1399 # 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	1400 checkbox = self.getstatusprefixstring(hunk)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1401 for line in hunk.after:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1402 linestr = (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1403 b" " * (self.hunklineindentnumchars + len(checkbox)) + line
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1404 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1405 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	1406
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1407 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1408
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1409 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	1410 outstr = b""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1411 checkbox = self.getstatusprefixstring(hunkline)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1412
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1413 linestr = hunkline.prettystr().strip(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1414
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1415 # 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	1416 if selected:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1417 colorpair = self.getcolorpair(name=b"selected")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1418 elif linestr.startswith(b"+"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1419 colorpair = self.getcolorpair(name=b"addition")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1420 elif linestr.startswith(b"-"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1421 colorpair = self.getcolorpair(name=b"deletion")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1422 elif linestr.startswith(b"\\"):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1423 colorpair = self.getcolorpair(name=b"normal")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1424
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1425 lineprefix = b" " * self.hunklineindentnumchars + checkbox
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1426 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1427 self.chunkpad, lineprefix, towin=towin, align=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1428 ) # add uncolored checkbox/indent
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1429 outstr += self.printstring(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1430 self.chunkpad, linestr, pair=colorpair, towin=towin, showwhtspc=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1431 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1432 return outstr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1433
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1434 def printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1435 self, item=None, ignorefolding=False, recursechildren=True, towin=True
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1436 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1437 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1438 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	1439 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	1440 (hiding folded elements, etc. -- see __printitem() docstring)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1441 """
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1442
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1443 if item is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1444 item = self.headerlist
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1445 if recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1446 self.linesprintedtopadsofar = 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1447
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1448 outstr = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1449 self.__printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1450 item, ignorefolding, recursechildren, outstr, towin=towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1451 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1452 return b''.join(outstr)
24310 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 def outofdisplayedarea(self):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1455 y, _ = self.chunkpad.getyx() # cursor location
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1456 # * 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	1457 # consecutive non selectable lines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1458 # 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	1459 miny = min(0, self.firstlineofpadtoprint - self.yscreensize)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1460 maxy = self.firstlineofpadtoprint + self.yscreensize * 2
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1461 return y < miny or y > maxy
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 def handleselection(self, item, recursechildren):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1464 selected = item is self.currentselecteditem
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1465 if selected and recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1466 # assumes line numbering starting from line 0
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1467 self.selecteditemstartline = self.linesprintedtopadsofar
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1468 selecteditemlines = self.getnumlinesdisplayed(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1469 item, recursechildren=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1470 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1471 self.selecteditemendline = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1472 self.selecteditemstartline + selecteditemlines - 1
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1473 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1474 return selected
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1475
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1476 def __printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1477 self, item, ignorefolding, recursechildren, outstr, towin=True
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 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1480 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	1481 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	1482 patch (not including coloring, etc.).
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1483
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1484 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	1485
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1486 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	1487 child items.
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1488 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1489
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1490 if towin and self.outofdisplayedarea():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1491 return
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1492
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1493 selected = self.handleselection(item, recursechildren)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1494
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1495 # patch object is a list of headers
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1496 if isinstance(item, patch):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1497 if recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1498 for hdr in item:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1499 self.__printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1500 hdr, ignorefolding, recursechildren, outstr, towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1501 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1502 # todo: eliminate all isinstance() calls
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1503 if isinstance(item, uiheader):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1504 outstr.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1505 self.printheader(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1506 item, selected, towin=towin, ignorefolding=ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1507 )
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 if recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1510 for hnk in item.hunks:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1511 self.__printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1512 hnk, ignorefolding, recursechildren, outstr, towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1513 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1514 elif isinstance(item, uihunk) and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1515 (not item.header.folded) or ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1516 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1517 # 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	1518 outstr.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1519 self.printhunklinesbefore(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1520 item, selected, towin=towin, ignorefolding=ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1521 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1522 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1523 if recursechildren:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1524 for l in item.changedlines:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1525 self.__printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1526 l, ignorefolding, recursechildren, outstr, towin
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1527 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1528 outstr.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1529 self.printhunklinesafter(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1530 item, towin=towin, ignorefolding=ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1531 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1532 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1533 elif isinstance(item, uihunkline) and (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1534 (not item.hunk.folded) or ignorefolding
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1535 ):
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1536 outstr.append(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1537 self.printhunkchangedline(item, selected, towin=towin)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1538 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1539
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1540 return outstr
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 getnumlinesdisplayed(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1543 self, item=None, ignorefolding=False, recursechildren=True
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 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	1547 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	1548 display (pad).
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1549 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	1550 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	1551 the number of lines.
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1552 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1553
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1554 # temporarily disable printing to windows by printstring
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1555 patchdisplaystring = self.printitem(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1556 item, ignorefolding, recursechildren, towin=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1557 )
36339 3496bffe266d py3: make sure we are doing integer division by using '//' Pulkit Goyal <7895pulkit@gmail.com> parents: 36338 diff changeset	1558 numlines = len(patchdisplaystring) // self.xscreensize
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1559 return numlines
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1560
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1561 def sigwinchhandler(self, n, frame):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1562 """handle window resizing"""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1563 try:
30328 0911191dc4c9 crecord: use scmutil.termsize() Yuya Nishihara <yuya@tcha.org> parents: 29961 diff changeset	1564 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	1565 self.statuswin.resize(self.numstatuslines, self.xscreensize)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1566 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1567 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	1568 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1569 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1570
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1571 def getcolorpair(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1572 self, fgcolor=None, bgcolor=None, name=None, attrlist=None
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1573 ):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1574 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1575 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	1576 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	1577 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	1578 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	1579 returned.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1580
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1581 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	1582 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	1583
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1584 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	1585 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	1586 curses.A_BOLD.
28579 f571ea254f75 crecord: clean up empty lines at ends of docblocks Ryan McElroy <rmcelroy@fb.com> parents: 28543 diff changeset	1587 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1588
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1589 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	1590 # 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	1591 colorpair = self.colorpairnames[name]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1592 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1593 if fgcolor is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1594 fgcolor = -1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1595 if bgcolor is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1596 bgcolor = -1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1597 if (fgcolor, bgcolor) in self.colorpairs:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1598 colorpair = self.colorpairs[(fgcolor, bgcolor)]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1599 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1600 pairindex = len(self.colorpairs) + 1
35531 f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1601 if self.usecolor:
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1602 curses.init_pair(pairindex, fgcolor, bgcolor)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1603 colorpair = self.colorpairs[
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1604 (fgcolor, bgcolor)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1605 ] = curses.color_pair(pairindex)
35531 f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1606 if name is not None:
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1607 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	1608 else:
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1609 cval = 0
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1610 if name is not None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1611 if name == b'selected':
35531 f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1612 cval = curses.A_REVERSE
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1613 self.colorpairnames[name] = cval
f43dc62cfe11 crecord: honor "ui.color = no" config option Elmar Bartel <elb_hg@leo.org> parents: 35091 diff changeset	1614 colorpair = self.colorpairs[(fgcolor, bgcolor)] = cval
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1615
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1616 # add attributes if possible
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1617 if attrlist is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1618 attrlist = []
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1619 if colorpair < 256:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1620 # 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	1621 for textattr in attrlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1622 colorpair \|= textattr
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1623 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1624 # just apply a select few (safe?) attributes
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1625 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	1626 if textattrib in attrlist:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1627 colorpair \|= textattrib
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1628 return colorpair
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1629
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1630 def initcolorpair(self, args, *kwargs):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1631 """same as getcolorpair."""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1632 self.getcolorpair(args, *kwargs)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1633
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1634 def helpwindow(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1635 """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	1636 helptext = _(
46407 279edaaea711 crecord: change str literals to byte literals Matt Harbison <matt_harbison@yahoo.com> parents: 45957 diff changeset	1637 b""" [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	1638
43891 ac54b8a2ebea crecord: rewrite help string to avoid mentioning "crecord" Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43807 diff changeset	1639 The curses hunk selector allows you to interactively choose among the
ac54b8a2ebea crecord: rewrite help string to avoid mentioning "crecord" Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43807 diff changeset	1640 changes you have made, and confirm only those changes you select for
ac54b8a2ebea crecord: rewrite help string to avoid mentioning "crecord" Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43807 diff changeset	1641 further processing by the command you are running (such as commit,
ac54b8a2ebea crecord: rewrite help string to avoid mentioning "crecord" Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43807 diff changeset	1642 shelve, or revert). After confirming the selected changes, the
ac54b8a2ebea crecord: rewrite help string to avoid mentioning "crecord" Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43807 diff changeset	1643 unselected changes are still present in your working copy, so you can
ac54b8a2ebea crecord: rewrite help string to avoid mentioning "crecord" Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43807 diff changeset	1644 use the hunk selector multiple times to split large changes into
ac54b8a2ebea crecord: rewrite help string to avoid mentioning "crecord" Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43807 diff changeset	1645 smaller changesets. the following are valid keystrokes:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1646
42570 75fd9421440b crecord: add "x" alias for space, remove test-only "TOGGLE" alias Kyle Lippincott <spectral@google.com> parents: 42569 diff changeset	1647 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	1648 [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	1649 A : (un-)select all items
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	1650 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	1651 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	1652 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	1653 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	1654 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	1655 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	1656 G : go to the bottom
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1657 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	1658 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	1659 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	1660 m : edit / resume editing the commit message
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1661 e : edit the currently selected hunk
43893 c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1662 a : toggle all selections
24840 a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1663 c : confirm selected changes
a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1664 r : review/edit and confirm selected changes
51389 0e063a9b764a crecord: enable search hotkeys (issue6834) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51388 diff changeset	1665 / : regex search for code or filename
0e063a9b764a crecord: enable search hotkeys (issue6834) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51388 diff changeset	1666 n : next search result for code or filename
0e063a9b764a crecord: enable search hotkeys (issue6834) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51388 diff changeset	1667 N : previous search result for code or filename
24840 a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1668 q : quit without confirming (no changes will be made)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1669 ? : help (what you're currently reading)"""
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1670 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1671
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1672 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	1673 helplines = helptext.split(b"\n")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1674 helplines = helplines + [b" "] * (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1675 self.yscreensize - self.numstatuslines - len(helplines) - 1
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1676 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1677 try:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1678 for line in helplines:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1679 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	1680 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1681 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1682 helpwin.refresh()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1683 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1684 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	1685 helpwin.getkey()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1686 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1687 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1688
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	1689 def commitMessageWindow(self):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1690 """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	1691
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	1692 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	1693 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	1694 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	1695 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	1696 self.stdscr.refresh()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1697 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	1698
42073 80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1699 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	1700 """
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1701 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	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 = 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	1704 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	1705 # 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	1706 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	1707 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	1708 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	1709 break
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1710 else:
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1711 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	1712
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1713 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	1714
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1715 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	1716 """
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1717 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	1718 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	1719
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1720 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	1721 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	1722 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	1723 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	1724 """
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1725 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	1726 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	1727 # 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	1728 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	1729 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	1730 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	1731 break
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1732 else:
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1733 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	1734
80103ed2e8ee crecord: new keys g & G to navigate to the top and bottom respectively Arun Chandrasekaran <aruncxy@gmail.com> parents: 42025 diff changeset	1735 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	1736 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	1737
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1738 def confirmationwindow(self, windowtext):
43807 be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1739 """display an informational window, then wait for and return a
be8552f25cab cleanup: fix docstring formatting Matt Harbison <matt_harbison@yahoo.com> parents: 43554 diff changeset	1740 keypress."""
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1741
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1742 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	1743 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1744 lines = windowtext.split(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1745 for line in lines:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1746 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	1747 except curses.error:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1748 pass
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1749 self.stdscr.refresh()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1750 confirmwin.refresh()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1751 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1752 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	1753 response = chr(self.stdscr.getch())
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1754 except ValueError:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1755 response = None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1756
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1757 return response
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1758
28926 0411b7998d9b crecord: cleanup the remains of commit confirmation Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 28925 diff changeset	1759 def reviewcommit(self):
24840 a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1760 """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	1761 confirmed."""
30544 3899c358b45a crecord: filter text via i18n Jun Wu <quark@fb.com> parents: 30542 diff changeset	1762 confirmtext = _(
46407 279edaaea711 crecord: change str literals to byte literals Matt Harbison <matt_harbison@yahoo.com> parents: 45957 diff changeset	1763 b"""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	1764 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	1765 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	1766 saving.
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1767
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1768 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	1769 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	1770
24840 a5e3634ba024 record: change wording for record curses interface Laurent Charignon <lcharignon@fb.com> parents: 24779 diff changeset	1771 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	1772 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1773 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1774 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	1775 response = self.confirmationwindow(confirmtext)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1776 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	1777 response = "n"
117b41b1859d py3: compare response of crecord's confirmationwindow with str Denis Laxalde <denis.laxalde@logilab.fr> parents: 43364 diff changeset	1778 if response.lower().startswith("y"):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1779 return True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1780 else:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1781 return False
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 def recenterdisplayedarea(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1784 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1785 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	1786 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	1787 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	1788 zone and then update the scroll.
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1789 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1790 self.printitem(towin=False)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1791 self.updatescroll()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1792
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1793 def toggleedit(self, item=None, test=False):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1794 """
28580 8b41ad798fb7 crecord: fix docblock indentation Ryan McElroy <rmcelroy@fb.com> parents: 28579 diff changeset	1795 edit the currently selected chunk
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1796 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1797
25555 838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1798 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	1799 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	1800 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	1801 self.updatescroll()
838fa1932ff8 crecord: extract ui refresh code after editing of hunk in a function Laurent Charignon <lcharignon@fb.com> parents: 25461 diff changeset	1802 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	1803 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	1804 self.stdscr.keypad(1)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1805
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1806 def editpatchwitheditor(self, chunk):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1807 if chunk is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1808 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	1809 self.ui.write(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1810 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1811 if chunk.header.binary():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1812 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	1813 self.ui.write(b"\n")
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1814 return None
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1815
28636 de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1816 # write the initial patch
28861 86db5cb55d46 pycompat: switch to util.stringio for py3 compat timeless <timeless@mozdev.org> parents: 28638 diff changeset	1817 patch = stringio()
28637 4874b8efe7d2 crecord: break out the help message for editing hunks Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28636 diff changeset	1818 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	1819 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	1820 chunk.write(patch)
de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1821
de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1822 # 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	1823 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1824 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	1825 except error.Abort as exc:
45682 d2e1dcd4490d errors: name arguments to Abort constructor Martin von Zweigbergk <martinvonz@google.com> parents: 45154 diff changeset	1826 self.errorstr = exc.message
28636 de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1827 return None
41991 3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	1828 finally:
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	1829 self.stdscr.clear()
3f467db023a2 crecord: completely redraw screen when coming back from editor Kyle Lippincott <spectral@google.com> parents: 41987 diff changeset	1830 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	1831
de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1832 # remove comment lines
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1833 patch = [
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1834 line + b'\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1835 for line in patch.splitlines()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1836 if not line.startswith(b'#')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1837 ]
28636 de64020bb4ec crecord: refactor hunk edit action to use ui.edit Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 28581 diff changeset	1838 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	1839
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1840 if item is None:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1841 item = self.currentselecteditem
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1842 if isinstance(item, uiheader):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1843 return
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1844 if isinstance(item, uihunkline):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1845 item = item.parentitem()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1846 if not isinstance(item, uihunk):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1847 return
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1848
27914 505a10b504ed crecord: edit during hg crecord should preserve cursor position (issue5041) Laurent Charignon <lcharignon@fb.com> parents: 27533 diff changeset	1849 # 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	1850 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	1851
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1852 beforeadded, beforeremoved = item.added, item.removed
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1853 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	1854 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	1855 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	1856 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	1857 return
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1858 header = item.header
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1859 editedhunkindex = header.hunks.index(item)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1860 hunksbefore = header.hunks[:editedhunkindex]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	1861 hunksafter = header.hunks[editedhunkindex + 1 :]
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1862 newpatchheader = newpatches[0]
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1863 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	1864 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	1865 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	1866 offset = (newadded - beforeadded) - (newremoved - beforeremoved)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1867
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1868 for h in hunksafter:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1869 h.toline += offset
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1870 for h in newhunks:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1871 h.folded = False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1872 header.hunks = hunksbefore + newhunks + hunksafter
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1873 if self.emptypatch():
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1874 header.hunks = hunksbefore + [item] + hunksafter
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1875 self.currentselecteditem = header
27914 505a10b504ed crecord: edit during hg crecord should preserve cursor position (issue5041) Laurent Charignon <lcharignon@fb.com> parents: 27533 diff changeset	1876 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	1877 self.currentselecteditem = header.hunks[itemindex]
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1878
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1879 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	1880 updateui(self)
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1881
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1882 def emptypatch(self):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1883 item = self.headerlist
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1884 if not item:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1885 return True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1886 for header in item:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1887 if header.hunks:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1888 return False
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1889 return True
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1890
51386 6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1891 def handlesearch(self):
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1892 win = curses.newwin(1, self.xscreensize, self.yscreensize - 1, 0)
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1893 win.echochar("/")
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1894
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1895 curses.echo()
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1896 curses.curs_set(1)
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1897 self.regex = win.getstr() or None
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1898 curses.noecho()
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1899 curses.curs_set(0)
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1900
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1901 if not self.showsearch(self.regex):
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1902 self.printstring(
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1903 win,
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1904 _(b"Pattern not found (press ENTER)"),
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1905 pairname=b"legend",
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1906 align=False,
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1907 )
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1908 while win.getkey() not in ["\n", "KEY_ENTER"]:
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1909 pass
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1910 del win
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1911
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1912 self.stdscr.clear()
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1913 self.stdscr.refresh()
6fb4d2dfa8e4 crecord: add a handlesearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51385 diff changeset	1914
51385 880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1915 def showsearch(self, regex, forward=True):
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1916 if not regex:
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1917 return
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1918
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1919 moveattr = 'nextitem' if forward else 'previtem'
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1920 currentitem = getattr(self.currentselecteditem, moveattr)(
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1921 skipfolded=False
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1922 )
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1923
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1924 matches = None
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1925 regex = re.compile(regex)
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1926 while currentitem:
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1927 matches = regex.search(currentitem.content)
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1928 if matches:
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1929 self.currentselecteditem = currentitem
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1930 break
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1931 currentitem = getattr(currentitem, moveattr)(skipfolded=False)
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1932
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1933 # Whatever is selected should now be visible
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1934 unfolded = self.currentselecteditem
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1935 while matches and unfolded:
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1936 unfolded.folded = False
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1937 unfolded = unfolded.parentitem()
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1938
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1939 return matches
880740426a34 crecord: add a showsearch function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51384 diff changeset	1940
51387 47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1941 def searchdirection(self, failuremsg, forward=True):
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1942 if not self.regex:
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1943 return
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1944
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1945 if not self.showsearch(self.regex, forward=forward):
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1946 win = curses.newwin(1, self.xscreensize, self.yscreensize - 1, 0)
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1947 self.printstring(win, failuremsg, pairname=b"legend", align=False)
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1948 while win.getkey() not in ["\n", "KEY_ENTER"]:
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1949 pass
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1950 del win
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1951
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1952 self.stdscr.clear()
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1953 self.stdscr.refresh()
47c74c120205 crecord: add a searchdirection function Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51386 diff changeset	1954
51388 d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1955 def handlenextsearch(self):
d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1956 self.searchdirection(
d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1957 _(b"Next pattern not found (press ENTER)"), forward=True
d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1958 )
d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1959
d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1960 def handleprevsearch(self):
d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1961 self.searchdirection(
d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1962 _(b"Previous pattern not found (press ENTER)"), forward=False
d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1963 )
d0f6b96d1fb8 crecord: add handle(next\|prev)search functions Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51387 diff changeset	1964
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1965 def handlekeypressed(self, keypressed, test=False):
28581 3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1966 """
3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1967 Perform actions based on pressed keys.
3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1968
3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1969 Return true to exit the main loop.
3c8f0a605504 crecord: add docblock to handlekeypressed Ryan McElroy <rmcelroy@fb.com> parents: 28580 diff changeset	1970 """
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1971 if keypressed in ["k", "KEY_UP"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1972 self.uparrowevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1973 elif keypressed in ["K", "KEY_PPAGE"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1974 self.uparrowshiftevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1975 elif keypressed in ["j", "KEY_DOWN"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1976 self.downarrowevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1977 elif keypressed in ["J", "KEY_NPAGE"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1978 self.downarrowshiftevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1979 elif keypressed in ["l", "KEY_RIGHT"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1980 self.rightarrowevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1981 elif keypressed in ["h", "KEY_LEFT"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1982 self.leftarrowevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1983 elif keypressed in ["H", "KEY_SLEFT"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1984 self.leftarrowshiftevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1985 elif keypressed in ["q"]:
45892 ac362d5a7893 errors: introduce CanceledError and use it in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 45766 diff changeset	1986 raise error.CanceledError(_(b'user quit'))
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1987 elif keypressed in ['a']:
43893 c06eba91c380 crecord: repurpose "a" key to toggle all selections (BC) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 43891 diff changeset	1988 self.flipselections()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1989 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	1990 return True
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1991 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	1992 if self.reviewcommit():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1993 self.opts[b'review'] = True
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1994 return True
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1995 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	1996 self.opts[b'review'] = True
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1997 return True
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	1998 elif keypressed in [" ", "x"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1999 self.toggleapply()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2000 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	2001 self.toggleapply()
42572 cd4f1b7c3192 crecord: make KEY_ENTER usable in tests (by not updating UI) Kyle Lippincott <spectral@google.com> parents: 42571 diff changeset	2002 self.nextsametype(test=test)
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2003 elif keypressed in ["X"]:
42573 9ac1a5a4a64f crecord: provide 'X' as a range-select mechanism Kyle Lippincott <spectral@google.com> parents: 42572 diff changeset	2004 self.toggleallbetween()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2005 elif keypressed in ["A"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2006 self.toggleall()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2007 elif keypressed in ["e"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2008 self.toggleedit(test=test)
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2009 elif keypressed in ["f"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2010 self.togglefolded()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2011 elif keypressed in ["F"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2012 self.togglefolded(foldparent=True)
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2013 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	2014 self.commitMessageWindow()
51389 0e063a9b764a crecord: enable search hotkeys (issue6834) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51388 diff changeset	2015 elif keypressed in ["/"]:
0e063a9b764a crecord: enable search hotkeys (issue6834) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51388 diff changeset	2016 self.handlesearch()
0e063a9b764a crecord: enable search hotkeys (issue6834) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51388 diff changeset	2017 elif keypressed in ["n"]:
0e063a9b764a crecord: enable search hotkeys (issue6834) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51388 diff changeset	2018 self.handlenextsearch()
0e063a9b764a crecord: enable search hotkeys (issue6834) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51388 diff changeset	2019 elif keypressed in ["N"]:
0e063a9b764a crecord: enable search hotkeys (issue6834) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 51388 diff changeset	2020 self.handleprevsearch()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2021 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	2022 self.handlefirstlineevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2023 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	2024 self.handlelastlineevent()
43424 7cc913396f8c py3: keep "keypressed" a native str in crecord Denis Laxalde <denis.laxalde@logilab.fr> parents: 43423 diff changeset	2025 elif keypressed in ["?"]:
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2026 self.helpwindow()
25419 6e62a5b3442d crecord: fix blue artifact bug coming back from help screen Laurent Charignon <lcharignon@fb.com> parents: 25359 diff changeset	2027 self.stdscr.clear()
6e62a5b3442d crecord: fix blue artifact bug coming back from help screen Laurent Charignon <lcharignon@fb.com> parents: 25359 diff changeset	2028 self.stdscr.refresh()
43425 be0f77fd274d py3: fix handling of ctrl keys in crecord (issue6213) Denis Laxalde <denis.laxalde@logilab.fr> parents: 43424 diff changeset	2029 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	2030 # 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	2031 # 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	2032 self.scrolllines(self.selecteditemstartline)
41992 fa3b0ca9d74f crecord: redraw the screen on ctrl-L Kyle Lippincott <spectral@google.com> parents: 41991 diff changeset	2033 self.stdscr.clear()
fa3b0ca9d74f crecord: redraw the screen on ctrl-L Kyle Lippincott <spectral@google.com> parents: 41991 diff changeset	2034 self.stdscr.refresh()
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2035
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2036 def main(self, stdscr):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2037 """
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2038 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	2039 """
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2040
31931 0130c3e1b1d9 crecord: avoid setting non-existing signal SIGWINCH on windows Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31930 diff changeset	2041 origsigwinch = sentinel = object()
50951 d718eddf01d9 safehasattr: drop usage in favor of hasattr Pierre-Yves David <pierre-yves.david@octobus.net> parents: 50593 diff changeset	2042 if hasattr(signal, 'SIGWINCH'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2043 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	2044 try:
7e7743a01103 crecord: ensure we reinstall the SIGWINCH handler Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31929 diff changeset	2045 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	2046 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	2047 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	2048 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	2049
bf6b44da1d8e crecord: extract most of 'main' into a sub function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31654 diff changeset	2050 def _main(self, stdscr):
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2051 self.stdscr = stdscr
25820 701d8c362aa2 crecord: add error reporting for failure in curses interface initialization Laurent Charignon <lcharignon@fb.com> parents: 25807 diff changeset	2052 # 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	2053 # 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	2054 self.initexc = None
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2055 self.yscreensize, self.xscreensize = self.stdscr.getmaxyx()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2056
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2057 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	2058 try:
fb2e59e92651 crecord: fallback to color = no when curses.use_default_colors() fails Elmar Bartel <elb_hg@leo.org> parents: 35531 diff changeset	2059 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	2060 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	2061 self.usecolor = False
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2062
41993 cde5827d09a7 crecord: redraw the screen when starting up chunkselector Kyle Lippincott <spectral@google.com> parents: 41992 diff changeset	2063 # 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	2064 # 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	2065 # 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	2066 # fit on the terminal.
cde5827d09a7 crecord: redraw the screen when starting up chunkselector Kyle Lippincott <spectral@google.com> parents: 41992 diff changeset	2067 self.stdscr.clear()
cde5827d09a7 crecord: redraw the screen when starting up chunkselector Kyle Lippincott <spectral@google.com> parents: 41992 diff changeset	2068
42025 66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	2069 # don't display the cursor
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	2070 try:
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	2071 curses.curs_set(0)
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	2072 except curses.error:
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	2073 pass
66fc05ff0ea3 crecord: draw on the whole screen Alexander Kobjolke <alex@jakalx.net> parents: 41993 diff changeset	2074
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2075 # 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	2076 # 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	2077 self.initcolorpair(None, None, name=b"normal")
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2078 self.initcolorpair(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2079 curses.COLOR_WHITE, curses.COLOR_MAGENTA, name=b"selected"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2080 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2081 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	2082 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	2083 self.initcolorpair(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2084 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	2085 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2086 # newwin([height, width,] begin_y, begin_x)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2087 self.statuswin = curses.newwin(self.numstatuslines, 0, 0, 0)
50409 29d7a5a8b8c6 crecord: switch a curses argument to bool to appease type checkers Matt Harbison <matt_harbison@yahoo.com> parents: 49099 diff changeset	2088 self.statuswin.keypad(True) # interpret arrow-key, etc. esc sequences
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2089
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2090 # 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	2091 # used for displaying the patch
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2092
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2093 # stupid hack to prevent getnumlinesdisplayed from failing
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2094 self.chunkpad = curses.newpad(1, self.xscreensize)
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2095
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2096 # 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	2097 self.numpadlines = self.getnumlinesdisplayed(ignorefolding=True) + 1
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2098
25821 d68544b69736 crecord: throws error instead of crashing for large diffs Laurent Charignon <lcharignon@fb.com> parents: 25820 diff changeset	2099 try:
d68544b69736 crecord: throws error instead of crashing for large diffs Laurent Charignon <lcharignon@fb.com> parents: 25820 diff changeset	2100 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	2101 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	2102 self.initexc = fallbackerror(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2103 _(b'this diff is too large to be displayed')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2104 )
25821 d68544b69736 crecord: throws error instead of crashing for large diffs Laurent Charignon <lcharignon@fb.com> parents: 25820 diff changeset	2105 return
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30328 diff changeset	2106 # 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	2107 self.selecteditemendline = self.getnumlinesdisplayed(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2108 self.currentselecteditem, recursechildren=False
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2109 )
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2110
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2111 while True:
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2112 self.updatescreen()
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2113 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2114 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	2115 keypressed = self.statuswin.getkey()
25556 40f0e9e5b821 crecord: add mechanism for error reporting Laurent Charignon <lcharignon@fb.com> parents: 25555 diff changeset	2116 if self.errorstr is not None:
40f0e9e5b821 crecord: add mechanism for error reporting Laurent Charignon <lcharignon@fb.com> parents: 25555 diff changeset	2117 self.errorstr = None
40f0e9e5b821 crecord: add mechanism for error reporting Laurent Charignon <lcharignon@fb.com> parents: 25555 diff changeset	2118 continue
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2119 except curses.error:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2120 keypressed = b"foobar"
24310 6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2121 if self.handlekeypressed(keypressed):
6409fb6c934d record: add crecord's ui logic to core Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2122 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	2123
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2124 if self.commenttext != b"":
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2125 whitespaceremoved = re.sub(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2126 br"(?m)^\s.*(\n\|$)", b"", self.commenttext
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42650 diff changeset	2127 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2128 if whitespaceremoved != b"":
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2129 self.opts[b'message'] = self.commenttext

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/crecord.py @ 53040:cdd7bf612c7b stable tip