mercurial-scm/hg-stable: hgext/histedit.py annotate

annotate hgext/histedit.py @ 43077:687b865b95ad

formatting: byteify all mercurial/ and hgext/ string literals Done with python3.7 contrib/byteify-strings.py -i $(hg files 'set:mercurial/**.py - mercurial/thirdparty/** + hgext/**.py - hgext/fsmonitor/pywatchman/** - mercurial/__init__.py') black -l 80 -t py33 -S $(hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**" - hgext/fsmonitor/pywatchman/**') # skip-blame mass-reformatting only Differential Revision: https://phab.mercurial-scm.org/D6972

author	Augie Fackler <augie@google.com>
date	Sun, 06 Oct 2019 09:48:39 -0400
parents	2372284d9457
children	eef9a2d67051

rev	line source
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1 # histedit.py - interactive history editing for mercurial
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	2 #
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	3 # Copyright 2009 Augie Fackler <raf@durin42.com>
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	4 #
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	7 """interactive history editing
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	8
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	9 With this extension installed, Mercurial gains one new command: histedit. Usage
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	10 is as follows, assuming the following history::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	11
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	12 @ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	13 \| Add delta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	14 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	15 o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	16 \| Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	17 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	18 o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	19 \| Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	20 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	21 o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	22 Add alpha
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	23
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	24 If you were to run ``hg histedit c561b4e977df``, you would see the following
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	25 file open in your editor::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	26
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	27 pick c561b4e977df Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	28 pick 030b686bedc4 Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	29 pick 7c2fd3b9020c Add delta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	30
18322 e819c12a8bd0 histedit: correct changeset IDs in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17771 diff changeset	31 # Edit history between c561b4e977df and 7c2fd3b9020c
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	32 #
20503 23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	33 # Commits are listed from least to most recent
23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	34 #
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	35 # Commands:
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	36 # p, pick = use commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	37 # e, edit = use commit, but stop for amending
20511 5840da876235 histedit: shorten new fold message Matt Mackall <mpm@selenic.com> parents: 20503 diff changeset	38 # f, fold = use commit, but combine it with the one above
31076 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	39 # r, roll = like fold, but discard this commit's description and date
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	40 # d, drop = remove commit from history
26100 5706d130ec16 histedit: improve discoverability of edit commit message timeless@mozdev.org parents: 26098 diff changeset	41 # m, mess = edit commit message without changing commit content
34489 270e344a6c74 histedit: removing the experimental config 'histeditng' Saurabh Singh <singhsrb@fb.com> parents: 34476 diff changeset	42 # b, base = checkout changeset and apply further changesets from there
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	43 #
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	44
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	45 In this file, lines beginning with ``#`` are ignored. You must specify a rule
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	46 for each revision in your history. For example, if you had meant to add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	47 before beta, and then wanted to add delta in the same revision as beta, you
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	48 would reorganize the file to look like this::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	49
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	50 pick 030b686bedc4 Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	51 pick c561b4e977df Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	52 fold 7c2fd3b9020c Add delta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	53
18322 e819c12a8bd0 histedit: correct changeset IDs in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17771 diff changeset	54 # Edit history between c561b4e977df and 7c2fd3b9020c
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	55 #
20503 23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	56 # Commits are listed from least to most recent
23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	57 #
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	58 # Commands:
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	59 # p, pick = use commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	60 # e, edit = use commit, but stop for amending
20511 5840da876235 histedit: shorten new fold message Matt Mackall <mpm@selenic.com> parents: 20503 diff changeset	61 # f, fold = use commit, but combine it with the one above
31076 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	62 # r, roll = like fold, but discard this commit's description and date
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	63 # d, drop = remove commit from history
26100 5706d130ec16 histedit: improve discoverability of edit commit message timeless@mozdev.org parents: 26098 diff changeset	64 # m, mess = edit commit message without changing commit content
34489 270e344a6c74 histedit: removing the experimental config 'histeditng' Saurabh Singh <singhsrb@fb.com> parents: 34476 diff changeset	65 # b, base = checkout changeset and apply further changesets from there
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	66 #
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	67
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	68 At which point you close the editor and ``histedit`` starts working. When you
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	69 specify a ``fold`` operation, ``histedit`` will open an editor when it folds
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	70 those revisions together, offering you a chance to clean up the commit message::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	71
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	72 Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	73 ***
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	74 Add delta
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	75
31075 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	76 Edit the commit message to your liking, then close the editor. The date used
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	77 for the commit will be the later of the two commits' dates. For this example,
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	78 let's assume that the commit message was changed to ``Add beta and delta.``
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	79 After histedit has run and had a chance to remove any old or temporary
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	80 revisions it needed, the history looks like this::
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	81
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	82 @ 2[tip] 989b4d060121 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	83 \| Add beta and delta.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	84 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	85 o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	86 \| Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	87 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	88 o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	89 Add alpha
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	90
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	91 Note that ``histedit`` does not remove any revisions (even its own temporary
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	92 ones) until after it has completed all the editing operations, so it will
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	93 probably perform several strip operations when it's done. For the above example,
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	94 it had to run strip twice. Strip can be slow depending on a variety of factors,
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	95 so you might need to be a little patient. You can choose to keep the original
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	96 revisions by passing the ``--keep`` flag.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	97
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	98 The ``edit`` operation will drop you back to a command prompt,
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	99 allowing you to edit files freely, or even use ``hg record`` to commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	100 some changes as a separate commit. When you're done, any remaining
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	101 uncommitted changes will be committed as well. When done, run ``hg
31075 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	102 histedit --continue`` to finish this step. If there are uncommitted
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	103 changes, you'll be prompted for a new commit message, but the default
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	104 commit message will be the original message for the ``edit`` ed
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	105 revision, and the date of the original commit will be preserved.
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	106
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	107 The ``message`` operation will give you a chance to revise a commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	108 message without changing the contents. It's a shortcut for doing
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	109 ``edit`` immediately followed by `hg histedit --continue``.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	110
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	111 If ``histedit`` encounters a conflict when moving a revision (while
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	112 handling ``pick`` or ``fold``), it'll stop in a similar manner to
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	113 ``edit`` with the difference that it won't prompt you for a commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	114 message when done. If you decide at this point that you don't like how
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	115 much work it will be to rearrange history, or that you made a mistake,
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	116 you can use ``hg histedit --abort`` to abandon the new changes you
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	117 have made and return to the state before you attempted to edit your
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	118 history.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	119
18323 7648b87e76db histedit: correct the number of added revisions in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18322 diff changeset	120 If we clone the histedit-ed example repository above and add four more
7648b87e76db histedit: correct the number of added revisions in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18322 diff changeset	121 changes, such that we have the following history::
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	122
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	123 @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	124 \| Add theta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	125 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	126 o 5 140988835471 2009-04-27 18:04 -0500 stefan
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	127 \| Add eta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	128 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	129 o 4 122930637314 2009-04-27 18:04 -0500 stefan
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	130 \| Add zeta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	131 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	132 o 3 836302820282 2009-04-27 18:04 -0500 stefan
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	133 \| Add epsilon
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	134 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	135 o 2 989b4d060121 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	136 \| Add beta and delta.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	137 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	138 o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	139 \| Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	140 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	141 o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	142 Add alpha
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	143
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	144 If you run ``hg histedit --outgoing`` on the clone then it is the same
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	145 as running ``hg histedit 836302820282``. If you need plan to push to a
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	146 repository that Mercurial does not detect to be related to the source
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	147 repo, you can add a ``--force`` option.
24199 4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	148
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	149 Config
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	150 ------
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	151
24199 4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	152 Histedit rule lines are truncated to 80 characters by default. You
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	153 can customize this behavior by setting a different length in your
24869 95a67d687903 histedit: fix reST syntax problem of example code in help document FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24831 diff changeset	154 configuration file::
24199 4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	155
24869 95a67d687903 histedit: fix reST syntax problem of example code in help document FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24831 diff changeset	156 [histedit]
95a67d687903 histedit: fix reST syntax problem of example code in help document FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24831 diff changeset	157 linelen = 120 # truncate rule lines at 120 characters
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	158
41523 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	159 The summary of a change can be customized as well::
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	160
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	161 [histedit]
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	162 summary-template = '{rev} {bookmarks} {desc\|firstline}'
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	163
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	164 The customized summary should be kept short enough that rule lines
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	165 will fit in the configured line length. See above if that requires
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	166 customization.
11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	167
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	168 ``hg histedit`` attempts to automatically choose an appropriate base
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	169 revision to use. To change which base revision is used, define a
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	170 revset in your configuration file::
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	171
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	172 [histedit]
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	173 defaultrev = only(.) & draft()
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	174
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	175 By default each edited revision needs to be present in histedit commands.
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	176 To remove revision you need to use ``drop`` operation. You can configure
27957 c54f017fcd52 doc: prevent literal text block from being treated as non-literal one FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27956 diff changeset	177 the drop to be implicit for missing commits by adding::
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	178
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	179 [histedit]
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	180 dropmissing = True
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	181
31520 68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	182 By default, histedit will close the transaction after each action. For
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	183 performance purposes, you can configure histedit to use a single transaction
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	184 across the entire histedit. WARNING: This setting introduces a significant risk
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	185 of losing the work you've done in a histedit if the histedit aborts
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	186 unexpectedly::
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	187
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	188 [histedit]
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	189 singletransaction = True
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	190
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	191 """
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	192
29126 7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	193 from __future__ import absolute_import
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	194
40695 291080871f50 histedit: conditionalize the imports of 'fcntl' and 'termios' Matt Harbison <matt_harbison@yahoo.com> parents: 40649 diff changeset	195 # chistedit dependencies that are not available everywhere
291080871f50 histedit: conditionalize the imports of 'fcntl' and 'termios' Matt Harbison <matt_harbison@yahoo.com> parents: 40649 diff changeset	196 try:
291080871f50 histedit: conditionalize the imports of 'fcntl' and 'termios' Matt Harbison <matt_harbison@yahoo.com> parents: 40649 diff changeset	197 import fcntl
291080871f50 histedit: conditionalize the imports of 'fcntl' and 'termios' Matt Harbison <matt_harbison@yahoo.com> parents: 40649 diff changeset	198 import termios
291080871f50 histedit: conditionalize the imports of 'fcntl' and 'termios' Matt Harbison <matt_harbison@yahoo.com> parents: 40649 diff changeset	199 except ImportError:
291080871f50 histedit: conditionalize the imports of 'fcntl' and 'termios' Matt Harbison <matt_harbison@yahoo.com> parents: 40649 diff changeset	200 fcntl = None
291080871f50 histedit: conditionalize the imports of 'fcntl' and 'termios' Matt Harbison <matt_harbison@yahoo.com> parents: 40649 diff changeset	201 termios = None
291080871f50 histedit: conditionalize the imports of 'fcntl' and 'termios' Matt Harbison <matt_harbison@yahoo.com> parents: 40649 diff changeset	202
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	203 import functools
42650 701341f57ceb curses: do not setlocale() at import time (issue5261) Yuya Nishihara <yuya@tcha.org> parents: 42584 diff changeset	204 import locale
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	205 import os
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	206 import struct
29205 a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29126 diff changeset	207
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29126 diff changeset	208 from mercurial.i18n import _
29126 7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	209 from mercurial import (
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	210 bundle2,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	211 cmdutil,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	212 context,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	213 copies,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	214 destutil,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	215 discovery,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	216 error,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	217 exchange,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	218 extensions,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	219 hg,
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	220 logcmdutil,
29126 7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	221 merge as mergemod,
32057 e5ffc91a2276 histedit: make check for unresolved conflicts explicit (issue5545) Siddharth Agarwal <sid0@fb.com> parents: 31643 diff changeset	222 mergeutil,
29126 7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	223 node,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	224 obsolete,
35040 c4b769bc86da py3: handle keyword arguments in hgext/histedit.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34917 diff changeset	225 pycompat,
32376 46ba2cdda476 registrar: move cmdutil.command to registrar module (API) Yuya Nishihara <yuya@tcha.org> parents: 32366 diff changeset	226 registrar,
29126 7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	227 repair,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	228 scmutil,
38510 18f348e035fb histedit: add a stateobj variable to histeditstate class Pulkit Goyal <7895pulkit@gmail.com> parents: 38509 diff changeset	229 state as statemod,
29126 7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	230 util,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	231 )
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37019 diff changeset	232 from mercurial.utils import (
41213 704a3aa3dc0a histedit: add rewrite.update-timestamp support to fold and mess Taapas Agrawal <taapas2897@gmail.com> parents: 41212 diff changeset	233 dateutil,
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37019 diff changeset	234 stringutil,
f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37019 diff changeset	235 )
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	236
29324 b501579147f1 py3: conditionalize cPickle import by adding in util Pulkit Goyal <7895pulkit@gmail.com> parents: 29214 diff changeset	237 pickle = util.pickle
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	238 cmdtable = {}
32376 46ba2cdda476 registrar: move cmdutil.command to registrar module (API) Yuya Nishihara <yuya@tcha.org> parents: 32366 diff changeset	239 command = registrar.command(cmdtable)
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	240
34471 6567002ae87e configitems: register the 'histedit.defaultrev' config Boris Feld <boris.feld@octobus.net> parents: 34046 diff changeset	241 configtable = {}
6567002ae87e configitems: register the 'histedit.defaultrev' config Boris Feld <boris.feld@octobus.net> parents: 34046 diff changeset	242 configitem = registrar.configitem(configtable)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	243 configitem(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	244 b'experimental', b'histedit.autoverb', default=False,
34475 b068a87e951d configitems: register the 'experimental.histedit.autoverb' config Boris Feld <boris.feld@octobus.net> parents: 34474 diff changeset	245 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	246 configitem(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	247 b'histedit', b'defaultrev', default=None,
34471 6567002ae87e configitems: register the 'histedit.defaultrev' config Boris Feld <boris.feld@octobus.net> parents: 34046 diff changeset	248 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	249 configitem(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	250 b'histedit', b'dropmissing', default=False,
34472 1e37cb4da6f8 configitems: register the 'histedit.dropmissing' config Boris Feld <boris.feld@octobus.net> parents: 34471 diff changeset	251 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	252 configitem(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	253 b'histedit', b'linelen', default=80,
34474 a746472c3d09 configitems: register the 'histedit.singletransaction' config Boris Feld <boris.feld@octobus.net> parents: 34473 diff changeset	254 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	255 configitem(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	256 b'histedit', b'singletransaction', default=False,
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	257 )
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	258 configitem(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	259 b'ui', b'interface.histedit', default=None,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	260 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	261 configitem(b'histedit', b'summary-template', default=b'{rev} {desc\|firstline}')
34471 6567002ae87e configitems: register the 'histedit.defaultrev' config Boris Feld <boris.feld@octobus.net> parents: 34046 diff changeset	262
29852 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 29831 diff changeset	263 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
25186 80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	264 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	265 # be specifying the version(s) of Mercurial they are tested with, or
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	266 # leave the attribute unspecified.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	267 testedwith = b'ships-with-hg-core'
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	268
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	269 actiontable = {}
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	270 primaryactions = set()
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	271 secondaryactions = set()
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	272 tertiaryactions = set()
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	273 internalactions = set()
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	274
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	275
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	276 def geteditcomment(ui, first, last):
27673 d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	277 """ construct the editor comment
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	278 The comment includes::
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	279 - an intro
27674 78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27673 diff changeset	280 - sorted primary commands
78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27673 diff changeset	281 - sorted short commands
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	282 - sorted long commands
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	283 - additional hints
27673 d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	284
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	285 Commands are only included once.
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	286 """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	287 intro = _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	288 """Edit history between %s and %s
27673 d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	289
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	290 Commits are listed from least to most recent
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	291
28396 5490b04e6132 histedit: adds hint how to reorder changesets at editor (issue3766) liscju <piotr.listkiewicz@gmail.com> parents: 28340 diff changeset	292 You can reorder changesets by reordering the lines
5490b04e6132 histedit: adds hint how to reorder changesets at editor (issue3766) liscju <piotr.listkiewicz@gmail.com> parents: 28340 diff changeset	293
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	294 Commands:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	295 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	296 )
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	297 actions = []
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	298
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	299 def addverb(v):
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	300 a = actiontable[v]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	301 lines = a.message.split(b"\n")
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	302 if len(a.verbs):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	303 v = b', '.join(sorted(a.verbs, key=lambda v: len(v)))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	304 actions.append(b" %s = %s" % (v, lines[0]))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	305 actions.extend([b' %s' for l in lines[1:]])
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	306
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	307 for v in (
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	308 sorted(primaryactions)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	309 + sorted(secondaryactions)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	310 + sorted(tertiaryactions)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	311 ):
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	312 addverb(v)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	313 actions.append(b'')
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	314
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	315 hints = []
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	316 if ui.configbool(b'histedit', b'dropmissing'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	317 hints.append(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	318 b"Deleting a changeset from the list "
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	319 b"will DISCARD it from the edited history!"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	320 )
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	321
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	322 lines = (intro % (first, last)).split(b'\n') + actions + hints
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	323
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	324 return b''.join([b'# %s\n' % l if l else b'#\n' for l in lines])
27673 d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	325
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	326
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	327 class histeditstate(object):
41165 a3a24ad10efb histedit: drop unused constructor arguments (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41151 diff changeset	328 def __init__(self, repo):
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	329 self.repo = repo
41165 a3a24ad10efb histedit: drop unused constructor arguments (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41151 diff changeset	330 self.actions = None
a3a24ad10efb histedit: drop unused constructor arguments (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41151 diff changeset	331 self.keep = None
a3a24ad10efb histedit: drop unused constructor arguments (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41151 diff changeset	332 self.topmost = None
a3a24ad10efb histedit: drop unused constructor arguments (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41151 diff changeset	333 self.parentctxnode = None
a3a24ad10efb histedit: drop unused constructor arguments (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41151 diff changeset	334 self.lock = None
a3a24ad10efb histedit: drop unused constructor arguments (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41151 diff changeset	335 self.wlock = None
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	336 self.backupfile = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	337 self.stateobj = statemod.cmdstate(repo, b'histedit-state')
41165 a3a24ad10efb histedit: drop unused constructor arguments (API) Martin von Zweigbergk <martinvonz@google.com> parents: 41151 diff changeset	338 self.replacements = []
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	339
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	340 def read(self):
22986 7b93b49286d0 histedit: update docstring on histeditstate.read() Augie Fackler <raf@durin42.com> parents: 22985 diff changeset	341 """Load histedit state from disk and set fields appropriately."""
38511 03e7ec8180f0 histedit: use self.stateobj to check whether interrupted histedit exists Pulkit Goyal <7895pulkit@gmail.com> parents: 38510 diff changeset	342 if not self.stateobj.exists():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	343 cmdutil.wrongtooltocontinue(self.repo, _(b'histedit'))
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	344
38511 03e7ec8180f0 histedit: use self.stateobj to check whether interrupted histedit exists Pulkit Goyal <7895pulkit@gmail.com> parents: 38510 diff changeset	345 data = self._read()
38509 c6a2ce82e60b histedit: factor out logic of processing state data in separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38508 diff changeset	346
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	347 self.parentctxnode = data[b'parentctxnode']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	348 actions = parserules(data[b'rules'], self)
38509 c6a2ce82e60b histedit: factor out logic of processing state data in separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38508 diff changeset	349 self.actions = actions
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	350 self.keep = data[b'keep']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	351 self.topmost = data[b'topmost']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	352 self.replacements = data[b'replacements']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	353 self.backupfile = data[b'backupfile']
38509 c6a2ce82e60b histedit: factor out logic of processing state data in separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38508 diff changeset	354
38511 03e7ec8180f0 histedit: use self.stateobj to check whether interrupted histedit exists Pulkit Goyal <7895pulkit@gmail.com> parents: 38510 diff changeset	355 def _read(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	356 fp = self.repo.vfs.read(b'histedit-state')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	357 if fp.startswith(b'v1\n'):
27527 dbfaf361c062 histedit: only use pickle if not using the modern save format Bryan O'Sullivan <bos@serpentine.com> parents: 27451 diff changeset	358 data = self._load()
dbfaf361c062 histedit: only use pickle if not using the modern save format Bryan O'Sullivan <bos@serpentine.com> parents: 27451 diff changeset	359 parentctxnode, rules, keep, topmost, replacements, backupfile = data
dbfaf361c062 histedit: only use pickle if not using the modern save format Bryan O'Sullivan <bos@serpentine.com> parents: 27451 diff changeset	360 else:
38509 c6a2ce82e60b histedit: factor out logic of processing state data in separate fn Pulkit Goyal <7895pulkit@gmail.com> parents: 38508 diff changeset	361 data = pickle.loads(fp)
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	362 parentctxnode, rules, keep, topmost, replacements = data
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	363 backupfile = None
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	364 rules = b"\n".join([b"%s %s" % (verb, rest) for [verb, rest] in rules])
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	365
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	366 return {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	367 b'parentctxnode': parentctxnode,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	368 b"rules": rules,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	369 b"keep": keep,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	370 b"topmost": topmost,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	371 b"replacements": replacements,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	372 b"backupfile": backupfile,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	373 }
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	374
31518 fa8aaff2001a histedit: add transaction support to writing the state file Durham Goode <durham@fb.com> parents: 31468 diff changeset	375 def write(self, tr=None):
fa8aaff2001a histedit: add transaction support to writing the state file Durham Goode <durham@fb.com> parents: 31468 diff changeset	376 if tr:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	377 tr.addfilegenerator(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	378 b'histedit-state',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	379 (b'histedit-state',),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	380 self._write,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	381 location=b'plain',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	382 )
31518 fa8aaff2001a histedit: add transaction support to writing the state file Durham Goode <durham@fb.com> parents: 31468 diff changeset	383 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	384 with self.repo.vfs(b"histedit-state", b"w") as f:
31518 fa8aaff2001a histedit: add transaction support to writing the state file Durham Goode <durham@fb.com> parents: 31468 diff changeset	385 self._write(f)
fa8aaff2001a histedit: add transaction support to writing the state file Durham Goode <durham@fb.com> parents: 31468 diff changeset	386
fa8aaff2001a histedit: add transaction support to writing the state file Durham Goode <durham@fb.com> parents: 31468 diff changeset	387 def _write(self, fp):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	388 fp.write(b'v1\n')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	389 fp.write(b'%s\n' % node.hex(self.parentctxnode))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	390 fp.write(b'%s\n' % node.hex(self.topmost))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	391 fp.write(b'%s\n' % (b'True' if self.keep else b'False'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	392 fp.write(b'%d\n' % len(self.actions))
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	393 for action in self.actions:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	394 fp.write(b'%s\n' % action.tostate())
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	395 fp.write(b'%d\n' % len(self.replacements))
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	396 for replacement in self.replacements:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	397 fp.write(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	398 b'%s%s\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	399 % (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	400 node.hex(replacement[0]),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	401 b''.join(node.hex(r) for r in replacement[1]),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	402 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	403 )
24958 a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	404 backupfile = self.backupfile
a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	405 if not backupfile:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	406 backupfile = b''
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	407 fp.write(b'%s\n' % backupfile)
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	408
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	409 def _load(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	410 fp = self.repo.vfs(b'histedit-state', b'r')
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	411 lines = [l[:-1] for l in fp.readlines()]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	412
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	413 index = 0
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	414 lines[index] # version number
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	415 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	416
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	417 parentctxnode = node.bin(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	418 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	419
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	420 topmost = node.bin(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	421 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	422
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	423 keep = lines[index] == b'True'
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	424 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	425
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	426 # Rules
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	427 rules = []
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	428 rulelen = int(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	429 index += 1
38823 e7aa113b14f7 global: use pycompat.xrange() Gregory Szorc <gregory.szorc@gmail.com> parents: 38738 diff changeset	430 for i in pycompat.xrange(rulelen):
24810 f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	431 ruleaction = lines[index]
f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	432 index += 1
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	433 rule = lines[index]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	434 index += 1
24810 f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	435 rules.append((ruleaction, rule))
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	436
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	437 # Replacements
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	438 replacements = []
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	439 replacementlen = int(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	440 index += 1
38823 e7aa113b14f7 global: use pycompat.xrange() Gregory Szorc <gregory.szorc@gmail.com> parents: 38738 diff changeset	441 for i in pycompat.xrange(replacementlen):
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	442 replacement = lines[index]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	443 original = node.bin(replacement[:40])
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	444 succ = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	445 node.bin(replacement[i : i + 40])
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	446 for i in range(40, len(replacement), 40)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	447 ]
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	448 replacements.append((original, succ))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	449 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	450
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	451 backupfile = lines[index]
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	452 index += 1
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	453
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	454 fp.close()
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	455
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	456 return parentctxnode, rules, keep, topmost, replacements, backupfile
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	457
22978 d4e764521249 histedit: add clear method to remove state David Soria Parra <davidsp@fb.com> parents: 22977 diff changeset	458 def clear(self):
26583 49b568a4e539 histedit: check presence of statefile before deleting it Christian Delahousse <cdelahousse@fb.com> parents: 26582 diff changeset	459 if self.inprogress():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	460 self.repo.vfs.unlink(b'histedit-state')
22978 d4e764521249 histedit: add clear method to remove state David Soria Parra <davidsp@fb.com> parents: 22977 diff changeset	461
26582 42b908673866 histedit: add inprogress method to state class Christian Delahousse <cdelahousse@fb.com> parents: 26335 diff changeset	462 def inprogress(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	463 return self.repo.vfs.exists(b'histedit-state')
26582 42b908673866 histedit: add inprogress method to state class Christian Delahousse <cdelahousse@fb.com> parents: 26335 diff changeset	464
27200 62b9a87a365e histedit: add actions property to histedit state Mateusz Kwapich <mitrandir@fb.com> parents: 27171 diff changeset	465
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	466 class histeditaction(object):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	467 def __init__(self, state, node):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	468 self.state = state
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	469 self.repo = state.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	470 self.node = node
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	471
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	472 @classmethod
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	473 def fromrule(cls, state, rule):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	474 """Parses the given rule, returning an instance of the histeditaction.
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	475 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	476 ruleid = rule.strip().split(b' ', 1)[0]
37109 3d3cff1f6bde histedit: make histedit's commands accept revsets (issue5746) Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> parents: 37087 diff changeset	477 # ruleid can be anything from rev numbers, hashes, "bookmarks" etc
3d3cff1f6bde histedit: make histedit's commands accept revsets (issue5746) Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> parents: 37087 diff changeset	478 # Check for validation of rule ids and get the rulehash
27547 1cbfeb1dc5aa histedit: handle exceptions from node.bin in fromrule timeless <timeless@mozdev.org> parents: 27546 diff changeset	479 try:
37109 3d3cff1f6bde histedit: make histedit's commands accept revsets (issue5746) Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> parents: 37087 diff changeset	480 rev = node.bin(ruleid)
36275 f574cc00831a node: make bin() be a wrapper instead of just an alias Augie Fackler <augie@google.com> parents: 36213 diff changeset	481 except TypeError:
37109 3d3cff1f6bde histedit: make histedit's commands accept revsets (issue5746) Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> parents: 37087 diff changeset	482 try:
3d3cff1f6bde histedit: make histedit's commands accept revsets (issue5746) Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> parents: 37087 diff changeset	483 _ctx = scmutil.revsingle(state.repo, ruleid)
3d3cff1f6bde histedit: make histedit's commands accept revsets (issue5746) Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> parents: 37087 diff changeset	484 rulehash = _ctx.hex()
3d3cff1f6bde histedit: make histedit's commands accept revsets (issue5746) Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> parents: 37087 diff changeset	485 rev = node.bin(rulehash)
3d3cff1f6bde histedit: make histedit's commands accept revsets (issue5746) Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com> parents: 37087 diff changeset	486 except error.RepoLookupError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	487 raise error.ParseError(_(b"invalid changeset %s") % ruleid)
27547 1cbfeb1dc5aa histedit: handle exceptions from node.bin in fromrule timeless <timeless@mozdev.org> parents: 27546 diff changeset	488 return cls(state, rev)
27202 2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	489
29883 b566c5992e07 histedit: move constraint verification to the 'action.verify' method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29882 diff changeset	490 def verify(self, prev, expected, seen):
27202 2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	491 """ Verifies semantic correctness of the rule"""
2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	492 repo = self.repo
2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	493 ha = node.hex(self.node)
37678 5f8f013e7d52 scmutil: rename resolvepartialhexnodeid() to resolvehexnodeidprefix() Martin von Zweigbergk <martinvonz@google.com> parents: 37506 diff changeset	494 self.node = scmutil.resolvehexnodeidprefix(repo, ha)
37506 c4131138eadb histedit: look up partial nodeid as partial nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 37505 diff changeset	495 if self.node is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	496 raise error.ParseError(_(b'unknown changeset %s listed') % ha[:12])
37505 966061b8826d histedit: drop unnecessary check for "self.node is not None" Martin von Zweigbergk <martinvonz@google.com> parents: 37314 diff changeset	497 self._verifynodeconstraints(prev, expected, seen)
29883 b566c5992e07 histedit: move constraint verification to the 'action.verify' method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29882 diff changeset	498
29884 a485ec066867 histedt: use inheritance to override the constraints in 'base' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29883 diff changeset	499 def _verifynodeconstraints(self, prev, expected, seen):
a485ec066867 histedt: use inheritance to override the constraints in 'base' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29883 diff changeset	500 # by default command need a node in the edited list
a485ec066867 histedt: use inheritance to override the constraints in 'base' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29883 diff changeset	501 if self.node not in expected:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	502 raise error.ParseError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	503 _(b'%s "%s" changeset was not a candidate')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	504 % (self.verb, node.short(self.node)),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	505 hint=_(b'only use listed changesets'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	506 )
29884 a485ec066867 histedt: use inheritance to override the constraints in 'base' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29883 diff changeset	507 # and only one command per node
a485ec066867 histedt: use inheritance to override the constraints in 'base' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29883 diff changeset	508 if self.node in seen:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	509 raise error.ParseError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	510 _(b'duplicated command for changeset %s')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	511 % node.short(self.node)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	512 )
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	513
29466 a0efbfbba7b5 histedit: remove unneeded initial parameter Sean Farley <sean@farley.io> parents: 29465 diff changeset	514 def torule(self):
27203 b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	515 """build a histedit rule line for an action
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	516
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	517 by default lines are in the form:
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	518 <hash> <rev> <summary>
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	519 """
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	520 ctx = self.repo[self.node]
41523 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	521 ui = self.repo.ui
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	522 summary = (
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	523 cmdutil.rendertemplate(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	524 ctx, ui.config(b'histedit', b'summary-template')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	525 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	526 or b''
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	527 )
41523 11c076786d56 histedit: add templating support to histedit's rule file generation Augie Fackler <augie@google.com> parents: 41421 diff changeset	528 summary = summary.splitlines()[0]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	529 line = b'%s %s %s' % (self.verb, ctx, summary)
27203 b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	530 # trim to 75 columns by default so it's not stupidly wide in my editor
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	531 # (the 5 more are left for verb)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	532 maxlen = self.repo.ui.configint(b'histedit', b'linelen')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	533 maxlen = max(maxlen, 22) # avoid truncating hash
37087 f0b6fbea00cf stringutil: bulk-replace call sites to point to new module Yuya Nishihara <yuya@tcha.org> parents: 37019 diff changeset	534 return stringutil.ellipsis(line, maxlen)
27203 b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	535
27206 7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	536 def tostate(self):
7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	537 """Print an action in format used by histedit state files
7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	538 (the first line is a verb, the remainder is the second)
7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	539 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	540 return b"%s\n%s" % (self.verb, node.hex(self.node))
27206 7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	541
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	542 def run(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	543 """Runs the action. The default behavior is simply apply the action's
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	544 rulectx onto the current parentctx."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	545 self.applychange()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	546 self.continuedirty()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	547 return self.continueclean()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	548
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	549 def applychange(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	550 """Applies the changes from this action's rulectx onto the current
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	551 parentctx, but does not commit them."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	552 repo = self.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	553 rulectx = repo[self.node]
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	554 repo.ui.pushbuffer(error=True, labeled=True)
27405 5837ca674da9 histedit: omit useless message from update (histeditaction) timeless <timeless@mozdev.org> parents: 27403 diff changeset	555 hg.update(repo, self.state.parentctxnode, quietempty=True)
42052 15d2afa31e57 histedit: narrow the scope of discarded ui output Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42022 diff changeset	556 repo.ui.popbuffer()
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	557 stats = applychanges(repo.ui, repo, rulectx, {})
35004 7b73bf1a48d4 histedit: preserve active branch while histediting Boris Feld <boris.feld@octobus.net> parents: 34917 diff changeset	558 repo.dirstate.setbranch(rulectx.branch())
37128 6f570c501e3e merge: deprecate accessing update results by index Gregory Szorc <gregory.szorc@gmail.com> parents: 37111 diff changeset	559 if stats.unresolvedcount:
27629 e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	560 raise error.InterventionRequired(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	561 _(b'Fix up the change (%s %s)')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	562 % (self.verb, node.short(self.node)),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	563 hint=_(b'hg histedit --continue to resume'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	564 )
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	565
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	566 def continuedirty(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	567 """Continues the action when changes have been applied to the working
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	568 copy. The default behavior is to commit the dirty changes."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	569 repo = self.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	570 rulectx = repo[self.node]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	571
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	572 editor = self.commiteditor()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	573 commit = commitfuncfor(repo, rulectx)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	574 if repo.ui.configbool(b'rewrite', b'update-timestamp'):
41213 704a3aa3dc0a histedit: add rewrite.update-timestamp support to fold and mess Taapas Agrawal <taapas2897@gmail.com> parents: 41212 diff changeset	575 date = dateutil.makedate()
704a3aa3dc0a histedit: add rewrite.update-timestamp support to fold and mess Taapas Agrawal <taapas2897@gmail.com> parents: 41212 diff changeset	576 else:
704a3aa3dc0a histedit: add rewrite.update-timestamp support to fold and mess Taapas Agrawal <taapas2897@gmail.com> parents: 41212 diff changeset	577 date = rulectx.date()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	578 commit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	579 text=rulectx.description(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	580 user=rulectx.user(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	581 date=date,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	582 extra=rulectx.extra(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	583 editor=editor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	584 )
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	585
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	586 def commiteditor(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	587 """The editor to be used to edit the commit message."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	588 return False
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	589
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	590 def continueclean(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	591 """Continues the action when the working copy is clean. The default
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	592 behavior is to accept the current commit as the new version of the
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	593 rulectx."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	594 ctx = self.repo[b'.']
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	595 if ctx.node() == self.state.parentctxnode:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	596 self.repo.ui.warn(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	597 _(b'%s: skipping changeset (no changes)\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	598 % node.short(self.node)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	599 )
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	600 return ctx, [(self.node, tuple())]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	601 if ctx.node() == self.node:
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	602 # Nothing changed
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	603 return ctx, []
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	604 return ctx, [(self.node, (ctx.node(),))]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	605
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	606
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	607 def commitfuncfor(repo, src):
b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	608 """Build a commit function for the replacement of <src>
b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	609
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18609 diff changeset	610 This function ensure we apply the same treatment to all changesets.
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	611
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18436 diff changeset	612 - Add a 'histedit_source' entry in extra.
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	613
25450 7e36c3000ead histedit: copyedit docstring wording problem I noticed while here Augie Fackler <augie@google.com> parents: 25412 diff changeset	614 Note that fold has its own separated logic because its handling is a bit
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	615 different and not easily factored out of the fold method.
b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	616 """
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	617 phasemin = src.phase()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	618
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	619 def commitfunc(**kwargs):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	620 overrides = {(b'phases', b'new-commit'): phasemin}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	621 with repo.ui.configoverride(overrides, b'histedit'):
35040 c4b769bc86da py3: handle keyword arguments in hgext/histedit.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34917 diff changeset	622 extra = kwargs.get(r'extra', {}).copy()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	623 extra[b'histedit_source'] = src.hex()
35040 c4b769bc86da py3: handle keyword arguments in hgext/histedit.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34917 diff changeset	624 kwargs[r'extra'] = extra
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	625 return repo.commit(**kwargs)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	626
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	627 return commitfunc
b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	628
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	629
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	630 def applychanges(ui, repo, ctx, opts):
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	631 """Merge changeset from ctx (only) in the current working directory"""
41419 0bd56c291359 cleanup: use p1() and p2() instead of parents()[0] and parents()[1] Martin von Zweigbergk <martinvonz@google.com> parents: 41223 diff changeset	632 wcpar = repo.dirstate.p1()
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	633 if ctx.p1().node() == wcpar:
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	634 # edits are "in place" we do not need to make any merge,
27603 8a87627d263a histedit: fix comment in applychanges timeless <timeless@mozdev.org> parents: 27600 diff changeset	635 # just applies changes on parent for editing
42052 15d2afa31e57 histedit: narrow the scope of discarded ui output Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42022 diff changeset	636 ui.pushbuffer()
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	637 cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
37111 0351fb0153ba histedit: always define update results Gregory Szorc <gregory.szorc@gmail.com> parents: 37109 diff changeset	638 stats = mergemod.updateresult(0, 0, 0, 0)
42052 15d2afa31e57 histedit: narrow the scope of discarded ui output Rodrigo Damazio Bovendorp <rdamazio@google.com> parents: 42022 diff changeset	639 ui.popbuffer()
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	640 else:
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	641 try:
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	642 # ui.forcemerge is an internal variable, do not document
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	643 repo.ui.setconfig(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	644 b'ui', b'forcemerge', opts.get(b'tool', b''), b'histedit'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	645 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	646 stats = mergemod.graft(repo, ctx, ctx.p1(), [b'local', b'histedit'])
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	647 finally:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	648 repo.ui.setconfig(b'ui', b'forcemerge', b'', b'histedit')
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	649 return stats
17407 31c123a2f273 histedit: factored out diff/patch logic Leah Xue <leahxue@fb.com> parents: 17340 diff changeset	650
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	651
36433 10de411d7207 histedit: rename variables so they have "ctx" in them Gregory Szorc <gregory.szorc@gmail.com> parents: 36275 diff changeset	652 def collapse(repo, firstctx, lastctx, commitopts, skipprompt=False):
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	653 """collapse the set of revisions from first to last as new one.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	654
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	655 Expected commit options are:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	656 - message
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	657 - date
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	658 - username
17738 b8424c92ba2b spelling: fix minor spell checker issues Mads Kiilerich <mads@kiilerich.com> parents: 17666 diff changeset	659 Commit message is edited in all cases.
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	660
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	661 This function works in memory."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	662 ctxs = list(repo.set(b'%d::%d', firstctx.rev(), lastctx.rev()))
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	663 if not ctxs:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	664 return None
25452 43906060a3f4 histedit: abort rather than edit a public changeset (issue4704) Augie Fackler <augie@google.com> parents: 25450 diff changeset	665 for c in ctxs:
43906060a3f4 histedit: abort rather than edit a public changeset (issue4704) Augie Fackler <augie@google.com> parents: 25450 diff changeset	666 if not c.mutable():
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	667 raise error.ParseError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	668 _(b"cannot fold into public change %s") % node.short(c.node())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	669 )
41419 0bd56c291359 cleanup: use p1() and p2() instead of parents()[0] and parents()[1] Martin von Zweigbergk <martinvonz@google.com> parents: 41223 diff changeset	670 base = firstctx.p1()
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	671
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	672 # commit a new version of the old changeset, including the update
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	673 # collect all files which might be affected
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	674 files = set()
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	675 for ctx in ctxs:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	676 files.update(ctx.files())
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	677
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	678 # Recompute copies (avoid recording a -> b -> a)
36433 10de411d7207 histedit: rename variables so they have "ctx" in them Gregory Szorc <gregory.szorc@gmail.com> parents: 36275 diff changeset	679 copied = copies.pathcopies(base, lastctx)
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	680
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	681 # prune files which were reverted by the updates
36433 10de411d7207 histedit: rename variables so they have "ctx" in them Gregory Szorc <gregory.szorc@gmail.com> parents: 36275 diff changeset	682 files = [f for f in files if not cmdutil.samefile(f, lastctx, base)]
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	683 # commit version of these files as defined by head
36433 10de411d7207 histedit: rename variables so they have "ctx" in them Gregory Szorc <gregory.szorc@gmail.com> parents: 36275 diff changeset	684 headmf = lastctx.manifest()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	685
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	686 def filectxfn(repo, ctx, path):
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	687 if path in headmf:
36433 10de411d7207 histedit: rename variables so they have "ctx" in them Gregory Szorc <gregory.szorc@gmail.com> parents: 36275 diff changeset	688 fctx = lastctx[path]
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	689 flags = fctx.flags()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	690 mctx = context.memfilectx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	691 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	692 ctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	693 fctx.path(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	694 fctx.data(),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	695 islink=b'l' in flags,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	696 isexec=b'x' in flags,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	697 copysource=copied.get(path),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	698 )
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	699 return mctx
22296 650b5b6e75ed convert: use None value for missing files instead of overloading IOError Mads Kiilerich <madski@unity3d.com> parents: 22280 diff changeset	700 return None
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	701
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	702 if commitopts.get(b'message'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	703 message = commitopts[b'message']
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	704 else:
36433 10de411d7207 histedit: rename variables so they have "ctx" in them Gregory Szorc <gregory.szorc@gmail.com> parents: 36275 diff changeset	705 message = firstctx.description()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	706 user = commitopts.get(b'user')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	707 date = commitopts.get(b'date')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	708 extra = commitopts.get(b'extra')
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	709
36433 10de411d7207 histedit: rename variables so they have "ctx" in them Gregory Szorc <gregory.szorc@gmail.com> parents: 36275 diff changeset	710 parents = (firstctx.p1().node(), firstctx.p2().node())
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	711 editor = None
24828 5045a003260b histedit: fix rollup prompting for a commit message (issue4606) Durham Goode <durham@fb.com> parents: 24810 diff changeset	712 if not skipprompt:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	713 editor = cmdutil.getcommiteditor(edit=True, editform=b'histedit.fold')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	714 new = context.memctx(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	715 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	716 parents=parents,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	717 text=message,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	718 files=files,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	719 filectxfn=filectxfn,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	720 user=user,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	721 date=date,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	722 extra=extra,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	723 editor=editor,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	724 )
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	725 return repo.commitctx(new)
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	726
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	727
26981 cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	728 def _isdirtywc(repo):
cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	729 return repo[None].dirty(missing=True)
cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	730
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	731
27084 383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	732 def abortdirty():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	733 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	734 _(b'working copy has pending changes'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	735 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	736 b'amend, commit, or revert them and run histedit '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	737 b'--continue, or abort with histedit --abort'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	738 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	739 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	740
27084 383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	741
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	742 def action(verbs, message, priority=False, internal=False):
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	743 def wrap(cls):
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	744 assert not priority or not internal
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	745 verb = verbs[0]
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	746 if priority:
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	747 primaryactions.add(verb)
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	748 elif internal:
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	749 internalactions.add(verb)
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	750 elif len(verbs) > 1:
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	751 secondaryactions.add(verb)
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	752 else:
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	753 tertiaryactions.add(verb)
27201 dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	754
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	755 cls.verb = verb
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	756 cls.verbs = verbs
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	757 cls.message = message
27201 dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	758 for verb in verbs:
dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	759 actiontable[verb] = cls
dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	760 return cls
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	761
27201 dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	762 return wrap
dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	763
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	764
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	765 @action([b'pick', b'p'], _(b'use commit'), priority=True)
24767 477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	766 class pick(histeditaction):
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	767 def run(self):
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	768 rulectx = self.repo[self.node]
41419 0bd56c291359 cleanup: use p1() and p2() instead of parents()[0] and parents()[1] Martin von Zweigbergk <martinvonz@google.com> parents: 41223 diff changeset	769 if rulectx.p1().node() == self.state.parentctxnode:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	770 self.repo.ui.debug(b'node %s unchanged\n' % node.short(self.node))
24767 477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	771 return rulectx, []
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	772
24767 477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	773 return super(pick, self).run()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	774
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	775
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	776 @action([b'edit', b'e'], _(b'use commit, but stop for amending'), priority=True)
24770 facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	777 class edit(histeditaction):
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	778 def run(self):
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	779 repo = self.repo
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	780 rulectx = repo[self.node]
27407 bf4d5d8dc2aa histedit: omit useless message from update (edit) timeless <timeless@mozdev.org> parents: 27406 diff changeset	781 hg.update(repo, self.state.parentctxnode, quietempty=True)
24770 facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	782 applychanges(repo.ui, repo, rulectx, {})
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	783 raise error.InterventionRequired(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	784 _(b'Editing (%s), you may commit or record as needed now.')
27629 e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	785 % node.short(self.node),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	786 hint=_(b'hg histedit --continue to resume'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	787 )
24770 facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	788
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	789 def commiteditor(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	790 return cmdutil.getcommiteditor(edit=True, editform=b'histedit.edit')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	791
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	792
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	793 @action([b'fold', b'f'], _(b'use commit, but combine it with the one above'))
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	794 class fold(histeditaction):
29883 b566c5992e07 histedit: move constraint verification to the 'action.verify' method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29882 diff changeset	795 def verify(self, prev, expected, seen):
27542 bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	796 """ Verifies semantic correctness of the fold rule"""
29883 b566c5992e07 histedit: move constraint verification to the 'action.verify' method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29882 diff changeset	797 super(fold, self).verify(prev, expected, seen)
27542 bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	798 repo = self.repo
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	799 if not prev:
41419 0bd56c291359 cleanup: use p1() and p2() instead of parents()[0] and parents()[1] Martin von Zweigbergk <martinvonz@google.com> parents: 41223 diff changeset	800 c = repo[self.node].p1()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	801 elif not prev.verb in (b'pick', b'base'):
27542 bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	802 return
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	803 else:
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	804 c = repo[prev.node]
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	805 if not c.mutable():
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	806 raise error.ParseError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	807 _(b"cannot fold into public change %s") % node.short(c.node())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	808 )
27542 bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	809
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	810 def continuedirty(self):
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	811 repo = self.repo
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	812 rulectx = repo[self.node]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	813
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	814 commit = commitfuncfor(repo, rulectx)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	815 commit(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	816 text=b'fold-temp-revision %s' % node.short(self.node),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	817 user=rulectx.user(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	818 date=rulectx.date(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	819 extra=rulectx.extra(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	820 )
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	821
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	822 def continueclean(self):
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	823 repo = self.repo
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	824 ctx = repo[b'.']
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	825 rulectx = repo[self.node]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	826 parentctxnode = self.state.parentctxnode
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	827 if ctx.node() == parentctxnode:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	828 repo.ui.warn(_(b'%s: empty changeset\n') % node.short(self.node))
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	829 return ctx, [(self.node, (parentctxnode,))]
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	830
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	831 parentctx = repo[parentctxnode]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	832 newcommits = set(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	833 c.node()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	834 for c in repo.set(b'(%d::. - %d)', parentctx.rev(), parentctx.rev())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	835 )
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	836 if not newcommits:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	837 repo.ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	838 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	839 b'%s: cannot fold - working copy is not a '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	840 b'descendant of previous commit %s\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	841 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	842 % (node.short(self.node), node.short(parentctxnode))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	843 )
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	844 return ctx, [(self.node, (ctx.node(),))]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	845
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	846 middlecommits = newcommits.copy()
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	847 middlecommits.discard(ctx.node())
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	848
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	849 return self.finishfold(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	850 repo.ui, repo, parentctx, rulectx, ctx.node(), middlecommits
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	851 )
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	852
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	853 def skipprompt(self):
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	854 """Returns true if the rule should skip the message editor.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	855
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	856 For example, 'fold' wants to show an editor, but 'rollup'
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	857 doesn't want to.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	858 """
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	859 return False
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	860
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	861 def mergedescs(self):
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	862 """Returns true if the rule should merge messages of multiple changes.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	863
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	864 This exists mainly so that 'rollup' rules can be a subclass of
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	865 'fold'.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	866 """
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	867 return True
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	868
31076 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	869 def firstdate(self):
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	870 """Returns true if the rule should preserve the date of the first
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	871 change.
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	872
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	873 This exists mainly so that 'rollup' rules can be a subclass of
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	874 'fold'.
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	875 """
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	876 return False
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	877
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	878 def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
41419 0bd56c291359 cleanup: use p1() and p2() instead of parents()[0] and parents()[1] Martin von Zweigbergk <martinvonz@google.com> parents: 41223 diff changeset	879 parent = ctx.p1().node()
38512 39db5a01cd53 cleanup: pass in overwrite flag to hg.updaterepo() as named argument Yuya Nishihara <yuya@tcha.org> parents: 38511 diff changeset	880 hg.updaterepo(repo, parent, overwrite=False)
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	881 ### prepare new commit data
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	882 commitopts = {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	883 commitopts[b'user'] = ctx.user()
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	884 # commit message
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	885 if not self.mergedescs():
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	886 newmessage = ctx.description()
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	887 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	888 newmessage = (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	889 b'\n***\n'.join(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	890 [ctx.description()]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	891 + [repo[r].description() for r in internalchanges]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	892 + [oldctx.description()]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	893 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	894 + b'\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	895 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	896 commitopts[b'message'] = newmessage
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	897 # date
31076 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	898 if self.firstdate():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	899 commitopts[b'date'] = ctx.date()
31076 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	900 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	901 commitopts[b'date'] = max(ctx.date(), oldctx.date())
41213 704a3aa3dc0a histedit: add rewrite.update-timestamp support to fold and mess Taapas Agrawal <taapas2897@gmail.com> parents: 41212 diff changeset	902 # if date is to be updated to current
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	903 if ui.configbool(b'rewrite', b'update-timestamp'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	904 commitopts[b'date'] = dateutil.makedate()
41213 704a3aa3dc0a histedit: add rewrite.update-timestamp support to fold and mess Taapas Agrawal <taapas2897@gmail.com> parents: 41212 diff changeset	905
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	906 extra = ctx.extra().copy()
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	907 # histedit_source
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	908 # note: ctx is likely a temporary commit but that the best we can do
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	909 # here. This is sufficient to solve issue3681 anyway.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	910 extra[b'histedit_source'] = b'%s,%s' % (ctx.hex(), oldctx.hex())
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	911 commitopts[b'extra'] = extra
31468 f84fbd27b6d3 histedit: get rid of ui.backupconfig Jun Wu <quark@fb.com> parents: 31338 diff changeset	912 phasemin = max(ctx.phase(), oldctx.phase())
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	913 overrides = {(b'phases', b'new-commit'): phasemin}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	914 with repo.ui.configoverride(overrides, b'histedit'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	915 n = collapse(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	916 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	917 ctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	918 repo[newnode],
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	919 commitopts,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	920 skipprompt=self.skipprompt(),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	921 )
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	922 if n is None:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	923 return ctx, []
38512 39db5a01cd53 cleanup: pass in overwrite flag to hg.updaterepo() as named argument Yuya Nishihara <yuya@tcha.org> parents: 38511 diff changeset	924 hg.updaterepo(repo, n, overwrite=False)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	925 replacements = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	926 (oldctx.node(), (newnode,)),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	927 (ctx.node(), (n,)),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	928 (newnode, (n,)),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	929 ]
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	930 for ich in internalchanges:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	931 replacements.append((ich, (n,)))
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	932 return repo[n], replacements
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	933
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	934
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	935 @action(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	936 [b'base', b'b'],
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	937 _(b'checkout changeset and apply further changesets from there'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	938 )
27085 d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	939 class base(histeditaction):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	940 def run(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	941 if self.repo[b'.'].node() != self.node:
40366 b14fdf1fb615 update: clarify update() call sites by specifying argument names Martin von Zweigbergk <martinvonz@google.com> parents: 40293 diff changeset	942 mergemod.update(self.repo, self.node, branchmerge=False, force=True)
27085 d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	943 return self.continueclean()
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	944
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	945 def continuedirty(self):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	946 abortdirty()
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	947
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	948 def continueclean(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	949 basectx = self.repo[b'.']
27085 d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	950 return basectx, []
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	951
29884 a485ec066867 histedt: use inheritance to override the constraints in 'base' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29883 diff changeset	952 def _verifynodeconstraints(self, prev, expected, seen):
a485ec066867 histedt: use inheritance to override the constraints in 'base' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29883 diff changeset	953 # base can only be use with a node not in the edited set
a485ec066867 histedt: use inheritance to override the constraints in 'base' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29883 diff changeset	954 if self.node in expected:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	955 msg = _(b'%s "%s" changeset was an edited list candidate')
29891 6d66200bff3b histedit: correct output of error when 'base' is from the edit list Augie Fackler <augie@google.com> parents: 29885 diff changeset	956 raise error.ParseError(
6d66200bff3b histedit: correct output of error when 'base' is from the edit list Augie Fackler <augie@google.com> parents: 29885 diff changeset	957 msg % (self.verb, node.short(self.node)),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	958 hint=_(b'base must only use unlisted changesets'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	959 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	960
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	961
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	962 @action(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	963 [b'_multifold'],
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	964 _(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	965 """fold subclass used for when multiple folds happen in a row
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	966
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	967 We only want to fire the editor for the folded message once when
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	968 (say) four changes are folded down into a single change. This is
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	969 similar to rollup, but we should preserve both messages so that
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	970 when the last fold operation runs we can show the user all the
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	971 commit messages in their editor.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	972 """
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	973 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	974 internal=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	975 )
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	976 class _multifold(fold):
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	977 def skipprompt(self):
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	978 return True
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	979
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	980
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	981 @action(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	982 [b"roll", b"r"],
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	983 _(b"like fold, but discard this commit's description and date"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	984 )
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	985 class rollup(fold):
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	986 def mergedescs(self):
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	987 return False
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	988
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	989 def skipprompt(self):
090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	990 return True
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	991
31076 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	992 def firstdate(self):
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	993 return True
37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	994
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	995
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	996 @action([b"drop", b"d"], _(b'remove commit from history'))
24768 342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	997 class drop(histeditaction):
342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	998 def run(self):
342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	999 parentctx = self.repo[self.state.parentctxnode]
342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	1000 return parentctx, [(self.node, tuple())]
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1001
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1002
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1003 @action(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1004 [b"mess", b"m"],
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1005 _(b'edit commit message without changing commit content'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1006 priority=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1007 )
24769 e875b94dc94c histedit: convert message action into a class Durham Goode <durham@fb.com> parents: 24768 diff changeset	1008 class message(histeditaction):
e875b94dc94c histedit: convert message action into a class Durham Goode <durham@fb.com> parents: 24768 diff changeset	1009 def commiteditor(self):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1010 return cmdutil.getcommiteditor(edit=True, editform=b'histedit.mess')
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1011
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1012
26335 6c93834d7d66 histedit: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26246 diff changeset	1013 def findoutgoing(ui, repo, remote=None, force=False, opts=None):
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1014 """utility function to find the first outgoing changeset
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1015
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	1016 Used by initialization code"""
26335 6c93834d7d66 histedit: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26246 diff changeset	1017 if opts is None:
6c93834d7d66 histedit: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26246 diff changeset	1018 opts = {}
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1019 dest = ui.expandpath(remote or b'default-push', remote or b'default')
37263 3809eafedf2c parseurl: consistently call second output "branches" Martin von Zweigbergk <martinvonz@google.com> parents: 37128 diff changeset	1020 dest, branches = hg.parseurl(dest, None)[:2]
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1021 ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1022
37263 3809eafedf2c parseurl: consistently call second output "branches" Martin von Zweigbergk <martinvonz@google.com> parents: 37128 diff changeset	1023 revs, checkout = hg.addbranchrevs(repo, repo, branches, None)
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1024 other = hg.peer(repo, opts, dest)
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1025
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1026 if revs:
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1027 revs = [repo.lookup(rev) for rev in revs]
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1028
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1029 outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force)
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1030 if not outgoing.missing:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1031 raise error.Abort(_(b'no outgoing ancestors'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1032 roots = list(repo.revs(b"roots(%ln)", outgoing.missing))
40030 e2697acd9381 cleanup: some Yoda conditions, this patch removes Martin von Zweigbergk <martinvonz@google.com> parents: 39919 diff changeset	1033 if len(roots) > 1:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1034 msg = _(b'there are ambiguous outgoing revisions')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1035 hint = _(b"see 'hg help histedit' for more detail")
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1036 raise error.Abort(msg, hint=hint)
37314 8474005fcfe2 histedit: avoid repo.lookup() for converting revnum to nodeid Martin von Zweigbergk <martinvonz@google.com> parents: 37270 diff changeset	1037 return repo[roots[0]].node()
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1038
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1039
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1040 # Curses Support
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1041 try:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1042 import curses
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1043 except ImportError:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1044 curses = None
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1045
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1046 KEY_LIST = [b'pick', b'edit', b'fold', b'drop', b'mess', b'roll']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1047 ACTION_LABELS = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1048 b'fold': b'^fold',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1049 b'roll': b'^roll',
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1050 }
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1051
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1052 COLOR_HELP, COLOR_SELECTED, COLOR_OK, COLOR_WARN, COLOR_CURRENT = 1, 2, 3, 4, 5
42089 16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1053 COLOR_DIFF_ADD_LINE, COLOR_DIFF_DEL_LINE, COLOR_DIFF_OFFSET = 6, 7, 8
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1054
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1055 E_QUIT, E_HISTEDIT = 1, 2
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1056 E_PAGEDOWN, E_PAGEUP, E_LINEUP, E_LINEDOWN, E_RESIZE = 3, 4, 5, 6, 7
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1057 MODE_INIT, MODE_PATCH, MODE_RULES, MODE_HELP = 0, 1, 2, 3
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1058
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1059 KEYTABLE = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1060 b'global': {
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1061 b'h': b'next-action',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1062 b'KEY_RIGHT': b'next-action',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1063 b'l': b'prev-action',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1064 b'KEY_LEFT': b'prev-action',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1065 b'q': b'quit',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1066 b'c': b'histedit',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1067 b'C': b'histedit',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1068 b'v': b'showpatch',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1069 b'?': b'help',
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1070 },
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1071 MODE_RULES: {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1072 b'd': b'action-drop',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1073 b'e': b'action-edit',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1074 b'f': b'action-fold',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1075 b'm': b'action-mess',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1076 b'p': b'action-pick',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1077 b'r': b'action-roll',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1078 b' ': b'select',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1079 b'j': b'down',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1080 b'k': b'up',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1081 b'KEY_DOWN': b'down',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1082 b'KEY_UP': b'up',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1083 b'J': b'move-down',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1084 b'K': b'move-up',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1085 b'KEY_NPAGE': b'move-down',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1086 b'KEY_PPAGE': b'move-up',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1087 b'0': b'goto', # Used for 0..9
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1088 },
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1089 MODE_PATCH: {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1090 b' ': b'page-down',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1091 b'KEY_NPAGE': b'page-down',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1092 b'KEY_PPAGE': b'page-up',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1093 b'j': b'line-down',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1094 b'k': b'line-up',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1095 b'KEY_DOWN': b'line-down',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1096 b'KEY_UP': b'line-up',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1097 b'J': b'down',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1098 b'K': b'up',
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1099 },
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1100 MODE_HELP: {},
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1101 }
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1102
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1103
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1104 def screen_size():
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1105 return struct.unpack(b'hh', fcntl.ioctl(1, termios.TIOCGWINSZ, b' '))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1106
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1107
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1108 class histeditrule(object):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1109 def __init__(self, ctx, pos, action=b'pick'):
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1110 self.ctx = ctx
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1111 self.action = action
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1112 self.origpos = pos
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1113 self.pos = pos
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1114 self.conflicts = []
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1115
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1116 def __str__(self):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1117 # Some actions ('fold' and 'roll') combine a patch with a previous one.
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1118 # Add a marker showing which patch they apply to, and also omit the
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1119 # description for 'roll' (since it will get discarded). Example display:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1120 #
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1121 # #10 pick 316392:06a16c25c053 add option to skip tests
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1122 # #11 ^roll 316393:71313c964cc5
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1123 # #12 pick 316394:ab31f3973b0d include mfbt for mozilla-config.h
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1124 # #13 ^fold 316395:14ce5803f4c3 fix warnings
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1125 #
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1126 # The carets point to the changeset being folded into ("roll this
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1127 # changeset into the changeset above").
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1128 action = ACTION_LABELS.get(self.action, self.action)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1129 h = self.ctx.hex()[0:12]
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1130 r = self.ctx.rev()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1131 desc = self.ctx.description().splitlines()[0].strip()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1132 if self.action == b'roll':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1133 desc = b''
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1134 return b"#{0:<2} {1:<6} {2}:{3} {4}".format(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1135 self.origpos, action, r, h, desc
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1136 )
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1137
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1138 def checkconflicts(self, other):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1139 if other.pos > self.pos and other.origpos <= self.origpos:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1140 if set(other.ctx.files()) & set(self.ctx.files()) != set():
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1141 self.conflicts.append(other)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1142 return self.conflicts
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1143
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1144 if other in self.conflicts:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1145 self.conflicts.remove(other)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1146 return self.conflicts
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1147
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1148
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1149 # ============ EVENTS ===============
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1150 def movecursor(state, oldpos, newpos):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1151 '''Change the rule/changeset that the cursor is pointing to, regardless of
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1152 current mode (you can switch between patches from the view patch window).'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1153 state[b'pos'] = newpos
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1154
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1155 mode, _ = state[b'mode']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1156 if mode == MODE_RULES:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1157 # Scroll through the list by updating the view for MODE_RULES, so that
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1158 # even if we are not currently viewing the rules, switching back will
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1159 # result in the cursor's rule being visible.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1160 modestate = state[b'modes'][MODE_RULES]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1161 if newpos < modestate[b'line_offset']:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1162 modestate[b'line_offset'] = newpos
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1163 elif newpos > modestate[b'line_offset'] + state[b'page_height'] - 1:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1164 modestate[b'line_offset'] = newpos - state[b'page_height'] + 1
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1165
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1166 # Reset the patch view region to the top of the new patch.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1167 state[b'modes'][MODE_PATCH][b'line_offset'] = 0
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1168
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1169
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1170 def changemode(state, mode):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1171 curmode, _ = state[b'mode']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1172 state[b'mode'] = (mode, curmode)
42263 c4a50e863ee2 histedit: Speed up scrolling in patch view mode feyu@google.com parents: 42262 diff changeset	1173 if mode == MODE_PATCH:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1174 state[b'modes'][MODE_PATCH][b'patchcontents'] = patchcontents(state)
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1175
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1176
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1177 def makeselection(state, pos):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1178 state[b'selected'] = pos
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1179
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1180
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1181 def swap(state, oldpos, newpos):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1182 """Swap two positions and calculate necessary conflicts in
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1183 O(\|newpos-oldpos\|) time"""
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1184
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1185 rules = state[b'rules']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1186 assert 0 <= oldpos < len(rules) and 0 <= newpos < len(rules)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1187
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1188 rules[oldpos], rules[newpos] = rules[newpos], rules[oldpos]
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1189
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1190 # TODO: swap should not know about histeditrule's internals
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1191 rules[newpos].pos = newpos
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1192 rules[oldpos].pos = oldpos
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1193
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1194 start = min(oldpos, newpos)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1195 end = max(oldpos, newpos)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1196 for r in pycompat.xrange(start, end + 1):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1197 rules[newpos].checkconflicts(rules[r])
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1198 rules[oldpos].checkconflicts(rules[r])
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1199
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1200 if state[b'selected']:
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1201 makeselection(state, newpos)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1202
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1203
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1204 def changeaction(state, pos, action):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1205 """Change the action state on the given position to the new action"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1206 rules = state[b'rules']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1207 assert 0 <= pos < len(rules)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1208 rules[pos].action = action
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1209
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1210
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1211 def cycleaction(state, pos, next=False):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1212 """Changes the action state the next or the previous action from
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1213 the action list"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1214 rules = state[b'rules']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1215 assert 0 <= pos < len(rules)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1216 current = rules[pos].action
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1217
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1218 assert current in KEY_LIST
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1219
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1220 index = KEY_LIST.index(current)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1221 if next:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1222 index += 1
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1223 else:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1224 index -= 1
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1225 changeaction(state, pos, KEY_LIST[index % len(KEY_LIST)])
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1226
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1227
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1228 def changeview(state, delta, unit):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1229 '''Change the region of whatever is being viewed (a patch or the list of
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1230 changesets). 'delta' is an amount (+/- 1) and 'unit' is 'page' or 'line'.'''
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1231 mode, _ = state[b'mode']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1232 if mode != MODE_PATCH:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1233 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1234 mode_state = state[b'modes'][mode]
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1235 num_lines = len(mode_state[b'patchcontents'])
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1236 page_height = state[b'page_height']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1237 unit = page_height if unit == b'page' else 1
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1238 num_pages = 1 + (num_lines - 1) / page_height
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1239 max_offset = (num_pages - 1) * page_height
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1240 newline = mode_state[b'line_offset'] + delta * unit
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1241 mode_state[b'line_offset'] = max(0, min(max_offset, newline))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1242
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1243
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1244 def event(state, ch):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1245 """Change state based on the current character input
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1246
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1247 This takes the current state and based on the current character input from
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1248 the user we change the state.
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1249 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1250 selected = state[b'selected']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1251 oldpos = state[b'pos']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1252 rules = state[b'rules']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1253
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1254 if ch in (curses.KEY_RESIZE, b"KEY_RESIZE"):
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1255 return E_RESIZE
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1256
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1257 lookup_ch = ch
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1258 if b'0' <= ch <= b'9':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1259 lookup_ch = b'0'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1260
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1261 curmode, prevmode = state[b'mode']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1262 action = KEYTABLE[curmode].get(
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1263 lookup_ch, KEYTABLE[b'global'].get(lookup_ch)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1264 )
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1265 if action is None:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1266 return
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1267 if action in (b'down', b'move-down'):
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1268 newpos = min(oldpos + 1, len(rules) - 1)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1269 movecursor(state, oldpos, newpos)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1270 if selected is not None or action == b'move-down':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1271 swap(state, oldpos, newpos)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1272 elif action in (b'up', b'move-up'):
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1273 newpos = max(0, oldpos - 1)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1274 movecursor(state, oldpos, newpos)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1275 if selected is not None or action == b'move-up':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1276 swap(state, oldpos, newpos)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1277 elif action == b'next-action':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1278 cycleaction(state, oldpos, next=True)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1279 elif action == b'prev-action':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1280 cycleaction(state, oldpos, next=False)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1281 elif action == b'select':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1282 selected = oldpos if selected is None else None
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1283 makeselection(state, selected)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1284 elif action == b'goto' and int(ch) < len(rules) and len(rules) <= 10:
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1285 newrule = next((r for r in rules if r.origpos == int(ch)))
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1286 movecursor(state, oldpos, newrule.pos)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1287 if selected is not None:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1288 swap(state, oldpos, newrule.pos)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1289 elif action.startswith(b'action-'):
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1290 changeaction(state, oldpos, action[7:])
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1291 elif action == b'showpatch':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1292 changemode(state, MODE_PATCH if curmode != MODE_PATCH else prevmode)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1293 elif action == b'help':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1294 changemode(state, MODE_HELP if curmode != MODE_HELP else prevmode)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1295 elif action == b'quit':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1296 return E_QUIT
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1297 elif action == b'histedit':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1298 return E_HISTEDIT
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1299 elif action == b'page-down':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1300 return E_PAGEDOWN
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1301 elif action == b'page-up':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1302 return E_PAGEUP
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1303 elif action == b'line-down':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1304 return E_LINEDOWN
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1305 elif action == b'line-up':
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1306 return E_LINEUP
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1307
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1308
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1309 def makecommands(rules):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1310 """Returns a list of commands consumable by histedit --commands based on
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1311 our list of rules"""
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1312 commands = []
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1313 for rules in rules:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1314 commands.append(b"{0} {1}\n".format(rules.action, rules.ctx))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1315 return commands
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1316
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1317
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1318 def addln(win, y, x, line, color=None):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1319 """Add a line to the given window left padding but 100% filled with
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1320 whitespace characters, so that the color appears on the whole line"""
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1321 maxy, maxx = win.getmaxyx()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1322 length = maxx - 1 - x
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1323 line = (b"{0:<%d}" % length).format(str(line).strip())[:length]
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1324 if y < 0:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1325 y = maxy + y
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1326 if x < 0:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1327 x = maxx + x
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1328 if color:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1329 win.addstr(y, x, line, color)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1330 else:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1331 win.addstr(y, x, line)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1332
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1333
42262 4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1334 def _trunc_head(line, n):
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1335 if len(line) <= n:
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1336 return line
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1337 return b'> ' + line[-(n - 2) :]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1338
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1339
42262 4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1340 def _trunc_tail(line, n):
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1341 if len(line) <= n:
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1342 return line
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1343 return line[: n - 2] + b' >'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1344
42262 4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1345
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1346 def patchcontents(state):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1347 repo = state[b'repo']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1348 rule = state[b'rules'][state[b'pos']]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1349 displayer = logcmdutil.changesetdisplayer(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1350 repo.ui, repo, {b"patch": True, b"template": b"status"}, buffered=True
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1351 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1352 overrides = {(b'ui', b'verbose'): True}
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1353 with repo.ui.configoverride(overrides, source=b'histedit'):
42202 9e40c5892714 chistedit: use context manager to set verbose ui Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42089 diff changeset	1354 displayer.show(rule.ctx)
9e40c5892714 chistedit: use context manager to set verbose ui Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42089 diff changeset	1355 displayer.close()
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1356 return displayer.hunk[rule.ctx.rev()].splitlines()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1357
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1358
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1359 def _chisteditmain(repo, rules, stdscr):
42088 770e87999701 chistedit: use default curses colours Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42072 diff changeset	1360 try:
770e87999701 chistedit: use default curses colours Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42072 diff changeset	1361 curses.use_default_colors()
770e87999701 chistedit: use default curses colours Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42072 diff changeset	1362 except curses.error:
770e87999701 chistedit: use default curses colours Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42072 diff changeset	1363 pass
770e87999701 chistedit: use default curses colours Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42072 diff changeset	1364
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1365 # initialize color pattern
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1366 curses.init_pair(COLOR_HELP, curses.COLOR_WHITE, curses.COLOR_BLUE)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1367 curses.init_pair(COLOR_SELECTED, curses.COLOR_BLACK, curses.COLOR_WHITE)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1368 curses.init_pair(COLOR_WARN, curses.COLOR_BLACK, curses.COLOR_YELLOW)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1369 curses.init_pair(COLOR_OK, curses.COLOR_BLACK, curses.COLOR_GREEN)
41713 a22321f2b1ee chistedit: use magenta for current line as in crecord (issue6071) Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 41712 diff changeset	1370 curses.init_pair(COLOR_CURRENT, curses.COLOR_WHITE, curses.COLOR_MAGENTA)
42089 16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1371 curses.init_pair(COLOR_DIFF_ADD_LINE, curses.COLOR_GREEN, -1)
16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1372 curses.init_pair(COLOR_DIFF_DEL_LINE, curses.COLOR_RED, -1)
16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1373 curses.init_pair(COLOR_DIFF_OFFSET, curses.COLOR_MAGENTA, -1)
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1374
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1375 # don't display the cursor
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1376 try:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1377 curses.curs_set(0)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1378 except curses.error:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1379 pass
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1380
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1381 def rendercommit(win, state):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1382 """Renders the commit window that shows the log of the current selected
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1383 commit"""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1384 pos = state[b'pos']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1385 rules = state[b'rules']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1386 rule = rules[pos]
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1387
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1388 ctx = rule.ctx
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1389 win.box()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1390
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1391 maxy, maxx = win.getmaxyx()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1392 length = maxx - 3
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1393
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1394 line = b"changeset: {0}:{1:<12}".format(ctx.rev(), ctx)
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1395 win.addstr(1, 1, line[:length])
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1396
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1397 line = b"user: {0}".format(ctx.user())
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1398 win.addstr(2, 1, line[:length])
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1399
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1400 bms = repo.nodebookmarks(ctx.node())
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1401 line = b"bookmark: {0}".format(b' '.join(bms))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1402 win.addstr(3, 1, line[:length])
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1403
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1404 line = b"summary: {0}".format(ctx.description().splitlines()[0])
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1405 win.addstr(4, 1, line[:length])
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1406
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1407 line = b"files: "
42262 4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1408 win.addstr(5, 1, line)
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1409 fnx = 1 + len(line)
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1410 fnmaxx = length - fnx + 1
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1411 y = 5
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1412 fnmaxn = maxy - (1 + y) - 1
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1413 files = ctx.files()
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1414 for i, line1 in enumerate(files):
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1415 if len(files) > fnmaxn and i == fnmaxn - 1:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1416 win.addstr(y, fnx, _trunc_tail(b','.join(files[i:]), fnmaxx))
42262 4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1417 y = y + 1
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1418 break
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1419 win.addstr(y, fnx, _trunc_head(line1, fnmaxx))
4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1420 y = y + 1
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1421
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1422 conflicts = rule.conflicts
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1423 if len(conflicts) > 0:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1424 conflictstr = b','.join(map(lambda r: str(r.ctx), conflicts))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1425 conflictstr = b"changed files overlap with {0}".format(conflictstr)
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1426 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1427 conflictstr = b'no overlap'
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1428
42262 4ad191041be2 histedit: Show file names in multiple line format Yu Feng <rainwoodman@gmail.com> parents: 42202 diff changeset	1429 win.addstr(y, 1, conflictstr[:length])
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1430 win.noutrefresh()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1431
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1432 def helplines(mode):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1433 if mode == MODE_PATCH:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1434 help = b"""\
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1435 ?: help, k/up: line up, j/down: line down, v: stop viewing patch
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1436 pgup: prev page, space/pgdn: next page, c: commit, q: abort
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1437 """
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1438 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1439 help = b"""\
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1440 ?: help, k/up: move up, j/down: move down, space: select, v: view patch
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1441 d: drop, e: edit, f: fold, m: mess, p: pick, r: roll
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1442 pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1443 """
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1444 return help.splitlines()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1445
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1446 def renderhelp(win, state):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1447 maxy, maxx = win.getmaxyx()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1448 mode, _ = state[b'mode']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1449 for y, line in enumerate(helplines(mode)):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1450 if y >= maxy:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1451 break
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1452 addln(win, y, 0, line, curses.color_pair(COLOR_HELP))
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1453 win.noutrefresh()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1454
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1455 def renderrules(rulesscr, state):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1456 rules = state[b'rules']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1457 pos = state[b'pos']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1458 selected = state[b'selected']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1459 start = state[b'modes'][MODE_RULES][b'line_offset']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1460
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1461 conflicts = [r.ctx for r in rules if r.conflicts]
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1462 if len(conflicts) > 0:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1463 line = b"potential conflict in %s" % b','.join(map(str, conflicts))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1464 addln(rulesscr, -1, 0, line, curses.color_pair(COLOR_WARN))
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1465
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1466 for y, rule in enumerate(rules[start:]):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1467 if y >= state[b'page_height']:
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1468 break
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1469 if len(rule.conflicts) > 0:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1470 rulesscr.addstr(y, 0, b" ", curses.color_pair(COLOR_WARN))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1471 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1472 rulesscr.addstr(y, 0, b" ", curses.COLOR_BLACK)
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1473 if y + start == selected:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1474 addln(rulesscr, y, 2, rule, curses.color_pair(COLOR_SELECTED))
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1475 elif y + start == pos:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1476 addln(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1477 rulesscr,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1478 y,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1479 2,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1480 rule,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1481 curses.color_pair(COLOR_CURRENT) \| curses.A_BOLD,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1482 )
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1483 else:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1484 addln(rulesscr, y, 2, rule)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1485 rulesscr.noutrefresh()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1486
42089 16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1487 def renderstring(win, state, output, diffcolors=False):
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1488 maxy, maxx = win.getmaxyx()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1489 length = min(maxy - 1, len(output))
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1490 for y in range(0, length):
42089 16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1491 line = output[y]
16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1492 if diffcolors:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1493 if line and line[0] == b'+':
42089 16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1494 win.addstr(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1495 y, 0, line, curses.color_pair(COLOR_DIFF_ADD_LINE)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1496 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1497 elif line and line[0] == b'-':
42089 16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1498 win.addstr(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1499 y, 0, line, curses.color_pair(COLOR_DIFF_DEL_LINE)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1500 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1501 elif line.startswith(b'@@ '):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1502 win.addstr(y, 0, line, curses.color_pair(COLOR_DIFF_OFFSET))
42089 16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1503 else:
16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1504 win.addstr(y, 0, line)
16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1505 else:
16692aa3472b chistedit: add basic colours to diff view Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 42088 diff changeset	1506 win.addstr(y, 0, line)
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1507 win.noutrefresh()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1508
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1509 def renderpatch(win, state):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1510 start = state[b'modes'][MODE_PATCH][b'line_offset']
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1511 content = state[b'modes'][MODE_PATCH][b'patchcontents']
42263 c4a50e863ee2 histedit: Speed up scrolling in patch view mode feyu@google.com parents: 42262 diff changeset	1512 renderstring(win, state, content[start:], diffcolors=True)
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1513
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1514 def layout(mode):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1515 maxy, maxx = stdscr.getmaxyx()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1516 helplen = len(helplines(mode))
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1517 return {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1518 b'commit': (12, maxx),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1519 b'help': (helplen, maxx),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1520 b'main': (maxy - helplen - 12, maxx),
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1521 }
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1522
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1523 def drawvertwin(size, y, x):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1524 win = curses.newwin(size[0], size[1], y, x)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1525 y += size[0]
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1526 return win, y, x
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1527
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1528 state = {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1529 b'pos': 0,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1530 b'rules': rules,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1531 b'selected': None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1532 b'mode': (MODE_INIT, MODE_INIT),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1533 b'page_height': None,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1534 b'modes': {
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1535 MODE_RULES: {b'line_offset': 0,},
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1536 MODE_PATCH: {b'line_offset': 0,},
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1537 },
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1538 b'repo': repo,
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1539 }
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1540
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1541 # eventloop
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1542 ch = None
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1543 stdscr.clear()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1544 stdscr.refresh()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1545 while True:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1546 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1547 oldmode, _ = state[b'mode']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1548 if oldmode == MODE_INIT:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1549 changemode(state, MODE_RULES)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1550 e = event(state, ch)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1551
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1552 if e == E_QUIT:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1553 return False
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1554 if e == E_HISTEDIT:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1555 return state[b'rules']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1556 else:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1557 if e == E_RESIZE:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1558 size = screen_size()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1559 if size != stdscr.getmaxyx():
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1560 curses.resizeterm(*size)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1561
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1562 curmode, _ = state[b'mode']
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1563 sizes = layout(curmode)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1564 if curmode != oldmode:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1565 state[b'page_height'] = sizes[b'main'][0]
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1566 # Adjust the view to fit the current screen size.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1567 movecursor(state, state[b'pos'], state[b'pos'])
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1568
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1569 # Pack the windows against the top, each pane spread across the
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1570 # full width of the screen.
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1571 y, x = (0, 0)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1572 helpwin, y, x = drawvertwin(sizes[b'help'], y, x)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1573 mainwin, y, x = drawvertwin(sizes[b'main'], y, x)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1574 commitwin, y, x = drawvertwin(sizes[b'commit'], y, x)
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1575
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1576 if e in (E_PAGEDOWN, E_PAGEUP, E_LINEDOWN, E_LINEUP):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1577 if e == E_PAGEDOWN:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1578 changeview(state, +1, b'page')
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1579 elif e == E_PAGEUP:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1580 changeview(state, -1, b'page')
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1581 elif e == E_LINEDOWN:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1582 changeview(state, +1, b'line')
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1583 elif e == E_LINEUP:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1584 changeview(state, -1, b'line')
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1585
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1586 # start rendering
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1587 commitwin.erase()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1588 helpwin.erase()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1589 mainwin.erase()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1590 if curmode == MODE_PATCH:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1591 renderpatch(mainwin, state)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1592 elif curmode == MODE_HELP:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1593 renderstring(mainwin, state, __doc__.strip().splitlines())
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1594 else:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1595 renderrules(mainwin, state)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1596 rendercommit(commitwin, state)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1597 renderhelp(helpwin, state)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1598 curses.doupdate()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1599 # done rendering
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1600 ch = stdscr.getkey()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1601 except curses.error:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1602 pass
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1603
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1604
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1605 def _chistedit(ui, repo, freeargs, *opts):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1606 """interactively edit changeset history via a curses interface
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1607
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1608 Provides a ncurses interface to histedit. Press ? in chistedit mode
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1609 to see an extensive help. Requires python-curses to be installed."""
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1610
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1611 if curses is None:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1612 raise error.Abort(_(b"Python curses library required"))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1613
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1614 # disable color
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1615 ui._colormode = None
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1616
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1617 try:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1618 keep = opts.get(b'keep')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1619 revs = opts.get(b'rev', [])[:]
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1620 cmdutil.checkunfinished(repo)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1621 cmdutil.bailifchanged(repo)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1622
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1623 if os.path.exists(os.path.join(repo.path, b'histedit-state')):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1624 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1625 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1626 b'history edit already in progress, try '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1627 b'--continue or --abort'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1628 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1629 )
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1630 revs.extend(freeargs)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1631 if not revs:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1632 defaultrev = destutil.desthistedit(ui, repo)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1633 if defaultrev is not None:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1634 revs.append(defaultrev)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1635 if len(revs) != 1:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1636 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1637 _(b'histedit requires exactly one ancestor revision')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1638 )
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1639
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1640 rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs)))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1641 if len(rr) != 1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1642 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1643 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1644 b'The specified revisions must have '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1645 b'exactly one common root'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1646 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1647 )
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1648 root = rr[0].node()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1649
41421 5cb8158a61f7 cleanup: use p1() instead of parents() when we only need the first parent Martin von Zweigbergk <martinvonz@google.com> parents: 41419 diff changeset	1650 topmost = repo.dirstate.p1()
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1651 revs = between(repo, root, topmost, keep)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1652 if not revs:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1653 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1654 _(b'%s is not an ancestor of working directory')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1655 % node.short(root)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1656 )
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1657
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1658 ctxs = []
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1659 for i, r in enumerate(revs):
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1660 ctxs.append(histeditrule(repo[r], i))
42650 701341f57ceb curses: do not setlocale() at import time (issue5261) Yuya Nishihara <yuya@tcha.org> parents: 42584 diff changeset	1661 # Curses requires setting the locale or it will default to the C
701341f57ceb curses: do not setlocale() at import time (issue5261) Yuya Nishihara <yuya@tcha.org> parents: 42584 diff changeset	1662 # locale. This sets the locale to the user's default system
701341f57ceb curses: do not setlocale() at import time (issue5261) Yuya Nishihara <yuya@tcha.org> parents: 42584 diff changeset	1663 # locale.
701341f57ceb curses: do not setlocale() at import time (issue5261) Yuya Nishihara <yuya@tcha.org> parents: 42584 diff changeset	1664 locale.setlocale(locale.LC_ALL, r'')
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1665 rc = curses.wrapper(functools.partial(_chisteditmain, repo, ctxs))
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1666 curses.echo()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1667 curses.endwin()
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1668 if rc is False:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1669 ui.write(_(b"histedit aborted\n"))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1670 return 0
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1671 if type(rc) is list:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1672 ui.status(_(b"performing changes\n"))
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1673 rules = makecommands(rc)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1674 filename = repo.vfs.join(b'chistedit')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1675 with open(filename, b'w+') as fp:
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1676 for r in rules:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1677 fp.write(r)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1678 opts[b'commands'] = filename
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1679 return _texthistedit(ui, repo, freeargs, *opts)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1680 except KeyboardInterrupt:
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1681 pass
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1682 return -1
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1683
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1684
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1685 @command(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1686 b'histedit',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1687 [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1688 (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1689 b'',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1690 b'commands',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1691 b'',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1692 _(b'read history edits from the specified file'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1693 _(b'FILE'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1694 ),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1695 (b'c', b'continue', False, _(b'continue an edit already in progress')),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1696 (b'', b'edit-plan', False, _(b'edit remaining actions list')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1697 (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1698 b'k',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1699 b'keep',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1700 False,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1701 _(b"don't strip old nodes after edit is complete"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1702 ),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1703 (b'', b'abort', False, _(b'abort an edit in progress')),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1704 (b'o', b'outgoing', False, _(b'changesets not found in destination')),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1705 (
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1706 b'f',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1707 b'force',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1708 False,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1709 _(b'force outgoing even for unrelated repositories'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1710 ),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1711 (b'r', b'rev', [], _(b'first revision to be edited'), _(b'REV')),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1712 ]
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1713 + cmdutil.formatteropts,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1714 _(b"[OPTIONS] ([ANCESTOR] \| --outgoing [URL])"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1715 helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1716 )
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1717 def histedit(ui, repo, freeargs, *opts):
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	1718 """interactively edit changeset history
19621 11de0651d3b6 histedit: add description about basic histedit function to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19519 diff changeset	1719
27713 fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1720 This command lets you edit a linear series of changesets (up to
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1721 and including the working directory, which should be clean).
27956 f3eb98b8fe12 doc: prevent non-literal text block from being treated as literal one FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27955 diff changeset	1722 You can:
27713 fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1723
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1724 - `pick` to [re]order a changeset
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1725
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1726 - `drop` to omit changeset
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1727
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1728 - `mess` to reword the changeset commit message
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1729
31075 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	1730 - `fold` to combine it with the preceding changeset (using the later date)
27713 fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1731
31076 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31075 diff changeset	1732 - `roll` like fold, but discarding this commit's description and date
27713 fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	1733
31075 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31003 diff changeset	1734 - `edit` to edit this changeset (preserving date)
19622 3d0ece7523c8 histedit: add description about "histedit --outgoing" to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19621 diff changeset	1735
34489 270e344a6c74 histedit: removing the experimental config 'histeditng' Saurabh Singh <singhsrb@fb.com> parents: 34476 diff changeset	1736 - `base` to checkout changeset and apply further changesets from there
270e344a6c74 histedit: removing the experimental config 'histeditng' Saurabh Singh <singhsrb@fb.com> parents: 34476 diff changeset	1737
27972 92a61d7618ac histedit: fix typo in documentation Wagner Bruna <wbruna@softwareexpress.com.br> parents: 27958 diff changeset	1738 There are a number of ways to select the root changeset:
27714 bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	1739
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	1740 - Specify ANCESTOR directly
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	1741
27714 bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	1742 - Use --outgoing -- it will be the first linear changeset not
28077 27ae22a4f9f9 doc: describe full help document hierarchy to create a valid link in HTML FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28004 diff changeset	1743 included in destination. (See :hg:`help config.paths.default-push`)
27714 bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	1744
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	1745 - Otherwise, the value from the "histedit.defaultrev" config option
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	1746 is used as a revset to select the base revision when ANCESTOR is not
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	1747 specified. The first revision returned by the revset is used. By
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	1748 default, this selects the editable history that is unique to the
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	1749 ancestry of the working directory.
19842 1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	1750
27630 9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	1751 .. container:: verbose
19842 1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	1752
27630 9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	1753 If you use --outgoing, this command will abort if there are ambiguous
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	1754 outgoing revisions. For example, if there are multiple branches
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	1755 containing outgoing revisions.
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	1756
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	1757 Use "min(outgoing() and ::.)" or similar revset specification
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	1758 instead of --outgoing to specify edit target revision exactly in
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	1759 such ambiguous situation. See :hg:`help revsets` for detail about
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	1760 selecting revisions.
19972 1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	1761
27145 3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1762 .. container:: verbose
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1763
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1764 Examples:
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1765
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1766 - A number of changes have been made.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1767 Revision 3 is no longer needed.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1768
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1769 Start history editing from revision 3::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1770
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1771 hg histedit -r 3
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1772
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1773 An editor opens, containing the list of revisions,
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1774 with specific actions specified::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1775
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1776 pick 5339bf82f0ca 3 Zworgle the foobar
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1777 pick 8ef592ce7cc4 4 Bedazzle the zerlog
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1778 pick 0a9639fcda9d 5 Morgify the cromulancy
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1779
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1780 Additional information about the possible actions
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1781 to take appears below the list of revisions.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1782
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1783 To remove revision 3 from the history,
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1784 its action (at the beginning of the relevant line)
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1785 is changed to 'drop'::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1786
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1787 drop 5339bf82f0ca 3 Zworgle the foobar
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1788 pick 8ef592ce7cc4 4 Bedazzle the zerlog
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1789 pick 0a9639fcda9d 5 Morgify the cromulancy
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1790
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1791 - A number of changes have been made.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1792 Revision 2 and 4 need to be swapped.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1793
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1794 Start history editing from revision 2::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1795
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1796 hg histedit -r 2
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1797
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1798 An editor opens, containing the list of revisions,
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1799 with specific actions specified::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1800
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1801 pick 252a1af424ad 2 Blorb a morgwazzle
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1802 pick 5339bf82f0ca 3 Zworgle the foobar
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1803 pick 8ef592ce7cc4 4 Bedazzle the zerlog
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1804
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1805 To swap revision 2 and 4, its lines are swapped
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1806 in the editor::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1807
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1808 pick 8ef592ce7cc4 4 Bedazzle the zerlog
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1809 pick 5339bf82f0ca 3 Zworgle the foobar
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1810 pick 252a1af424ad 2 Blorb a morgwazzle
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	1811
19972 1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	1812 Returns 0 on success, 1 if user intervention is required (not only
1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	1813 for intentional "edit" command, but also for resolving unexpected
1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	1814 conflicts).
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1815 """
41175 9bc7ec924234 histedit: fix --continue and --abort when curses is enabled Augie Fackler <augie@google.com> parents: 41166 diff changeset	1816 # kludge: _chistedit only works for starting an edit, not aborting
9bc7ec924234 histedit: fix --continue and --abort when curses is enabled Augie Fackler <augie@google.com> parents: 41166 diff changeset	1817 # or continuing, so fall back to regular _texthistedit for those
9bc7ec924234 histedit: fix --continue and --abort when curses is enabled Augie Fackler <augie@google.com> parents: 41166 diff changeset	1818 # operations.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1819 if (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1820 ui.interface(b'histedit') == b'curses'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1821 and _getgoal(pycompat.byteskwargs(opts)) == goalnew
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1822 ):
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1823 return _chistedit(ui, repo, freeargs, *opts)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1824 return _texthistedit(ui, repo, freeargs, *opts)
c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1825
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1826
40649 c36175456350 histedit: import chistedit curses UI from hg-experimental Augie Fackler <augie@google.com> parents: 40366 diff changeset	1827 def _texthistedit(ui, repo, freeargs, *opts):
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	1828 state = histeditstate(repo)
41166 9365b8cb90e0 histedit: use context manager for locks Martin von Zweigbergk <martinvonz@google.com> parents: 41165 diff changeset	1829 with repo.wlock() as wlock, repo.lock() as lock:
9365b8cb90e0 histedit: use context manager for locks Martin von Zweigbergk <martinvonz@google.com> parents: 41165 diff changeset	1830 state.wlock = wlock
9365b8cb90e0 histedit: use context manager for locks Martin von Zweigbergk <martinvonz@google.com> parents: 41165 diff changeset	1831 state.lock = lock
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	1832 _histedit(ui, repo, state, freeargs, *opts)
20071 4778f398ec83 histedit: hold wlock and lock while in progress Siddharth Agarwal <sid0@fb.com> parents: 19972 diff changeset	1833
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1834
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1835 goalcontinue = b'continue'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1836 goalabort = b'abort'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1837 goaleditplan = b'edit-plan'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1838 goalnew = b'new'
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1839
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1840
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1841 def _getgoal(opts):
41223 32ef47b3c91c histedit: fix call to _getgoal() by adding a byteskwargs() wrapper Augie Fackler <augie@google.com> parents: 41213 diff changeset	1842 if opts.get(b'continue'):
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1843 return goalcontinue
41223 32ef47b3c91c histedit: fix call to _getgoal() by adding a byteskwargs() wrapper Augie Fackler <augie@google.com> parents: 41213 diff changeset	1844 if opts.get(b'abort'):
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1845 return goalabort
41223 32ef47b3c91c histedit: fix call to _getgoal() by adding a byteskwargs() wrapper Augie Fackler <augie@google.com> parents: 41213 diff changeset	1846 if opts.get(b'edit_plan'):
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1847 return goaleditplan
ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1848 return goalnew
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1849
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1850
30276 bc5d0e6fd9f3 histedit: use ui.fin to read commands from stdin Yuya Nishihara <yuya@tcha.org> parents: 30027 diff changeset	1851 def _readfile(ui, path):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1852 if path == b'-':
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1853 with ui.timeblockedsection(b'histedit'):
31003 d4825798818b histedit: log the time taken to read in the commands list Simon Farnsworth <simonfar@fb.com> parents: 30848 diff changeset	1854 return ui.fin.read()
28550 e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	1855 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1856 with open(path, b'rb') as f:
28550 e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	1857 return f.read()
e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	1858
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1859
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1860 def _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs):
27169 dd214130a4f6 histedit: improve grammar for _histedit comment timeless <timeless@mozdev.org> parents: 27154 diff changeset	1861 # TODO only abort if we try to histedit mq patches, not just
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1862 # blanket if mq patches are applied somewhere
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1863 mq = getattr(repo, 'mq', None)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1864 if mq and mq.applied:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1865 raise error.Abort(_(b'source has mq patches applied'))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1866
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1867 # basic argument incompatibility processing
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1868 outg = opts.get(b'outgoing')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1869 editplan = opts.get(b'edit_plan')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1870 abort = opts.get(b'abort')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1871 force = opts.get(b'force')
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1872 if force and not outg:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1873 raise error.Abort(_(b'--force only allowed with --outgoing'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1874 if goal == b'continue':
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 24959 diff changeset	1875 if any((outg, abort, revs, freeargs, rules, editplan)):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1876 raise error.Abort(_(b'no arguments allowed with --continue'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1877 elif goal == b'abort':
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 24959 diff changeset	1878 if any((outg, revs, freeargs, rules, editplan)):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1879 raise error.Abort(_(b'no arguments allowed with --abort'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1880 elif goal == b'edit-plan':
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 24959 diff changeset	1881 if any((outg, revs, freeargs)):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1882 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1883 _(b'only --commands argument allowed with ' b'--edit-plan')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1884 )
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1885 else:
38826 28d8b5f49b4d histedit: avoid repeating name of state file in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	1886 if state.inprogress():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1887 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1888 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1889 b'history edit already in progress, try '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1890 b'--continue or --abort'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1891 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1892 )
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1893 if outg:
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1894 if revs:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1895 raise error.Abort(_(b'no revisions allowed with --outgoing'))
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1896 if len(freeargs) > 1:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1897 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1898 _(b'only one repo argument allowed with --outgoing')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1899 )
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1900 else:
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1901 revs.extend(freeargs)
24009 00d331763442 histedit: allow configuring default behavior Durham Goode <durham@fb.com> parents: 24002 diff changeset	1902 if len(revs) == 0:
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	1903 defaultrev = destutil.desthistedit(ui, repo)
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	1904 if defaultrev is not None:
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	1905 revs.append(defaultrev)
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	1906
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1907 if len(revs) != 1:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1908 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1909 _(b'histedit requires exactly one ancestor revision')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1910 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1911
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1912
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1913 def _histedit(ui, repo, state, freeargs, *opts):
35040 c4b769bc86da py3: handle keyword arguments in hgext/histedit.py Pulkit Goyal <7895pulkit@gmail.com> parents: 34917 diff changeset	1914 opts = pycompat.byteskwargs(opts)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1915 fm = ui.formatter(b'histedit', opts)
35147 a9cc233de513 histedit: add support to output nodechanges using formatter Pulkit Goyal <7895pulkit@gmail.com> parents: 35040 diff changeset	1916 fm.startitem()
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1917 goal = _getgoal(opts)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1918 revs = opts.get(b'rev', [])
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1919 nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1920 rules = opts.get(b'commands', b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1921 state.keep = opts.get(b'keep', False)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1922
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1923 _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs)
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	1924
41106 86f0ed7ac688 histedit: add warning message on editing tagged commits (issue4017) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40695 diff changeset	1925 hastags = False
86f0ed7ac688 histedit: add warning message on editing tagged commits (issue4017) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40695 diff changeset	1926 if revs:
86f0ed7ac688 histedit: add warning message on editing tagged commits (issue4017) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40695 diff changeset	1927 revs = scmutil.revrange(repo, revs)
86f0ed7ac688 histedit: add warning message on editing tagged commits (issue4017) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40695 diff changeset	1928 ctxs = [repo[rev] for rev in revs]
86f0ed7ac688 histedit: add warning message on editing tagged commits (issue4017) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40695 diff changeset	1929 for ctx in ctxs:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1930 tags = [tag for tag in ctx.tags() if tag != b'tip']
41106 86f0ed7ac688 histedit: add warning message on editing tagged commits (issue4017) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40695 diff changeset	1931 if not hastags:
86f0ed7ac688 histedit: add warning message on editing tagged commits (issue4017) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40695 diff changeset	1932 hastags = len(tags)
86f0ed7ac688 histedit: add warning message on editing tagged commits (issue4017) Navaneeth Suresh <navaneeths1998@gmail.com> parents: 40695 diff changeset	1933 if hastags:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1934 if ui.promptchoice(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1935 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1936 b'warning: tags associated with the given'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1937 b' changeset will be lost after histedit.\n'
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1938 b'do you want to continue (yN)? $$ &Yes $$ &No'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1939 ),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1940 default=1,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1941 ):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1942 raise error.Abort(_(b'histedit cancelled\n'))
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	1943 # rebuild state
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1944 if goal == goalcontinue:
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	1945 state.read()
22980 b3483bc1ec8c histedit: pass state to boostrapcontinue David Soria Parra <davidsp@fb.com> parents: 22979 diff changeset	1946 state = bootstrapcontinue(ui, state, opts)
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1947 elif goal == goaleditplan:
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1948 _edithisteditplan(ui, repo, state, rules)
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	1949 return
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1950 elif goal == goalabort:
38549 7b57b1ed5c0f histedit: add --no-backup option (issue5825) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38512 diff changeset	1951 _aborthistedit(ui, repo, state, nobackup=nobackup)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1952 return
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1953 else:
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1954 # goal == goalnew
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1955 _newhistedit(ui, repo, state, revs, freeargs, opts)
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	1956
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1957 _continuehistedit(ui, repo, state)
35147 a9cc233de513 histedit: add support to output nodechanges using formatter Pulkit Goyal <7895pulkit@gmail.com> parents: 35040 diff changeset	1958 _finishhistedit(ui, repo, state, fm)
a9cc233de513 histedit: add support to output nodechanges using formatter Pulkit Goyal <7895pulkit@gmail.com> parents: 35040 diff changeset	1959 fm.end()
28133 8fc55388ece5 histedit: break _histedit function into smaller pieces (add _continueaction) Kostia Balytskyi <ikostia@fb.com> parents: 28132 diff changeset	1960
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1961
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1962 def _continuehistedit(ui, repo, state):
47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1963 """This function runs after either:
28133 8fc55388ece5 histedit: break _histedit function into smaller pieces (add _continueaction) Kostia Balytskyi <ikostia@fb.com> parents: 28132 diff changeset	1964 - bootstrapcontinue (if the goal is 'continue')
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1965 - _newhistedit (if the goal is 'new')
28133 8fc55388ece5 histedit: break _histedit function into smaller pieces (add _continueaction) Kostia Balytskyi <ikostia@fb.com> parents: 28132 diff changeset	1966 """
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	1967 # preprocess rules so that we can hide inner folds from the user
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	1968 # and only show one editor
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1969 actions = state.actions[:]
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1970 for idx, (action, nextact) in enumerate(zip(actions, actions[1:] + [None])):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1971 if action.verb == b'fold' and nextact and nextact.verb == b'fold':
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1972 state.actions[idx].__class__ = _multifold
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	1973
31520 68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	1974 # Force an initial state file write, so the user can run --abort/continue
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	1975 # even if there's an exception before the first transaction serialize.
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	1976 state.write()
33445 0491004e2233 histedit: create transaction outside of try Martin von Zweigbergk <martinvonz@google.com> parents: 33444 diff changeset	1977
0491004e2233 histedit: create transaction outside of try Martin von Zweigbergk <martinvonz@google.com> parents: 33444 diff changeset	1978 tr = None
0491004e2233 histedit: create transaction outside of try Martin von Zweigbergk <martinvonz@google.com> parents: 33444 diff changeset	1979 # Don't use singletransaction by default since it rolls the entire
0491004e2233 histedit: create transaction outside of try Martin von Zweigbergk <martinvonz@google.com> parents: 33444 diff changeset	1980 # transaction back if an unexpected exception happens (like a
0491004e2233 histedit: create transaction outside of try Martin von Zweigbergk <martinvonz@google.com> parents: 33444 diff changeset	1981 # pretxncommit hook throws, or the user aborts the commit msg editor).
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1982 if ui.configbool(b"histedit", b"singletransaction"):
33445 0491004e2233 histedit: create transaction outside of try Martin von Zweigbergk <martinvonz@google.com> parents: 33444 diff changeset	1983 # Don't use a 'with' for the transaction, since actions may close
0491004e2233 histedit: create transaction outside of try Martin von Zweigbergk <martinvonz@google.com> parents: 33444 diff changeset	1984 # and reopen a transaction. For example, if the action executes an
0491004e2233 histedit: create transaction outside of try Martin von Zweigbergk <martinvonz@google.com> parents: 33444 diff changeset	1985 # external process it may choose to commit the transaction first.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1986 tr = repo.transaction(b'histedit')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1987 progress = ui.makeprogress(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1988 _(b"editing"), unit=_(b'changes'), total=len(state.actions)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1989 )
38384 e5d87c69bbcb histedit: use progress helper Martin von Zweigbergk <martinvonz@google.com> parents: 37678 diff changeset	1990 with progress, util.acceptintervention(tr):
31520 68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	1991 while state.actions:
33444 c4e39512a661 histedit: remove transaction from state object Martin von Zweigbergk <martinvonz@google.com> parents: 33351 diff changeset	1992 state.write(tr=tr)
31520 68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	1993 actobj = state.actions[0]
38384 e5d87c69bbcb histedit: use progress helper Martin von Zweigbergk <martinvonz@google.com> parents: 37678 diff changeset	1994 progress.increment(item=actobj.torule())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1995 ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	1996 b'histedit: processing %s %s\n' % (actobj.verb, actobj.torule())
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	1997 )
31520 68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	1998 parentctx, replacement_ = actobj.run()
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	1999 state.parentctxnode = parentctx.node()
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	2000 state.replacements.extend(replacement_)
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	2001 state.actions.pop(0)
68474b72ea63 histedit: add histedit.singletransaction config option Durham Goode <durham@fb.com> parents: 31519 diff changeset	2002
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	2003 state.write()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	2004
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2005
35147 a9cc233de513 histedit: add support to output nodechanges using formatter Pulkit Goyal <7895pulkit@gmail.com> parents: 35040 diff changeset	2006 def _finishhistedit(ui, repo, state, fm):
28153 17c474fdb225 histedit: break _histedit into smaller pieces (add _finishaction) Kostia Balytskyi <ikostia@fb.com> parents: 28144 diff changeset	2007 """This action runs when histedit is finishing its session"""
38512 39db5a01cd53 cleanup: pass in overwrite flag to hg.updaterepo() as named argument Yuya Nishihara <yuya@tcha.org> parents: 38511 diff changeset	2008 hg.updaterepo(repo, state.parentctxnode, overwrite=False)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	2009
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	2010 mapping, tmpnodes, created, ntm = processreplacement(state)
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2011 if mapping:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2012 for prec, succs in mapping.iteritems():
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2013 if not succs:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2014 ui.debug(b'histedit: %s is dropped\n' % node.short(prec))
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2015 else:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2016 ui.debug(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2017 b'histedit: %s is replaced by %s\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2018 % (node.short(prec), node.short(succs[0]))
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2019 )
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2020 if len(succs) > 1:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2021 m = b'histedit: %s'
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2022 for n in succs[1:]:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2023 ui.debug(m % node.short(n))
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2024
25330 8594d0b3018e histedit: fix keep during --continue Durham Goode <durham@fb.com> parents: 24959 diff changeset	2025 if not state.keep:
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2026 if mapping:
33351 154298576d44 histedit: use scmutil.cleanupnodes (BC) Jun Wu <quark@fb.com> parents: 33350 diff changeset	2027 movetopmostbookmarks(repo, state.topmost, ntm)
17663 c6de8c696644 histedit: extract bookmark logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17662 diff changeset	2028 # TODO update mq state
33350 b320ff822c7e histedit: unify strip backup files on success (BC) Jun Wu <quark@fb.com> parents: 33349 diff changeset	2029 else:
b320ff822c7e histedit: unify strip backup files on success (BC) Jun Wu <quark@fb.com> parents: 33349 diff changeset	2030 mapping = {}
b320ff822c7e histedit: unify strip backup files on success (BC) Jun Wu <quark@fb.com> parents: 33349 diff changeset	2031
b320ff822c7e histedit: unify strip backup files on success (BC) Jun Wu <quark@fb.com> parents: 33349 diff changeset	2032 for n in tmpnodes:
39919 b153ca77a52b histedit: don't cleanup nodes already disposed of Boris Feld <boris.feld@octobus.net> parents: 38826 diff changeset	2033 if n in repo:
b153ca77a52b histedit: don't cleanup nodes already disposed of Boris Feld <boris.feld@octobus.net> parents: 38826 diff changeset	2034 mapping[n] = ()
33350 b320ff822c7e histedit: unify strip backup files on success (BC) Jun Wu <quark@fb.com> parents: 33349 diff changeset	2035
33351 154298576d44 histedit: use scmutil.cleanupnodes (BC) Jun Wu <quark@fb.com> parents: 33350 diff changeset	2036 # remove entries about unknown nodes
154298576d44 histedit: use scmutil.cleanupnodes (BC) Jun Wu <quark@fb.com> parents: 33350 diff changeset	2037 nodemap = repo.unfiltered().changelog.nodemap
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2038 mapping = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2039 k: v
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2040 for k, v in mapping.items()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2041 if k in nodemap and all(n in nodemap for n in v)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2042 }
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2043 scmutil.cleanupnodes(repo, mapping, b'histedit')
35147 a9cc233de513 histedit: add support to output nodechanges using formatter Pulkit Goyal <7895pulkit@gmail.com> parents: 35040 diff changeset	2044 hf = fm.hexfunc
a9cc233de513 histedit: add support to output nodechanges using formatter Pulkit Goyal <7895pulkit@gmail.com> parents: 35040 diff changeset	2045 fl = fm.formatlist
a9cc233de513 histedit: add support to output nodechanges using formatter Pulkit Goyal <7895pulkit@gmail.com> parents: 35040 diff changeset	2046 fd = fm.formatdict
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2047 nodechanges = fd(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2048 {
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2049 hf(oldn): fl([hf(n) for n in newn], name=b'node')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2050 for oldn, newn in mapping.iteritems()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2051 },
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2052 key=b"oldnode",
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2053 value=b"newnodes",
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2054 )
35147 a9cc233de513 histedit: add support to output nodechanges using formatter Pulkit Goyal <7895pulkit@gmail.com> parents: 35040 diff changeset	2055 fm.data(nodechanges=nodechanges)
25894 54f9561088c7 histedit: backout ebb5bb9bc32e Pierre-Yves David <pierre-yves.david@fb.com> parents: 25824 diff changeset	2056
22978 d4e764521249 histedit: add clear method to remove state David Soria Parra <davidsp@fb.com> parents: 22977 diff changeset	2057 state.clear()
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2058 if os.path.exists(repo.sjoin(b'undo')):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2059 os.unlink(repo.sjoin(b'undo'))
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2060 if repo.vfs.exists(b'histedit-last-edit.txt'):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2061 repo.vfs.unlink(b'histedit-last-edit.txt')
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	2062
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2063
38549 7b57b1ed5c0f histedit: add --no-backup option (issue5825) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38512 diff changeset	2064 def _aborthistedit(ui, repo, state, nobackup=False):
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2065 try:
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2066 state.read()
28179 2e11f6756d9c histedit: unifying the way replacements are computed for abort and success Kostia Balytskyi <ikostia@fb.com> parents: 28154 diff changeset	2067 __, leafs, tmpnodes, __ = processreplacement(state)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2068 ui.debug(b'restore wc to old parent %s\n' % node.short(state.topmost))
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2069
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2070 # Recover our old commits if necessary
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2071 if not state.topmost in repo and state.backupfile:
31338 6ce67d3941fc histedit: directly use repo.vfs.join Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31076 diff changeset	2072 backupfile = repo.vfs.join(state.backupfile)
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2073 f = hg.openpath(ui, backupfile)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2074 gen = exchange.readbundle(ui, f, backupfile)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2075 with repo.transaction(b'histedit.abort') as tr:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2076 bundle2.applybundle(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2077 repo,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2078 gen,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2079 tr,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2080 source=b'histedit',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2081 url=b'bundle:' + backupfile,
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2082 )
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2083
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2084 os.remove(backupfile)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2085
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2086 # check whether we should update away
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2087 if repo.unfiltered().revs(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2088 b'parents() and (%n or %ln::)',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2089 state.parentctxnode,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2090 leafs \| tmpnodes,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2091 ):
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2092 hg.clean(repo, state.topmost, show_stats=True, quietempty=True)
38549 7b57b1ed5c0f histedit: add --no-backup option (issue5825) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38512 diff changeset	2093 cleanupnode(ui, repo, tmpnodes, nobackup=nobackup)
7b57b1ed5c0f histedit: add --no-backup option (issue5825) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38512 diff changeset	2094 cleanupnode(ui, repo, leafs, nobackup=nobackup)
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2095 except Exception:
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2096 if state.inprogress():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2097 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2098 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2099 b'warning: encountered an exception during histedit '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2100 b'--abort; the repository may not have been completely '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2101 b'cleaned up\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2102 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2103 )
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2104 raise
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2105 finally:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2106 state.clear()
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2107
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	2108
42584 db5560c07a28 abort: added support for histedit Taapas Agrawal <taapas2897@gmail.com> parents: 42540 diff changeset	2109 def hgaborthistedit(ui, repo):
db5560c07a28 abort: added support for histedit Taapas Agrawal <taapas2897@gmail.com> parents: 42540 diff changeset	2110 state = histeditstate(repo)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2111 nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
42584 db5560c07a28 abort: added support for histedit Taapas Agrawal <taapas2897@gmail.com> parents: 42540 diff changeset	2112 with repo.wlock() as wlock, repo.lock() as lock:
db5560c07a28 abort: added support for histedit Taapas Agrawal <taapas2897@gmail.com> parents: 42540 diff changeset	2113 state.wlock = wlock
db5560c07a28 abort: added support for histedit Taapas Agrawal <taapas2897@gmail.com> parents: 42540 diff changeset	2114 state.lock = lock
db5560c07a28 abort: added support for histedit Taapas Agrawal <taapas2897@gmail.com> parents: 42540 diff changeset	2115 _aborthistedit(ui, repo, state, nobackup=nobackup)
db5560c07a28 abort: added support for histedit Taapas Agrawal <taapas2897@gmail.com> parents: 42540 diff changeset	2116
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2117
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	2118 def _edithisteditplan(ui, repo, state, rules):
28131 5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	2119 state.read()
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	2120 if not rules:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2121 comment = geteditcomment(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2122 ui, node.short(state.parentctxnode), node.short(state.topmost)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2123 )
28131 5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	2124 rules = ruleeditor(repo, ui, state.actions, comment)
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	2125 else:
30276 bc5d0e6fd9f3 histedit: use ui.fin to read commands from stdin Yuya Nishihara <yuya@tcha.org> parents: 30027 diff changeset	2126 rules = _readfile(ui, rules)
28131 5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	2127 actions = parserules(rules, state)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2128 ctxs = [repo[act.node] for act in state.actions if act.node]
28131 5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	2129 warnverifyactions(ui, repo, actions, state, ctxs)
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	2130 state.actions = actions
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	2131 state.write()
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	2132
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2133
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	2134 def _newhistedit(ui, repo, state, revs, freeargs, opts):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2135 outg = opts.get(b'outgoing')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2136 rules = opts.get(b'commands', b'')
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2137 force = opts.get(b'force')
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2138
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2139 cmdutil.checkunfinished(repo)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2140 cmdutil.bailifchanged(repo)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2141
41421 5cb8158a61f7 cleanup: use p1() instead of parents() when we only need the first parent Martin von Zweigbergk <martinvonz@google.com> parents: 41419 diff changeset	2142 topmost = repo.dirstate.p1()
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2143 if outg:
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2144 if freeargs:
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2145 remote = freeargs[0]
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2146 else:
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2147 remote = None
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2148 root = findoutgoing(ui, repo, remote, force, opts)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2149 else:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2150 rr = list(repo.set(b'roots(%ld)', scmutil.revrange(repo, revs)))
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2151 if len(rr) != 1:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2152 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2153 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2154 b'The specified revisions must have '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2155 b'exactly one common root'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2156 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2157 )
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2158 root = rr[0].node()
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2159
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2160 revs = between(repo, root, topmost, state.keep)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2161 if not revs:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2162 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2163 _(b'%s is not an ancestor of working directory') % node.short(root)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2164 )
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2165
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2166 ctxs = [repo[r] for r in revs]
42979 699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2167
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2168 wctx = repo[None]
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2169 # Please don't ask me why `ancestors` is this value. I figured it
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2170 # out with print-debugging, not by actually understanding what the
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2171 # merge code is doing. :(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2172 ancs = [repo[b'.']]
42979 699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2173 # Sniff-test to make sure we won't collide with untracked files in
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2174 # the working directory. If we don't do this, we can get a
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2175 # collision after we've started histedit and backing out gets ugly
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2176 # for everyone, especially the user.
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2177 for c in [ctxs[0].p1()] + ctxs:
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2178 try:
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2179 mergemod.calculateupdates(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2180 repo,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2181 wctx,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2182 c,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2183 ancs,
42979 699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2184 # These parameters were determined by print-debugging
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2185 # what happens later on inside histedit.
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2186 branchmerge=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2187 force=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2188 acceptremote=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2189 followcopies=False,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2190 )
42979 699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2191 except error.Abort:
699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2192 raise error.Abort(
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2193 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2194 b"untracked files in working directory conflict with files in %s"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2195 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2196 % c
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2197 )
42979 699102b10530 histedit: sniff-test for untracked file conflicts before prompting for rules Augie Fackler <augie@google.com> parents: 42650 diff changeset	2198
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2199 if not rules:
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	2200 comment = geteditcomment(ui, node.short(root), node.short(topmost))
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2201 actions = [pick(state, r) for r in revs]
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2202 rules = ruleeditor(repo, ui, actions, comment)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2203 else:
30276 bc5d0e6fd9f3 histedit: use ui.fin to read commands from stdin Yuya Nishihara <yuya@tcha.org> parents: 30027 diff changeset	2204 rules = _readfile(ui, rules)
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2205 actions = parserules(rules, state)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2206 warnverifyactions(ui, repo, actions, state, ctxs)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2207
41419 0bd56c291359 cleanup: use p1() and p2() instead of parents()[0] and parents()[1] Martin von Zweigbergk <martinvonz@google.com> parents: 41223 diff changeset	2208 parentctxnode = repo[root].p1().node()
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2209
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2210 state.parentctxnode = parentctxnode
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2211 state.actions = actions
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2212 state.topmost = topmost
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2213 state.replacements = []
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2214
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2215 ui.log(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2216 b"histedit",
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2217 b"%d actions to histedit\n",
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2218 len(actions),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2219 histedit_num_actions=len(actions),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2220 )
35494 784a85c87c22 histedit: add ui.log for action count Phil Cohen <phillco@fb.com> parents: 35421 diff changeset	2221
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2222 # Create a backup so we can always abort completely.
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2223 backupfile = None
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2224 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2225 backupfile = repair.backupbundle(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2226 repo, [parentctxnode], [topmost], root, b'histedit'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2227 )
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2228 state.backupfile = backupfile
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	2229
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2230
29467 4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	2231 def _getsummary(ctx):
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	2232 # a common pattern is to extract the summary but default to the empty
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	2233 # string
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2234 summary = ctx.description() or b''
29467 4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	2235 if summary:
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	2236 summary = summary.splitlines()[0]
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	2237 return summary
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	2238
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2239
24774 a9d63d87b837 histedit: delete all non-actionclass related code Durham Goode <durham@fb.com> parents: 24773 diff changeset	2240 def bootstrapcontinue(ui, state, opts):
a9d63d87b837 histedit: delete all non-actionclass related code Durham Goode <durham@fb.com> parents: 24773 diff changeset	2241 repo = state.repo
32057 e5ffc91a2276 histedit: make check for unresolved conflicts explicit (issue5545) Siddharth Agarwal <sid0@fb.com> parents: 31643 diff changeset	2242
e5ffc91a2276 histedit: make check for unresolved conflicts explicit (issue5545) Siddharth Agarwal <sid0@fb.com> parents: 31643 diff changeset	2243 ms = mergemod.mergestate.read(repo)
e5ffc91a2276 histedit: make check for unresolved conflicts explicit (issue5545) Siddharth Agarwal <sid0@fb.com> parents: 31643 diff changeset	2244 mergeutil.checkunresolved(ms)
e5ffc91a2276 histedit: make check for unresolved conflicts explicit (issue5545) Siddharth Agarwal <sid0@fb.com> parents: 31643 diff changeset	2245
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	2246 if state.actions:
2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	2247 actobj = state.actions.pop(0)
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	2248
26981 cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	2249 if _isdirtywc(repo):
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	2250 actobj.continuedirty()
26981 cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	2251 if _isdirtywc(repo):
27084 383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	2252 abortdirty()
24766 cfb8f5e3ca49 histedit: integrate action class into flow Durham Goode <durham@fb.com> parents: 24765 diff changeset	2253
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	2254 parentctx, replacements = actobj.continueclean()
17666 5b6c8f2fbda5 histedit: move `continue` logic into a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17665 diff changeset	2255
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	2256 state.parentctxnode = parentctx.node()
3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	2257 state.replacements.extend(replacements)
22980 b3483bc1ec8c histedit: pass state to boostrapcontinue David Soria Parra <davidsp@fb.com> parents: 22979 diff changeset	2258
b3483bc1ec8c histedit: pass state to boostrapcontinue David Soria Parra <davidsp@fb.com> parents: 22979 diff changeset	2259 return state
17666 5b6c8f2fbda5 histedit: move `continue` logic into a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17665 diff changeset	2260
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2261
17642 bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	2262 def between(repo, old, new, keep):
bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	2263 """select and validate the set of revision to edit
bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	2264
bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	2265 When keep is false, the specified set can't have children."""
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2266 revs = repo.revs(b'%n::%n', old, new)
36443 f493829b74dd histedit: use repo.revs() instead of repo.set() where revisions are needed Yuya Nishihara <yuya@tcha.org> parents: 36439 diff changeset	2267 if revs and not keep:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2268 if not obsolete.isenabled(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2269 repo, obsolete.allowunstableopt
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2270 ) and repo.revs(b'(%ld::) - (%ld)', revs, revs):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2271 raise error.Abort(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2272 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2273 b'can only histedit a changeset together '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2274 b'with all its descendants'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2275 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2276 )
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2277 if repo.revs(b'(%ld) and merge()', revs):
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2278 raise error.Abort(_(b'cannot edit history that contains merges'))
36443 f493829b74dd histedit: use repo.revs() instead of repo.set() where revisions are needed Yuya Nishihara <yuya@tcha.org> parents: 36439 diff changeset	2279 root = repo[revs.first()] # list is already sorted by repo.revs()
22416 810d37485e85 histedit: check mutability of contexts correctly Augie Fackler <raf@durin42.com> parents: 22405 diff changeset	2280 if not root.mutable():
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2281 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2282 _(b'cannot edit public changeset: %s') % root,
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2283 hint=_(b"see 'hg help phases' for details"),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2284 )
36443 f493829b74dd histedit: use repo.revs() instead of repo.set() where revisions are needed Yuya Nishihara <yuya@tcha.org> parents: 36439 diff changeset	2285 return pycompat.maplist(repo.changelog.node, revs)
17642 bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	2286
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2287
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2288 def ruleeditor(repo, ui, actions, editcomment=b""):
24140 5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2289 """open an editor to edit rules
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2290
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2291 rules are in the format [ [act, ctx], ...] like in state.rules
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2292 """
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2293 if repo.ui.configbool(b"experimental", b"histedit.autoverb"):
29470 2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2294 newact = util.sortdict()
29465 00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	2295 for act in actions:
00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	2296 ctx = repo[act.node]
29469 ffa194c3a83c histedit: use _getsummary in ruleeditor Sean Farley <sean@farley.io> parents: 29468 diff changeset	2297 summary = _getsummary(ctx)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2298 fword = summary.split(b' ', 1)[0].lower()
29470 2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2299 added = False
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2300
29465 00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	2301 # if it doesn't end with the special character '!' just skip this
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2302 if fword.endswith(b'!'):
29465 00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	2303 fword = fword[:-1]
00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	2304 if fword in primaryactions \| secondaryactions \| tertiaryactions:
00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	2305 act.verb = fword
29470 2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2306 # get the target summary
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2307 tsum = summary[len(fword) + 1 :].lstrip()
29470 2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2308 # safe but slow: reverse iterate over the actions so we
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2309 # don't clash on two commits having the same summary
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2310 for na, l in reversed(list(newact.iteritems())):
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2311 actx = repo[na.node]
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2312 asum = _getsummary(actx)
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2313 if asum == tsum:
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2314 added = True
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2315 l.append(act)
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2316 break
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2317
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2318 if not added:
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2319 newact[act] = []
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2320
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2321 # copy over and flatten the new list
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2322 actions = []
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2323 for na, l in newact.iteritems():
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2324 actions.append(na)
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	2325 actions += l
29465 00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	2326
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2327 rules = b'\n'.join([act.torule() for act in actions])
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2328 rules += b'\n\n'
24140 5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2329 rules += editcomment
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2330 rules = ui.edit(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2331 rules,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2332 ui.username(),
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2333 {b'prefix': b'histedit'},
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2334 repopath=repo.path,
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2335 action=b'histedit',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2336 )
24140 5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2337
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2338 # Save edit rules in .hg/histedit-last-edit.txt in case
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2339 # the user needs to ask for help after something
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2340 # surprising happens.
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2341 with repo.vfs(b'histedit-last-edit.txt', b'wb') as f:
36206 be73fa5b42d3 histedit: modernize write of histedit-last-edit file Augie Fackler <augie@google.com> parents: 36205 diff changeset	2342 f.write(rules)
24140 5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2343
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2344 return rules
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	2345
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2346
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2347 def parserules(rules, state):
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2348 """Read the histedit rules string and return list of action objects """
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2349 rules = [
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2350 l
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2351 for l in (r.strip() for r in rules.splitlines())
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2352 if l and not l.startswith(b'#')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2353 ]
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2354 actions = []
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	2355 for r in rules:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2356 if b' ' not in r:
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2357 raise error.ParseError(_(b'malformed line "%s"') % r)
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2358 verb, rest = r.split(b' ', 1)
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	2359
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2360 if verb not in actiontable:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2361 raise error.ParseError(_(b'unknown action "%s"') % verb)
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2362
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	2363 action = actiontable[verb].fromrule(state, rest)
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2364 actions.append(action)
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2365 return actions
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2366
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2367
27543 ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	2368 def warnverifyactions(ui, repo, actions, state, ctxs):
ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	2369 try:
ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	2370 verifyactions(actions, state, ctxs)
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	2371 except error.ParseError:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2372 if repo.vfs.exists(b'histedit-last-edit.txt'):
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2373 ui.warn(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2374 _(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2375 b'warning: histedit rules saved '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2376 b'to: .hg/histedit-last-edit.txt\n'
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2377 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2378 )
27543 ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	2379 raise
ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	2380
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2381
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2382 def verifyactions(actions, state, ctxs):
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2383 """Verify that there exists exactly one action per given changeset and
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2384 other constraints.
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2385
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2386 Will abort if there are to many or too few rules, a malformed rule,
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2387 or a rule on a changeset outside of the user-given range.
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2388 """
29882 d7de02efa47e histedit: directly use node in 'verifyactions' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29881 diff changeset	2389 expected = set(c.node() for c in ctxs)
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2390 seen = set()
27541 69df2081aeb5 histedit: pass previous action to verify timeless <timeless@mozdev.org> parents: 27534 diff changeset	2391 prev = None
33783 c26a76e1af36 histedit: check first changeset for verb "roll" or "fold" (issue5498) Andr? Klitzing <aklitzing@gmail.com> parents: 33486 diff changeset	2392
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2393 if actions and actions[0].verb in [b'roll', b'fold']:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2394 raise error.ParseError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2395 _(b'first changeset cannot use verb "%s"') % actions[0].verb
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2396 )
33783 c26a76e1af36 histedit: check first changeset for verb "roll" or "fold" (issue5498) Andr? Klitzing <aklitzing@gmail.com> parents: 33486 diff changeset	2397
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	2398 for action in actions:
29883 b566c5992e07 histedit: move constraint verification to the 'action.verify' method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29882 diff changeset	2399 action.verify(prev, expected, seen)
27541 69df2081aeb5 histedit: pass previous action to verify timeless <timeless@mozdev.org> parents: 27534 diff changeset	2400 prev = action
29880 034d38b5f6fb histedit: drop the 'nodetoverify' local variable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29879 diff changeset	2401 if action.node is not None:
29882 d7de02efa47e histedit: directly use node in 'verifyactions' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29881 diff changeset	2402 seen.add(action.node)
19048 1163ff06ce89 histedit: more precise user message when changeset is missing Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19047 diff changeset	2403 missing = sorted(expected - seen) # sort to stabilize output
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	2404
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2405 if state.repo.ui.configbool(b'histedit', b'dropmissing'):
28519 518a5030acba histedit: have dropmissing abort on empty plan Mateusz Kwapich <mitrandir@fb.com> parents: 28396 diff changeset	2406 if len(actions) == 0:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2407 raise error.ParseError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2408 _(b'no rules provided'),
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2409 hint=_(b'use strip extension to remove commits'),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2410 )
28519 518a5030acba histedit: have dropmissing abort on empty plan Mateusz Kwapich <mitrandir@fb.com> parents: 28396 diff changeset	2411
29882 d7de02efa47e histedit: directly use node in 'verifyactions' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29881 diff changeset	2412 drops = [drop(state, n) for n in missing]
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	2413 # put the in the beginning so they execute immediately and
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	2414 # don't show in the edit-plan in the future
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	2415 actions[:0] = drops
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	2416 elif missing:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2417 raise error.ParseError(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2418 _(b'missing rules for changeset %s') % node.short(missing[0]),
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2419 hint=_(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2420 b'use "drop %s" to discard, see also: '
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2421 b"'hg help -e histedit.config'"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2422 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2423 % node.short(missing[0]),
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2424 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2425
17663 c6de8c696644 histedit: extract bookmark logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17662 diff changeset	2426
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2427 def adjustreplacementsfrommarkers(repo, oldreplacements):
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30276 diff changeset	2428 """Adjust replacements from obsolescence markers
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2429
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2430 Replacements structure is originally generated based on
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2431 histedit's state and does not account for changes that are
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2432 not recorded there. This function fixes that by adding
30342 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30276 diff changeset	2433 data read from obsolescence markers"""
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2434 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2435 return oldreplacements
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2436
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2437 unfi = repo.unfiltered()
28224 8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	2438 nm = unfi.changelog.nodemap
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	2439 obsstore = repo.obsstore
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2440 newreplacements = list(oldreplacements)
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2441 oldsuccs = [r[1] for r in oldreplacements]
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2442 # successors that have already been added to succstocheck once
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2443 seensuccs = set().union(
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2444 *oldsuccs
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2445 ) # create a set from an iterable of tuples
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2446 succstocheck = list(seensuccs)
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2447 while succstocheck:
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2448 n = succstocheck.pop()
28224 8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	2449 missing = nm.get(n) is None
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	2450 markers = obsstore.successors.get(n, ())
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	2451 if missing and not markers:
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	2452 # dead end, mark it as such
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2453 newreplacements.append((n, ()))
28224 8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	2454 for marker in markers:
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	2455 nsuccs = marker[1]
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2456 newreplacements.append((n, nsuccs))
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2457 for nsucc in nsuccs:
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2458 if nsucc not in seensuccs:
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2459 seensuccs.add(nsucc)
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2460 succstocheck.append(nsucc)
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2461
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2462 return newreplacements
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2463
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2464
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	2465 def processreplacement(state):
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2466 """process the list of replacements to return
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2467
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2468 1) the final mapping between original and created nodes
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2469 2) the list of temporary node created by histedit
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2470 3) the list of new commit created by histedit"""
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	2471 replacements = adjustreplacementsfrommarkers(state.repo, state.replacements)
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2472 allsuccs = set()
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2473 replaced = set()
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2474 fullmapping = {}
26039 84dcc37b1272 histedit: correct spelling etc in more comments Augie Fackler <augie@google.com> parents: 26038 diff changeset	2475 # initialize basic set
84dcc37b1272 histedit: correct spelling etc in more comments Augie Fackler <augie@google.com> parents: 26038 diff changeset	2476 # fullmapping records all operations recorded in replacement
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2477 for rep in replacements:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2478 allsuccs.update(rep[1])
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2479 replaced.add(rep[0])
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2480 fullmapping.setdefault(rep[0], set()).update(rep[1])
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2481 new = allsuccs - replaced
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2482 tmpnodes = allsuccs & replaced
26039 84dcc37b1272 histedit: correct spelling etc in more comments Augie Fackler <augie@google.com> parents: 26038 diff changeset	2483 # Reduce content fullmapping into direct relation between original nodes
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2484 # and final node created during history edition
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2485 # Dropped changeset are replaced by an empty list
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2486 toproceed = set(fullmapping)
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2487 final = {}
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2488 while toproceed:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2489 for x in list(toproceed):
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2490 succs = fullmapping[x]
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2491 for s in list(succs):
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2492 if s in toproceed:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2493 # non final node with unknown closure
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2494 # We can't process this now
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2495 break
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2496 elif s in final:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2497 # non final node, replace with closure
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2498 succs.remove(s)
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2499 succs.update(final[s])
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2500 else:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2501 final[x] = succs
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2502 toproceed.remove(x)
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2503 # remove tmpnodes from final mapping
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2504 for n in tmpnodes:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2505 del final[n]
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2506 # we expect all changes involved in final to exist in the repo
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2507 # turn `final` into list (topologically sorted)
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	2508 nm = state.repo.changelog.nodemap
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2509 for prec, succs in final.items():
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2510 final[prec] = sorted(succs, key=nm.get)
17663 c6de8c696644 histedit: extract bookmark logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17662 diff changeset	2511
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2512 # computed topmost element (necessary for bookmark)
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2513 if new:
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	2514 newtopmost = sorted(new, key=state.repo.changelog.rev)[-1]
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2515 elif not final:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2516 # Nothing rewritten at all. we won't need `newtopmost`
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2517 # It is the same as `oldtopmost` and `processreplacement` know it
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2518 newtopmost = None
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2519 else:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2520 # every body died. The newtopmost is the parent of the root.
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	2521 r = state.repo.changelog.rev
0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	2522 newtopmost = state.repo[sorted(final, key=r)[0]].p1().node()
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2523
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	2524 return final, tmpnodes, new, newtopmost
17663 c6de8c696644 histedit: extract bookmark logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17662 diff changeset	2525
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2526
33346 7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2527 def movetopmostbookmarks(repo, oldtopmost, newtopmost):
7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2528 """Move bookmark from oldtopmost to newly created topmost
7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2529
7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2530 This is arguably a feature and we may only want that for the active
7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2531 bookmark. But the behavior is kept compatible with the old version for now.
7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2532 """
7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2533 if not oldtopmost or not newtopmost:
7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2534 return
7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2535 oldbmarks = repo.nodebookmarks(oldtopmost)
7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2536 if oldbmarks:
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2537 with repo.lock(), repo.transaction(b'histedit') as tr:
33346 7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2538 marks = repo._bookmarks
33486 af402f11cb9d bookmark: use 'applychanges' when updating bookmark in histedit Boris Feld <boris.feld@octobus.net> parents: 33446 diff changeset	2539 changes = []
33346 7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2540 for name in oldbmarks:
33486 af402f11cb9d bookmark: use 'applychanges' when updating bookmark in histedit Boris Feld <boris.feld@octobus.net> parents: 33446 diff changeset	2541 changes.append((name, newtopmost))
af402f11cb9d bookmark: use 'applychanges' when updating bookmark in histedit Boris Feld <boris.feld@octobus.net> parents: 33446 diff changeset	2542 marks.applychanges(repo, tr, changes)
33346 7aa5160bdbf5 histedit: move topmost bookmark movement to a separate function Jun Wu <quark@fb.com> parents: 33345 diff changeset	2543
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2544
38549 7b57b1ed5c0f histedit: add --no-backup option (issue5825) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38512 diff changeset	2545 def cleanupnode(ui, repo, nodes, nobackup=False):
31642 c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2546 """strip a group of nodes from the repository
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2547
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2548 The set of node to strip may contains unknown nodes."""
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2549 with repo.lock():
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2550 # do not let filtering get in the way of the cleanse
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2551 # we should probably get rid of obsolescence marker created during the
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2552 # histedit, but we currently do not have such information.
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2553 repo = repo.unfiltered()
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2554 # Find all nodes that need to be stripped
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2555 # (we use %lr instead of %ln to silently ignore unknown items)
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2556 nm = repo.changelog.nodemap
c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2557 nodes = sorted(n for n in nodes if n in nm)
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2558 roots = [c.node() for c in repo.set(b"roots(%ln)", nodes)]
33349 28f75a1695fb histedit: pass multiple nodes to strip (BC) Jun Wu <quark@fb.com> parents: 33348 diff changeset	2559 if roots:
38549 7b57b1ed5c0f histedit: add --no-backup option (issue5825) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38512 diff changeset	2560 backup = not nobackup
7b57b1ed5c0f histedit: add --no-backup option (issue5825) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 38512 diff changeset	2561 repair.strip(ui, repo, roots, backup=backup)
31642 c4dd1e7c1dab histedit: backout changeset 2b599f5468a4 Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 31534 diff changeset	2562
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2563
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	2564 def stripwrapper(orig, ui, repo, nodelist, args, *kwargs):
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	2565 if isinstance(nodelist, str):
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	2566 nodelist = [nodelist]
38826 28d8b5f49b4d histedit: avoid repeating name of state file in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	2567 state = histeditstate(repo)
28d8b5f49b4d histedit: avoid repeating name of state file in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	2568 if state.inprogress():
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	2569 state.read()
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2570 histedit_nodes = {
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2571 action.node for action in state.actions if action.node
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2572 }
30027 4d9999e43ff7 histedit: avoid converting nodeid to context and back again Martin von Zweigbergk <martinvonz@google.com> parents: 29974 diff changeset	2573 common_nodes = histedit_nodes & set(nodelist)
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	2574 if common_nodes:
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2575 raise error.Abort(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2576 _(b"histedit in progress, can't strip %s")
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2577 % b', '.join(node.short(x) for x in common_nodes)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2578 )
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	2579 return orig(ui, repo, nodelist, args, *kwargs)
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	2580
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2581
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2582 extensions.wrapfunction(repair, b'strip', stripwrapper)
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	2583
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2584
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	2585 def summaryhook(ui, repo):
38826 28d8b5f49b4d histedit: avoid repeating name of state file in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	2586 state = histeditstate(repo)
28d8b5f49b4d histedit: avoid repeating name of state file in a few places Martin von Zweigbergk <martinvonz@google.com> parents: 38823 diff changeset	2587 if not state.inprogress():
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	2588 return
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	2589 state.read()
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	2590 if state.actions:
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	2591 # i18n: column positioning for "hg summary"
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2592 ui.write(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2593 _(b'hist: %s (histedit --continue)\n')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2594 % (
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2595 ui.label(_(b'%d remaining'), b'histedit.remaining')
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2596 % len(state.actions)
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2597 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2598 )
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2599
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	2600
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	2601 def extsetup(ui):
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2602 cmdutil.summaryhooks.add(b'histedit', summaryhook)
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2603 statemod.addunfinished(
43077 687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2604 b'histedit',
687b865b95ad formatting: byteify all mercurial/ and hgext/ string literals Augie Fackler <augie@google.com> parents: 43076 diff changeset	2605 fname=b'histedit-state',
43076 2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2606 allowcommit=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2607 continueflag=True,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2608 abortfunc=hgaborthistedit,
2372284d9457 formatting: blacken the codebase Augie Fackler <augie@google.com> parents: 42981 diff changeset	2609 )

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/histedit.py @ 43077:687b865b95ad