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

annotate mercurial/crecord.py @ 45017:a65c60f3280e

curses: back out d2227d4c9e6b (do not initialize LC_ALL to user settings) The changeset was based on a25343d16ebe, which will be backed out, too. Another fix for the problem will be resubmitted to the stable branch.

author	Manuel Jacob <me@manueljacob.de>
date	Sun, 28 Jun 2020 17:49:14 +0200
parents	47a07bbf400a
children	4a503c1b664a

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

Mercurial > public > mercurial-scm > hg

annotate mercurial/crecord.py @ 45017:a65c60f3280e