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

annotate hgext/histedit.py @ 27085:d50ff8f4891f

histedit: add an experimental base action This is a first (very simple) version of the histedit base action. It works well in common usecases like rebasing the whole stack and spliting the stack. I don't see any obvious edge cases - but probably there is more than one. That's why I want to keep it behind experimental.histeditng config knob for now. I think on knob for all new histedit behaviors is better because we will test all of them together and testers will need to turn it on only once to get all new nice things.

author	Mateusz Kwapich <mitrandir@fb.com>
date	Tue, 17 Nov 2015 15:04:31 -0800
parents	383f10b67fd6
children	5f5c7d9f4a08

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
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	39 # r, roll = like fold, but discard this commit's description
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
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	42 #
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 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	45 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	46 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	47 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	48
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	49 pick 030b686bedc4 Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	50 pick c561b4e977df Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	51 fold 7c2fd3b9020c Add delta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	52
18322 e819c12a8bd0 histedit: correct changeset IDs in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17771 diff changeset	53 # Edit history between c561b4e977df and 7c2fd3b9020c
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	54 #
20503 23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	55 # 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	56 #
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	57 # Commands:
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	58 # p, pick = use commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	59 # e, edit = use commit, but stop for amending
20511 5840da876235 histedit: shorten new fold message Matt Mackall <mpm@selenic.com> parents: 20503 diff changeset	60 # f, fold = use commit, but combine it with the one above
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	61 # r, roll = like fold, but discard this commit's description
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	62 # d, drop = remove commit from history
26100 5706d130ec16 histedit: improve discoverability of edit commit message timeless@mozdev.org parents: 26098 diff changeset	63 # m, mess = edit commit message without changing commit content
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	64 #
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	65
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	66 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	67 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	68 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	69
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	70 Add beta
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 delta
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	73
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	74 Edit the commit message to your liking, then close the editor. For
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	75 this example, let's assume that the commit message was changed to
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	76 ``Add beta and delta.`` After histedit has run and had a chance to
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	77 remove any old or temporary revisions it needed, the history looks
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	78 like this::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	79
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	80 @ 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	81 \| Add beta and delta.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	82 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	83 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	84 \| Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	85 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	86 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	87 Add alpha
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	88
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	89 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	90 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	91 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	92 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	93 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	94 revisions by passing the ``--keep`` flag.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	95
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	96 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	97 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	98 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	99 uncommitted changes will be committed as well. When done, run ``hg
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	100 histedit --continue`` to finish this step. You'll be prompted for a
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	101 new commit message, but the default commit message will be the
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	102 original message for the ``edit`` ed revision.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	103
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	104 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	105 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	106 ``edit`` immediately followed by `hg histedit --continue``.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	107
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	108 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	109 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	110 ``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	111 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	112 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	113 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	114 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	115 history.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	116
18323 7648b87e76db histedit: correct the number of added revisions in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18322 diff changeset	117 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	118 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	119
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	120 @ 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	121 \| Add theta
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 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	124 \| Add eta
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 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	127 \| Add zeta
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 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	130 \| Add epsilon
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 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	133 \| Add beta and delta.
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 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	136 \| Add gamma
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 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	139 Add alpha
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 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	142 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	143 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	144 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	145
4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	146 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	147 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	148 configuration file::
24199 4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	149
24869 95a67d687903 histedit: fix reST syntax problem of example code in help document FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24831 diff changeset	150 [histedit]
95a67d687903 histedit: fix reST syntax problem of example code in help document FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24831 diff changeset	151 linelen = 120 # truncate rule lines at 120 characters
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	152 """
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	153
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	154 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	155 import cPickle as pickle
19284 87bb53367633 histedit: raise ImportError when demandloading is enabled Simon Heimberg <simohe@besonet.ch> parents: 19048 diff changeset	156 pickle.dump # import now
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	157 except ImportError:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	158 import pickle
22368 802dffd62de5 histedit: abort gracefully on --continue/--abort with no state Siddharth Agarwal <sid0@fb.com> parents: 22147 diff changeset	159 import errno
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	160 import os
19018 730614b9b352 histedit: allow "-" as a command file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19017 diff changeset	161 import sys
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	162
26798 38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	163 from mercurial import bundle2
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	164 from mercurial import cmdutil
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	165 from mercurial import discovery
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	166 from mercurial import error
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	167 from mercurial import copies
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	168 from mercurial import context
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	169 from mercurial import exchange
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	170 from mercurial import extensions
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	171 from mercurial import hg
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	172 from mercurial import node
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	173 from mercurial import repair
21950 af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 21858 diff changeset	174 from mercurial import scmutil
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	175 from mercurial import util
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	176 from mercurial import obsolete
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	177 from mercurial import merge as mergemod
20071 4778f398ec83 histedit: hold wlock and lock while in progress Siddharth Agarwal <sid0@fb.com> parents: 19972 diff changeset	178 from mercurial.lock import release
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	179 from mercurial.i18n import _
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	180
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	181 cmdtable = {}
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	182 command = cmdutil.command(cmdtable)
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	183
25186 80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	184 # Note for extension authors: ONLY specify testedwith = 'internal' for
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	185 # 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	186 # 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	187 # leave the attribute unspecified.
17069 2b1c78674230 histedit: mark as a first party extension Augie Fackler <raf@durin42.com> parents: 17068 diff changeset	188 testedwith = 'internal'
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	189
17337 474ae9720aa5 histedit, i18n: warn translators about edit command names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 17326 diff changeset	190 # i18n: command names and abbreviations must remain untranslated
17315 f320d7ed912f histedit: make comment part of the file describing rules as translatable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17285 diff changeset	191 editcomment = _("""# Edit history between %s and %s
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	192 #
20503 23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	193 # 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	194 #
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	195 # Commands:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	196 # p, pick = use commit
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	197 # e, edit = use commit, but stop for amending
20511 5840da876235 histedit: shorten new fold message Matt Mackall <mpm@selenic.com> parents: 20503 diff changeset	198 # f, fold = use commit, but combine it with the one above
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	199 # r, roll = like fold, but discard this commit's description
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	200 # d, drop = remove commit from history
26100 5706d130ec16 histedit: improve discoverability of edit commit message timeless@mozdev.org parents: 26098 diff changeset	201 # m, mess = edit commit message without changing commit content
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	202 #
17315 f320d7ed912f histedit: make comment part of the file describing rules as translatable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17285 diff changeset	203 """)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	204
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	205 class histeditstate(object):
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	206 def __init__(self, repo, parentctxnode=None, rules=None, keep=None,
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	207 topmost=None, replacements=None, lock=None, wlock=None):
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	208 self.repo = repo
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	209 self.rules = rules
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	210 self.keep = keep
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	211 self.topmost = topmost
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	212 self.parentctxnode = parentctxnode
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	213 self.lock = lock
e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	214 self.wlock = wlock
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	215 self.backupfile = None
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	216 if replacements is None:
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	217 self.replacements = []
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	218 else:
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	219 self.replacements = replacements
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	220
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	221 def read(self):
22986 7b93b49286d0 histedit: update docstring on histeditstate.read() Augie Fackler <raf@durin42.com> parents: 22985 diff changeset	222 """Load histedit state from disk and set fields appropriately."""
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	223 try:
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	224 fp = self.repo.vfs('histedit-state', 'r')
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25452 diff changeset	225 except IOError as err:
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	226 if err.errno != errno.ENOENT:
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	227 raise
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	228 raise error.Abort(_('no histedit in progress'))
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	229
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	230 try:
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	231 data = pickle.load(fp)
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	232 parentctxnode, rules, keep, topmost, replacements = data
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	233 backupfile = None
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	234 except pickle.UnpicklingError:
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	235 data = self._load()
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	236 parentctxnode, rules, keep, topmost, replacements, backupfile = data
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	237
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	238 self.parentctxnode = parentctxnode
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	239 self.rules = rules
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	240 self.keep = keep
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	241 self.topmost = topmost
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	242 self.replacements = replacements
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	243 self.backupfile = backupfile
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	244
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	245 def write(self):
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	246 fp = self.repo.vfs('histedit-state', 'w')
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	247 fp.write('v1\n')
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	248 fp.write('%s\n' % node.hex(self.parentctxnode))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	249 fp.write('%s\n' % node.hex(self.topmost))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	250 fp.write('%s\n' % self.keep)
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	251 fp.write('%d\n' % len(self.rules))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	252 for rule in self.rules:
24810 f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	253 fp.write('%s\n' % rule[0]) # action
f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	254 fp.write('%s\n' % rule[1]) # remainder
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	255 fp.write('%d\n' % len(self.replacements))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	256 for replacement in self.replacements:
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	257 fp.write('%s%s\n' % (node.hex(replacement[0]), ''.join(node.hex(r)
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	258 for r in replacement[1])))
24958 a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	259 backupfile = self.backupfile
a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	260 if not backupfile:
a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	261 backupfile = ''
a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	262 fp.write('%s\n' % backupfile)
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	263 fp.close()
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	264
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	265 def _load(self):
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	266 fp = self.repo.vfs('histedit-state', 'r')
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	267 lines = [l[:-1] for l in fp.readlines()]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	268
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	269 index = 0
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	270 lines[index] # version number
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	271 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	272
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	273 parentctxnode = node.bin(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	274 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	275
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	276 topmost = node.bin(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	277 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	278
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	279 keep = lines[index] == 'True'
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	280 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	281
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	282 # Rules
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	283 rules = []
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	284 rulelen = int(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	285 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	286 for i in xrange(rulelen):
24810 f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	287 ruleaction = lines[index]
f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	288 index += 1
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	289 rule = lines[index]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	290 index += 1
24810 f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	291 rules.append((ruleaction, rule))
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	292
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	293 # Replacements
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	294 replacements = []
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	295 replacementlen = int(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	296 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	297 for i in xrange(replacementlen):
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	298 replacement = lines[index]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	299 original = node.bin(replacement[:40])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	300 succ = [node.bin(replacement[i:i + 40]) for i in
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	301 range(40, len(replacement), 40)]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	302 replacements.append((original, succ))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	303 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	304
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	305 backupfile = lines[index]
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	306 index += 1
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	307
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	308 fp.close()
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	309
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	310 return parentctxnode, rules, keep, topmost, replacements, backupfile
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	311
22978 d4e764521249 histedit: add clear method to remove state David Soria Parra <davidsp@fb.com> parents: 22977 diff changeset	312 def clear(self):
26583 49b568a4e539 histedit: check presence of statefile before deleting it Christian Delahousse <cdelahousse@fb.com> parents: 26582 diff changeset	313 if self.inprogress():
49b568a4e539 histedit: check presence of statefile before deleting it Christian Delahousse <cdelahousse@fb.com> parents: 26582 diff changeset	314 self.repo.vfs.unlink('histedit-state')
22978 d4e764521249 histedit: add clear method to remove state David Soria Parra <davidsp@fb.com> parents: 22977 diff changeset	315
26582 42b908673866 histedit: add inprogress method to state class Christian Delahousse <cdelahousse@fb.com> parents: 26335 diff changeset	316 def inprogress(self):
42b908673866 histedit: add inprogress method to state class Christian Delahousse <cdelahousse@fb.com> parents: 26335 diff changeset	317 return self.repo.vfs.exists('histedit-state')
42b908673866 histedit: add inprogress method to state class Christian Delahousse <cdelahousse@fb.com> parents: 26335 diff changeset	318
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	319 class histeditaction(object):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	320 def __init__(self, state, node):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	321 self.state = state
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	322 self.repo = state.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	323 self.node = node
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	324
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	325 @classmethod
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	326 def fromrule(cls, state, rule):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	327 """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	328 """
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	329 repo = state.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	330 rulehash = rule.strip().split(' ', 1)[0]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	331 try:
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	332 node = repo[rulehash].node()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	333 except error.RepoError:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	334 raise error.Abort(_('unknown changeset %s listed') % rulehash[:12])
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	335 return cls(state, node)
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	336
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	337 def constraints(self):
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	338 """Return a set of constrains that this action should be verified for
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	339
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	340 Available constraints:
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	341 noduplicates - aborts if there are multiple rules for one node
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	342 noother - abort if the node doesn't belong to edited stack
27083 6d5d7ac41ef4 histedit: add forceother constraint Mateusz Kwapich <mitrandir@fb.com> parents: 27082 diff changeset	343 forceother - abort if the node does belong to edited stack
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	344 """
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	345
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	346 return set(['noduplicates', 'noother'])
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	347
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	348 def nodetoverify(self):
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	349 """Returns a node associated with the action that will be used for
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	350 verification purposes.
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	351
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	352 If the action doesn't correspond to node it should return None
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	353 """
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	354 return self.node
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	355
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	356 def run(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	357 """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	358 rulectx onto the current parentctx."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	359 self.applychange()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	360 self.continuedirty()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	361 return self.continueclean()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	362
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	363 def applychange(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	364 """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	365 parentctx, but does not commit them."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	366 repo = self.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	367 rulectx = repo[self.node]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	368 hg.update(repo, self.state.parentctxnode)
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	369 stats = applychanges(repo.ui, repo, rulectx, {})
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	370 if stats and stats[3] > 0:
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	371 raise error.InterventionRequired(_('Fix up the change and run '
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	372 'hg histedit --continue'))
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	373
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	374 def continuedirty(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	375 """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	376 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	377 repo = self.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	378 rulectx = repo[self.node]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	379
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	380 editor = self.commiteditor()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	381 commit = commitfuncfor(repo, rulectx)
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	382
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	383 commit(text=rulectx.description(), user=rulectx.user(),
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	384 date=rulectx.date(), extra=rulectx.extra(), editor=editor)
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	385
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	386 def commiteditor(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	387 """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	388 return False
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	389
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	390 def continueclean(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	391 """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	392 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	393 rulectx."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	394 ctx = self.repo['.']
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	395 if ctx.node() == self.state.parentctxnode:
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	396 self.repo.ui.warn(_('%s: empty changeset\n') %
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	397 node.short(self.node))
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	398 return ctx, [(self.node, tuple())]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	399 if ctx.node() == self.node:
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	400 # Nothing changed
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	401 return ctx, []
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	402 return ctx, [(self.node, (ctx.node(),))]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	403
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	404 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	405 """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	406
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18609 diff changeset	407 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	408
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18436 diff changeset	409 - 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	410
25450 7e36c3000ead histedit: copyedit docstring wording problem I noticed while here Augie Fackler <augie@google.com> parents: 25412 diff changeset	411 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	412 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	413 """
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	414 phasemin = src.phase()
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	415 def commitfunc(**kwargs):
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	416 phasebackup = repo.ui.backupconfig('phases', 'new-commit')
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	417 try:
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	418 repo.ui.setconfig('phases', 'new-commit', phasemin,
49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	419 'histedit')
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	420 extra = kwargs.get('extra', {}).copy()
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	421 extra['histedit_source'] = src.hex()
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	422 kwargs['extra'] = extra
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	423 return repo.commit(**kwargs)
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	424 finally:
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	425 repo.ui.restoreconfig(phasebackup)
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	426 return commitfunc
b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	427
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	428 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	429 """Merge changeset from ctx (only) in the current working directory"""
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	430 wcpar = repo.dirstate.parents()[0]
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	431 if ctx.p1().node() == wcpar:
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	432 # edits are "in place" we do not need to make any merge,
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	433 # just applies changes on parent for edition
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	434 cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	435 stats = None
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	436 else:
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	437 try:
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	438 # ui.forcemerge is an internal variable, do not document
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	439 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	440 'histedit')
22904 baa3cfa03a83 histedit: use merge.graft Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	441 stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit'])
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	442 finally:
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	443 repo.ui.setconfig('ui', 'forcemerge', '', 'histedit')
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	444 return stats
17407 31c123a2f273 histedit: factored out diff/patch logic Leah Xue <leahxue@fb.com> parents: 17340 diff changeset	445
24828 5045a003260b histedit: fix rollup prompting for a commit message (issue4606) Durham Goode <durham@fb.com> parents: 24810 diff changeset	446 def collapse(repo, first, last, commitopts, skipprompt=False):
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	447 """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	448
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	449 Expected commit options are:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	450 - message
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	451 - date
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	452 - username
17738 b8424c92ba2b spelling: fix minor spell checker issues Mads Kiilerich <mads@kiilerich.com> parents: 17666 diff changeset	453 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	454
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	455 This function works in memory."""
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	456 ctxs = list(repo.set('%d::%d', first, last))
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	457 if not ctxs:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	458 return None
25452 43906060a3f4 histedit: abort rather than edit a public changeset (issue4704) Augie Fackler <augie@google.com> parents: 25450 diff changeset	459 for c in ctxs:
43906060a3f4 histedit: abort rather than edit a public changeset (issue4704) Augie Fackler <augie@google.com> parents: 25450 diff changeset	460 if not c.mutable():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	461 raise error.Abort(
25452 43906060a3f4 histedit: abort rather than edit a public changeset (issue4704) Augie Fackler <augie@google.com> parents: 25450 diff changeset	462 _("cannot fold into public change %s") % node.short(c.node()))
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	463 base = first.parents()[0]
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	464
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	465 # 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	466 # collect all files which might be affected
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	467 files = set()
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	468 for ctx in ctxs:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	469 files.update(ctx.files())
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	470
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	471 # Recompute copies (avoid recording a -> b -> a)
19392 f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19284 diff changeset	472 copied = copies.pathcopies(base, last)
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	473
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	474 # prune files which were reverted by the updates
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	475 def samefile(f):
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	476 if f in last.manifest():
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	477 a = last.filectx(f)
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	478 if f in base.manifest():
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	479 b = base.filectx(f)
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	480 return (a.data() == b.data()
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	481 and a.flags() == b.flags())
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	482 else:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	483 return False
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	484 else:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	485 return f not in base.manifest()
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	486 files = [f for f in files if not samefile(f)]
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	487 # commit version of these files as defined by head
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	488 headmf = last.manifest()
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	489 def filectxfn(repo, ctx, path):
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	490 if path in headmf:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	491 fctx = last[path]
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	492 flags = fctx.flags()
21689 503bb3af70fe memfilectx: call super.__init__ instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 21409 diff changeset	493 mctx = context.memfilectx(repo,
503bb3af70fe memfilectx: call super.__init__ instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 21409 diff changeset	494 fctx.path(), fctx.data(),
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	495 islink='l' in flags,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	496 isexec='x' in flags,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	497 copied=copied.get(path))
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	498 return mctx
22296 650b5b6e75ed convert: use None value for missing files instead of overloading IOError Mads Kiilerich <madski@unity3d.com> parents: 22280 diff changeset	499 return None
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	500
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	501 if commitopts.get('message'):
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	502 message = commitopts['message']
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	503 else:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	504 message = first.description()
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	505 user = commitopts.get('user')
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	506 date = commitopts.get('date')
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18436 diff changeset	507 extra = commitopts.get('extra')
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	508
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	509 parents = (first.p1().node(), first.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	510 editor = None
24828 5045a003260b histedit: fix rollup prompting for a commit message (issue4606) Durham Goode <durham@fb.com> parents: 24810 diff changeset	511 if not skipprompt:
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	512 editor = cmdutil.getcommiteditor(edit=True, editform='histedit.fold')
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	513 new = context.memctx(repo,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	514 parents=parents,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	515 text=message,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	516 files=files,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	517 filectxfn=filectxfn,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	518 user=user,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	519 date=date,
21239 19d98da5c018 histedit: pass "editor" argument to "memctx.__init__()" for "collapse" command FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	520 extra=extra,
22002 a44b7b6f3cd7 histedit: pass 'editform' argument to 'cmdutil.getcommiteditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21950 diff changeset	521 editor=editor)
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	522 return repo.commitctx(new)
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	523
26981 cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	524 def _isdirtywc(repo):
cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	525 return repo[None].dirty(missing=True)
cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	526
27084 383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	527 def abortdirty():
383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	528 raise error.Abort(_('working copy has pending changes'),
383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	529 hint=_('amend, commit, or revert them and run histedit '
383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	530 '--continue, or abort with histedit --abort'))
383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	531
383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	532
24767 477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	533 class pick(histeditaction):
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	534 def run(self):
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	535 rulectx = self.repo[self.node]
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	536 if rulectx.parents()[0].node() == self.state.parentctxnode:
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	537 self.repo.ui.debug('node %s unchanged\n' % node.short(self.node))
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	538 return rulectx, []
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	539
24767 477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	540 return super(pick, self).run()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	541
24770 facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	542 class edit(histeditaction):
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	543 def run(self):
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	544 repo = self.repo
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	545 rulectx = repo[self.node]
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	546 hg.update(repo, self.state.parentctxnode)
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	547 applychanges(repo.ui, repo, rulectx, {})
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	548 raise error.InterventionRequired(
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	549 _('Make changes as needed, you may commit or record as needed '
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	550 'now.\nWhen you are finished, run hg histedit --continue to '
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	551 'resume.'))
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	552
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	553 def commiteditor(self):
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	554 return cmdutil.getcommiteditor(edit=True, editform='histedit.edit')
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	555
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	556 class fold(histeditaction):
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	557 def continuedirty(self):
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	558 repo = self.repo
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	559 rulectx = repo[self.node]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	560
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	561 commit = commitfuncfor(repo, rulectx)
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	562 commit(text='fold-temp-revision %s' % node.short(self.node),
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	563 user=rulectx.user(), date=rulectx.date(),
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	564 extra=rulectx.extra())
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	565
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	566 def continueclean(self):
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	567 repo = self.repo
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	568 ctx = repo['.']
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	569 rulectx = repo[self.node]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	570 parentctxnode = self.state.parentctxnode
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	571 if ctx.node() == parentctxnode:
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	572 repo.ui.warn(_('%s: empty changeset\n') %
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	573 node.short(self.node))
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	574 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	575
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	576 parentctx = repo[parentctxnode]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	577 newcommits = set(c.node() for c in repo.set('(%d::. - %d)', parentctx,
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	578 parentctx))
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	579 if not newcommits:
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	580 repo.ui.warn(_('%s: cannot fold - working copy is not a '
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	581 'descendant of previous commit %s\n') %
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	582 (node.short(self.node), node.short(parentctxnode)))
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	583 return ctx, [(self.node, (ctx.node(),))]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	584
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	585 middlecommits = newcommits.copy()
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	586 middlecommits.discard(ctx.node())
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	587
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	588 return self.finishfold(repo.ui, repo, parentctx, rulectx, ctx.node(),
090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	589 middlecommits)
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	590
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	591 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	592 """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	593
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	594 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	595 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	596 """
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	597 return False
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	598
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	599 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	600 """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	601
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	602 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	603 'fold'.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	604 """
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	605 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	606
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	607 def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	608 parent = ctx.parents()[0].node()
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	609 hg.update(repo, parent)
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	610 ### prepare new commit data
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	611 commitopts = {}
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	612 commitopts['user'] = ctx.user()
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	613 # 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	614 if not self.mergedescs():
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	615 newmessage = ctx.description()
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	616 else:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	617 newmessage = '\n***\n'.join(
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	618 [ctx.description()] +
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	619 [repo[r].description() for r in internalchanges] +
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	620 [oldctx.description()]) + '\n'
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	621 commitopts['message'] = newmessage
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	622 # date
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	623 commitopts['date'] = max(ctx.date(), oldctx.date())
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	624 extra = ctx.extra().copy()
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	625 # histedit_source
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	626 # 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	627 # here. This is sufficient to solve issue3681 anyway.
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	628 extra['histedit_source'] = '%s,%s' % (ctx.hex(), oldctx.hex())
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	629 commitopts['extra'] = extra
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	630 phasebackup = repo.ui.backupconfig('phases', 'new-commit')
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	631 try:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	632 phasemin = max(ctx.phase(), oldctx.phase())
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	633 repo.ui.setconfig('phases', 'new-commit', phasemin, 'histedit')
24828 5045a003260b histedit: fix rollup prompting for a commit message (issue4606) Durham Goode <durham@fb.com> parents: 24810 diff changeset	634 n = collapse(repo, ctx, repo[newnode], commitopts,
5045a003260b histedit: fix rollup prompting for a commit message (issue4606) Durham Goode <durham@fb.com> parents: 24810 diff changeset	635 skipprompt=self.skipprompt())
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	636 finally:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	637 repo.ui.restoreconfig(phasebackup)
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	638 if n is None:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	639 return ctx, []
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	640 hg.update(repo, n)
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	641 replacements = [(oldctx.node(), (newnode,)),
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	642 (ctx.node(), (n,)),
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	643 (newnode, (n,)),
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	644 ]
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	645 for ich in internalchanges:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	646 replacements.append((ich, (n,)))
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	647 return repo[n], replacements
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	648
27085 d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	649 class base(histeditaction):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	650 def constraints(self):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	651 return set(['forceother'])
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	652
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	653 def run(self):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	654 if self.repo['.'].node() != self.node:
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	655 mergemod.update(self.repo, self.node, False, True, False)
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	656 # branchmerge, force, partial)
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	657 return self.continueclean()
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	658
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	659 def continuedirty(self):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	660 abortdirty()
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	661
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	662 def continueclean(self):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	663 basectx = self.repo['.']
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	664 return basectx, []
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	665
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	666 class _multifold(fold):
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	667 """fold subclass used for when multiple folds happen in a row
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	668
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	669 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	670 (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	671 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	672 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	673 commit messages in their editor.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	674 """
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	675 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	676 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	677
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	678 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	679 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	680 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	681
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	682 def skipprompt(self):
090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	683 return True
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	684
24768 342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	685 class drop(histeditaction):
342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	686 def run(self):
342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	687 parentctx = self.repo[self.state.parentctxnode]
342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	688 return parentctx, [(self.node, tuple())]
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	689
24769 e875b94dc94c histedit: convert message action into a class Durham Goode <durham@fb.com> parents: 24768 diff changeset	690 class message(histeditaction):
e875b94dc94c histedit: convert message action into a class Durham Goode <durham@fb.com> parents: 24768 diff changeset	691 def commiteditor(self):
e875b94dc94c histedit: convert message action into a class Durham Goode <durham@fb.com> parents: 24768 diff changeset	692 return cmdutil.getcommiteditor(edit=True, editform='histedit.mess')
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	693
26335 6c93834d7d66 histedit: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26246 diff changeset	694 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	695 """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	696
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	697 Used by initialization code"""
26335 6c93834d7d66 histedit: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26246 diff changeset	698 if opts is None:
6c93834d7d66 histedit: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26246 diff changeset	699 opts = {}
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	700 dest = ui.expandpath(remote or 'default-push', remote or 'default')
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	701 dest, revs = hg.parseurl(dest, None)[:2]
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	702 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	703
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	704 revs, checkout = hg.addbranchrevs(repo, repo, revs, None)
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	705 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	706
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	707 if revs:
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	708 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	709
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	710 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	711 if not outgoing.missing:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	712 raise error.Abort(_('no outgoing ancestors'))
19841 fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	713 roots = list(repo.revs("roots(%ln)", outgoing.missing))
fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	714 if 1 < len(roots):
fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	715 msg = _('there are ambiguous outgoing revisions')
fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	716 hint = _('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	717 raise error.Abort(msg, hint=hint)
19841 fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	718 return repo.lookup(roots[0])
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	719
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	720 actiontable = {'p': pick,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	721 'pick': pick,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	722 'e': edit,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	723 'edit': edit,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	724 'f': fold,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	725 'fold': 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	726 '_multifold': _multifold,
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	727 'r': rollup,
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	728 'roll': rollup,
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	729 'd': drop,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	730 'drop': drop,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	731 'm': message,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	732 'mess': message,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	733 }
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	734
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	735 @command('histedit',
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	736 [('', 'commands', '',
24232 f9e8739018d5 histedit: use better meta-variable names than VALUE in help text Anton Shestakov <engored@ya.ru> parents: 24231 diff changeset	737 _('read history edits from the specified file'), _('FILE')),
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	738 ('c', 'continue', False, _('continue an edit already in progress')),
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	739 ('', 'edit-plan', False, _('edit remaining actions list')),
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	740 ('k', 'keep', False,
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	741 _("don't strip old nodes after edit is complete")),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	742 ('', 'abort', False, _('abort an edit in progress')),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	743 ('o', 'outgoing', False, _('changesets not found in destination')),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	744 ('f', 'force', False,
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	745 _('force outgoing even for unrelated repositories')),
24232 f9e8739018d5 histedit: use better meta-variable names than VALUE in help text Anton Shestakov <engored@ya.ru> parents: 24231 diff changeset	746 ('r', 'rev', [], _('first revision to be edited'), _('REV'))],
19622 3d0ece7523c8 histedit: add description about "histedit --outgoing" to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19621 diff changeset	747 _("ANCESTOR \| --outgoing [URL]"))
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	748 def histedit(ui, repo, freeargs, *opts):
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	749 """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	750
11de0651d3b6 histedit: add description about basic histedit function to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19519 diff changeset	751 This command edits changesets between ANCESTOR and the parent of
11de0651d3b6 histedit: add description about basic histedit function to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19519 diff changeset	752 the working directory.
19622 3d0ece7523c8 histedit: add description about "histedit --outgoing" to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19621 diff changeset	753
3d0ece7523c8 histedit: add description about "histedit --outgoing" to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19621 diff changeset	754 With --outgoing, this edits changesets not found in the
3d0ece7523c8 histedit: add description about "histedit --outgoing" to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19621 diff changeset	755 destination repository. If URL of the destination is omitted, the
3d0ece7523c8 histedit: add description about "histedit --outgoing" to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19621 diff changeset	756 'default-push' (or 'default') path will be used.
19842 1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	757
26096 b237a68bfea3 histedit: fix grammar for help for safety aborts timeless@mozdev.org parents: 26039 diff changeset	758 For safety, this command is also aborted if there are ambiguous
b237a68bfea3 histedit: fix grammar for help for safety aborts timeless@mozdev.org parents: 26039 diff changeset	759 outgoing revisions which may confuse users: for example, if there
b237a68bfea3 histedit: fix grammar for help for safety aborts timeless@mozdev.org parents: 26039 diff changeset	760 are multiple branches containing outgoing revisions.
19842 1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	761
1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	762 Use "min(outgoing() and ::.)" or similar revset specification
1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	763 instead of --outgoing to specify edit target revision exactly in
1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	764 such ambiguous situation. See :hg:`help revsets` for detail about
1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	765 selecting revisions.
19972 1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	766
1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	767 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	768 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	769 conflicts).
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	770 """
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	771 state = histeditstate(repo)
20071 4778f398ec83 histedit: hold wlock and lock while in progress Siddharth Agarwal <sid0@fb.com> parents: 19972 diff changeset	772 try:
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	773 state.wlock = repo.wlock()
e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	774 state.lock = repo.lock()
e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	775 _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	776 finally:
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	777 release(state.lock, state.wlock)
20071 4778f398ec83 histedit: hold wlock and lock while in progress Siddharth Agarwal <sid0@fb.com> parents: 19972 diff changeset	778
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	779 def _histedit(ui, repo, state, freeargs, *opts):
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	780 # TODO only abort if we try and histedit mq patches, not just
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	781 # blanket if mq patches are applied somewhere
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	782 mq = getattr(repo, 'mq', None)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	783 if mq and mq.applied:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	784 raise error.Abort(_('source has mq patches applied'))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	785
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	786 # basic argument incompatibility processing
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	787 outg = opts.get('outgoing')
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	788 cont = opts.get('continue')
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	789 editplan = opts.get('edit_plan')
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	790 abort = opts.get('abort')
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	791 force = opts.get('force')
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	792 rules = opts.get('commands', '')
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	793 revs = opts.get('rev', [])
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	794 goal = 'new' # This invocation goal, in new, continue, abort
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	795 if force and not outg:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	796 raise error.Abort(_('--force only 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	797 if cont:
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 24959 diff changeset	798 if any((outg, abort, revs, freeargs, rules, editplan)):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	799 raise error.Abort(_('no arguments allowed with --continue'))
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	800 goal = 'continue'
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	801 elif abort:
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 24959 diff changeset	802 if any((outg, revs, freeargs, rules, editplan)):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	803 raise error.Abort(_('no arguments allowed with --abort'))
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	804 goal = 'abort'
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	805 elif editplan:
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 24959 diff changeset	806 if any((outg, revs, freeargs)):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	807 raise error.Abort(_('only --commands argument allowed with '
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	808 '--edit-plan'))
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	809 goal = 'edit-plan'
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	810 else:
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	811 if os.path.exists(os.path.join(repo.path, 'histedit-state')):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	812 raise error.Abort(_('history edit already in progress, try '
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	813 '--continue or --abort'))
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	814 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	815 if revs:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	816 raise error.Abort(_('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	817 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	818 raise error.Abort(
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	819 _('only one repo argument allowed with --outgoing'))
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	820 else:
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	821 revs.extend(freeargs)
24009 00d331763442 histedit: allow configuring default behavior Durham Goode <durham@fb.com> parents: 24002 diff changeset	822 if len(revs) == 0:
25824 8e77e8338cae histedit: mark defaultrev option experimental Matt Mackall <mpm@selenic.com> parents: 25809 diff changeset	823 # experimental config: histedit.defaultrev
24009 00d331763442 histedit: allow configuring default behavior Durham Goode <durham@fb.com> parents: 24002 diff changeset	824 histeditdefault = ui.config('histedit', 'defaultrev')
00d331763442 histedit: allow configuring default behavior Durham Goode <durham@fb.com> parents: 24002 diff changeset	825 if histeditdefault:
00d331763442 histedit: allow configuring default behavior Durham Goode <durham@fb.com> parents: 24002 diff changeset	826 revs.append(histeditdefault)
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	827 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	828 raise error.Abort(
19621 11de0651d3b6 histedit: add description about basic histedit function to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19519 diff changeset	829 _('histedit requires exactly one ancestor revision'))
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	830
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	831
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	832 replacements = []
25330 8594d0b3018e histedit: fix keep during --continue Durham Goode <durham@fb.com> parents: 24959 diff changeset	833 state.keep = opts.get('keep', False)
25808 425839c8ec79 histedit: minor refactoring of createmarkers check Laurent Charignon <lcharignon@fb.com> parents: 25660 diff changeset	834 supportsmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	835
29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	836 # rebuild state
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	837 if goal == 'continue':
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	838 state.read()
22980 b3483bc1ec8c histedit: pass state to boostrapcontinue David Soria Parra <davidsp@fb.com> parents: 22979 diff changeset	839 state = bootstrapcontinue(ui, state, opts)
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	840 elif goal == 'edit-plan':
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	841 state.read()
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	842 if not rules:
24920 b5eb01500696 histedit: fix --edit-plan Durham Goode <durham@fb.com> parents: 24869 diff changeset	843 comment = editcomment % (node.short(state.parentctxnode),
b5eb01500696 histedit: fix --edit-plan Durham Goode <durham@fb.com> parents: 24869 diff changeset	844 node.short(state.topmost))
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	845 rules = ruleeditor(repo, ui, state.rules, comment)
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	846 else:
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	847 if rules == '-':
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	848 f = sys.stdin
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	849 else:
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	850 f = open(rules)
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	851 rules = f.read()
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	852 f.close()
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	853 rules = [l for l in (r.strip() for r in rules.splitlines())
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	854 if l and not l.startswith('#')]
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	855 rules = verifyrules(rules, state, [repo[c] for [_a, c] in state.rules])
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	856 state.rules = rules
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	857 state.write()
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	858 return
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	859 elif goal == 'abort':
26584 e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	860 try:
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	861 state.read()
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	862 tmpnodes, leafs = newnodestoabort(state)
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	863 ui.debug('restore wc to old parent %s\n'
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	864 % node.short(state.topmost))
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	865
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	866 # Recover our old commits if necessary
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	867 if not state.topmost in repo and state.backupfile:
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	868 backupfile = repo.join(state.backupfile)
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	869 f = hg.openpath(ui, backupfile)
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	870 gen = exchange.readbundle(ui, f, backupfile)
26798 38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	871 tr = repo.transaction('histedit.abort')
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	872 try:
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	873 if not isinstance(gen, bundle2.unbundle20):
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	874 gen.apply(repo, 'histedit', 'bundle:' + backupfile)
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	875 if isinstance(gen, bundle2.unbundle20):
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	876 bundle2.applybundle(repo, gen, tr,
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	877 source='histedit',
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	878 url='bundle:' + backupfile)
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	879 tr.close()
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	880 finally:
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	881 tr.release()
38dcb85f9370 histedit: properly apply bundle2 backups Pierre-Yves David <pierre-yves.david@fb.com> parents: 26763 diff changeset	882
26584 e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	883 os.remove(backupfile)
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	884
26584 e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	885 # check whether we should update away
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	886 if repo.unfiltered().revs('parents() and (%n or %ln::)',
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	887 state.parentctxnode, leafs \| tmpnodes):
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	888 hg.clean(repo, state.topmost)
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	889 cleanupnode(ui, repo, 'created', tmpnodes)
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	890 cleanupnode(ui, repo, 'temp', leafs)
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	891 except Exception:
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	892 if state.inprogress():
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	893 ui.warn(_('warning: encountered an exception during histedit '
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	894 '--abort; the repository may not have been completely '
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	895 'cleaned up\n'))
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	896 raise
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	897 finally:
e28102403d1b histedit: delete histedit statefile on any exception during abort Christian Delahousse <cdelahousse@fb.com> parents: 26583 diff changeset	898 state.clear()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	899 return
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	900 else:
19479 11664641fbad histedit: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19473 diff changeset	901 cmdutil.checkunfinished(repo)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	902 cmdutil.bailifchanged(repo)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	903
17665 b65533958b85 histedit: rename `tip` to `topmost` Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17664 diff changeset	904 topmost, empty = repo.dirstate.parents()
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	905 if outg:
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	906 if freeargs:
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	907 remote = freeargs[0]
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	908 else:
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	909 remote = None
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	910 root = findoutgoing(ui, repo, remote, force, opts)
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	911 else:
21950 af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 21858 diff changeset	912 rr = list(repo.set('roots(%ld)', scmutil.revrange(repo, revs)))
af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 21858 diff changeset	913 if len(rr) != 1:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	914 raise error.Abort(_('The specified revisions must have '
20806 d66862b87ae6 histedit: select the lowest rev when looking for a root in a revset (bc) David Soria Parra <davidsp@fb.com> parents: 20790 diff changeset	915 'exactly one common root'))
21950 af44c7a1e55e histedit: respect revsetalias entries (issue4311) Augie Fackler <raf@durin42.com> parents: 21858 diff changeset	916 root = rr[0].node()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	917
25330 8594d0b3018e histedit: fix keep during --continue Durham Goode <durham@fb.com> parents: 24959 diff changeset	918 revs = between(repo, root, topmost, state.keep)
17766 d9da327516f8 histedit: clean abort when there is nothing to edit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17765 diff changeset	919 if not revs:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	920 raise error.Abort(_('%s is not an ancestor of working directory') %
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	921 node.short(root))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	922
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	923 ctxs = [repo[r] for r in revs]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	924 if not rules:
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	925 comment = editcomment % (node.short(root), node.short(topmost))
be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	926 rules = ruleeditor(repo, ui, [['pick', c] for c in ctxs], comment)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	927 else:
19018 730614b9b352 histedit: allow "-" as a command file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19017 diff changeset	928 if rules == '-':
730614b9b352 histedit: allow "-" as a command file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19017 diff changeset	929 f = sys.stdin
730614b9b352 histedit: allow "-" as a command file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19017 diff changeset	930 else:
730614b9b352 histedit: allow "-" as a command file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19017 diff changeset	931 f = open(rules)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	932 rules = f.read()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	933 f.close()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	934 rules = [l for l in (r.strip() for r in rules.splitlines())
22280 7eef5a87ce3f histedit: use str.startswith to check for comments in action list Mike Edgar <adgar@google.com> parents: 22279 diff changeset	935 if l and not l.startswith('#')]
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	936 rules = verifyrules(rules, state, ctxs)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	937
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	938 parentctxnode = repo[root].parents()[0].node()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	939
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	940 state.parentctxnode = parentctxnode
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	941 state.rules = rules
e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	942 state.topmost = topmost
e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	943 state.replacements = replacements
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	944
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	945 # Create a backup so we can always abort completely.
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	946 backupfile = None
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	947 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	948 backupfile = repair._bundle(repo, [parentctxnode], [topmost], root,
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	949 'histedit')
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	950 state.backupfile = backupfile
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	951
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	952 # 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	953 # and only show one editor
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	954 rules = state.rules[:]
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	955 for idx, ((action, ha), (nextact, unused)) in enumerate(
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	956 zip(rules, rules[1:] + [(None, None)])):
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	957 if action == 'fold' and nextact == 'fold':
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	958 state.rules[idx] = '_multifold', ha
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	959
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	960 while state.rules:
29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	961 state.write()
29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	962 action, ha = state.rules.pop(0)
24002 96d130697f07 histedit: store full node hash in rules Mateusz Kwapich <mitrandir@fb.com> parents: 22987 diff changeset	963 ui.debug('histedit: processing %s %s\n' % (action, ha[:12]))
24774 a9d63d87b837 histedit: delete all non-actionclass related code Durham Goode <durham@fb.com> parents: 24773 diff changeset	964 actobj = actiontable[action].fromrule(state, ha)
a9d63d87b837 histedit: delete all non-actionclass related code Durham Goode <durham@fb.com> parents: 24773 diff changeset	965 parentctx, replacement_ = actobj.run()
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	966 state.parentctxnode = parentctx.node()
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	967 state.replacements.extend(replacement_)
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	968 state.write()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	969
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	970 hg.update(repo, state.parentctxnode)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	971
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	972 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	973 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	974 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	975 if not 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	976 ui.debug('histedit: %s is dropped\n' % node.short(prec))
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	977 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	978 ui.debug('histedit: %s is replaced by %s\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	979 node.short(prec), node.short(succs[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	980 if len(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	981 m = 'histedit: %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	982 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	983 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	984
26763 50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	985 if supportsmarkers:
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	986 # Only create markers if the temp nodes weren't already removed.
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	987 obsolete.createmarkers(repo, ((repo[t],()) for t in sorted(tmpnodes)
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	988 if t in repo))
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	989 else:
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	990 cleanupnode(ui, repo, 'temp', tmpnodes)
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	991
25330 8594d0b3018e histedit: fix keep during --continue Durham Goode <durham@fb.com> parents: 24959 diff changeset	992 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	993 if mapping:
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	994 movebookmarks(ui, repo, mapping, 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	995 # TODO update mq state
25808 425839c8ec79 histedit: minor refactoring of createmarkers check Laurent Charignon <lcharignon@fb.com> parents: 25660 diff changeset	996 if supportsmarkers:
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	997 markers = []
17771 dcfa526b180b histedit: create obsolescence markers in deterministic order Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17769 diff changeset	998 # sort by revision number because it sound "right"
dcfa526b180b histedit: create obsolescence markers in deterministic order Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17769 diff changeset	999 for prec in sorted(mapping, key=repo.changelog.rev):
dcfa526b180b histedit: create obsolescence markers in deterministic order Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17769 diff changeset	1000 succs = mapping[prec]
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1001 markers.append((repo[prec],
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1002 tuple(repo[s] for s in succs)))
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1003 if markers:
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1004 obsolete.createmarkers(repo, markers)
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1005 else:
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1006 cleanupnode(ui, repo, 'replaced', mapping)
25894 54f9561088c7 histedit: backout ebb5bb9bc32e Pierre-Yves David <pierre-yves.david@fb.com> parents: 25824 diff changeset	1007
22978 d4e764521249 histedit: add clear method to remove state David Soria Parra <davidsp@fb.com> parents: 22977 diff changeset	1008 state.clear()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1009 if os.path.exists(repo.sjoin('undo')):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1010 os.unlink(repo.sjoin('undo'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1011
24774 a9d63d87b837 histedit: delete all non-actionclass related code Durham Goode <durham@fb.com> parents: 24773 diff changeset	1012 def bootstrapcontinue(ui, state, opts):
a9d63d87b837 histedit: delete all non-actionclass related code Durham Goode <durham@fb.com> parents: 24773 diff changeset	1013 repo = state.repo
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1014 if state.rules:
3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1015 action, currentnode = state.rules.pop(0)
20648 0838bd2f600f histedit: move logic for finding child nodes to new function Olle Lundberg <geek@nerd.sh> parents: 20647 diff changeset	1016
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1017 actobj = actiontable[action].fromrule(state, currentnode)
3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1018
26981 cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	1019 if _isdirtywc(repo):
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1020 actobj.continuedirty()
26981 cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	1021 if _isdirtywc(repo):
27084 383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	1022 abortdirty()
24766 cfb8f5e3ca49 histedit: integrate action class into flow Durham Goode <durham@fb.com> parents: 24765 diff changeset	1023
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1024 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	1025
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1026 state.parentctxnode = parentctx.node()
3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1027 state.replacements.extend(replacements)
22980 b3483bc1ec8c histedit: pass state to boostrapcontinue David Soria Parra <davidsp@fb.com> parents: 22979 diff changeset	1028
b3483bc1ec8c histedit: pass state to boostrapcontinue David Soria Parra <davidsp@fb.com> parents: 22979 diff changeset	1029 return state
17666 5b6c8f2fbda5 histedit: move `continue` logic into a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17665 diff changeset	1030
17642 bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	1031 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	1032 """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	1033
bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	1034 When keep is false, the specified set can't have children."""
17765 ef7760f0be87 histedit: rename `revs` in `ctxs` inside the `between` function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17762 diff changeset	1035 ctxs = list(repo.set('%n::%n', old, new))
17766 d9da327516f8 histedit: clean abort when there is nothing to edit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17765 diff changeset	1036 if ctxs and not keep:
22952 8792ac090e3b obsolete: add allowunstable option Durham Goode <durham@fb.com> parents: 22951 diff changeset	1037 if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and
18270 48deb483a8f8 clfilter: drop unnecessary explicit filtering on histedit Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18165 diff changeset	1038 repo.revs('(%ld::) - (%ld)', ctxs, ctxs)):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1039 raise error.Abort(_('cannot edit history that would orphan nodes'))
19473 10a0ae668fe6 histedit: refuse to edit history that contains merges (issue3962) Augie Fackler <raf@durin42.com> parents: 19393 diff changeset	1040 if repo.revs('(%ld) and merge()', ctxs):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1041 raise error.Abort(_('cannot edit history that contains merges'))
17767 a787e46d3b94 histedit: do not use "min" on ctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17766 diff changeset	1042 root = ctxs[0] # list is already sorted by repo.set
22416 810d37485e85 histedit: check mutability of contexts correctly Augie Fackler <raf@durin42.com> parents: 22405 diff changeset	1043 if not root.mutable():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1044 raise error.Abort(_('cannot edit public changeset: %s') % root,
25412 443d4635e630 phases: add `hg help phases` hint to failures to edit public commits Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 25411 diff changeset	1045 hint=_('see "hg help phases" for details'))
17765 ef7760f0be87 histedit: rename `revs` in `ctxs` inside the `between` function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17762 diff changeset	1046 return [c.node() for c in ctxs]
17642 bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	1047
24141 671da7d34804 histedit: generalize makedesc Mateusz Kwapich <mitrandir@fb.com> parents: 24140 diff changeset	1048 def makedesc(repo, action, rev):
671da7d34804 histedit: generalize makedesc Mateusz Kwapich <mitrandir@fb.com> parents: 24140 diff changeset	1049 """build a initial action line for a ctx
17643 64e0f0cfb569 histedit: move makedesc function near other rules related function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17642 diff changeset	1050
64e0f0cfb569 histedit: move makedesc function near other rules related function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17642 diff changeset	1051 line are in the form:
64e0f0cfb569 histedit: move makedesc function near other rules related function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17642 diff changeset	1052
24141 671da7d34804 histedit: generalize makedesc Mateusz Kwapich <mitrandir@fb.com> parents: 24140 diff changeset	1053 <action> <hash> <rev> <summary>
17643 64e0f0cfb569 histedit: move makedesc function near other rules related function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17642 diff changeset	1054 """
24141 671da7d34804 histedit: generalize makedesc Mateusz Kwapich <mitrandir@fb.com> parents: 24140 diff changeset	1055 ctx = repo[rev]
17643 64e0f0cfb569 histedit: move makedesc function near other rules related function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17642 diff changeset	1056 summary = ''
24141 671da7d34804 histedit: generalize makedesc Mateusz Kwapich <mitrandir@fb.com> parents: 24140 diff changeset	1057 if ctx.description():
671da7d34804 histedit: generalize makedesc Mateusz Kwapich <mitrandir@fb.com> parents: 24140 diff changeset	1058 summary = ctx.description().splitlines()[0]
671da7d34804 histedit: generalize makedesc Mateusz Kwapich <mitrandir@fb.com> parents: 24140 diff changeset	1059 line = '%s %s %d %s' % (action, ctx, ctx.rev(), summary)
21858 50fd3a36d166 histedit: use 'util.ellipsis' to trim description of each changesets FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21689 diff changeset	1060 # trim to 80 columns so it's not stupidly wide in my editor
24199 4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	1061 maxlen = repo.ui.configint('histedit', 'linelen', default=80)
4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	1062 maxlen = max(maxlen, 22) # avoid truncating hash
4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	1063 return util.ellipsis(line, maxlen)
17643 64e0f0cfb569 histedit: move makedesc function near other rules related function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17642 diff changeset	1064
24140 5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1065 def ruleeditor(repo, ui, rules, editcomment=""):
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1066 """open an editor to edit rules
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1067
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1068 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	1069 """
24141 671da7d34804 histedit: generalize makedesc Mateusz Kwapich <mitrandir@fb.com> parents: 24140 diff changeset	1070 rules = '\n'.join([makedesc(repo, act, rev) for [act, rev] in rules])
24140 5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1071 rules += '\n\n'
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1072 rules += editcomment
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1073 rules = ui.edit(rules, ui.username())
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1074
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1075 # 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	1076 # the user needs to ask for help after something
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1077 # surprising happens.
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1078 f = open(repo.join('histedit-last-edit.txt'), 'w')
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1079 f.write(rules)
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1080 f.close()
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1081
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1082 return rules
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1083
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1084 def verifyrules(rules, state, ctxs):
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1085 """Verify that there exists exactly one edit rule per given changeset.
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1086
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1087 Will abort if there are to many or too few rules, a malformed rule,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1088 or a rule on a changeset outside of the user-given range.
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1089 """
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1090 known_constraints = ['noother', 'noduplicates']
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1091 parsed = []
24002 96d130697f07 histedit: store full node hash in rules Mateusz Kwapich <mitrandir@fb.com> parents: 22987 diff changeset	1092 expected = set(c.hex() for c in ctxs)
19047 81de87f8b480 histedit: protect against duplicated entries Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19046 diff changeset	1093 seen = set()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1094 for r in rules:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1095 if ' ' not in r:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1096 raise error.Abort(_('malformed line "%s"') % r)
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1097 verb, rest = r.split(' ', 1)
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1098
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1099 if verb not in actiontable or verb.startswith('_'):
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1100 raise error.Abort(_('unknown action "%s"') % verb)
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1101 action = actiontable[verb].fromrule(state, rest)
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1102 constraints = action.constraints()
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1103 for constraint in constraints:
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1104 if constraint not in known_constraints:
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1105 error.Abort(_('unknown constraint "%s"') % constraint)
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1106
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1107 nodetoverify = action.nodetoverify()
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1108 if nodetoverify is not None:
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1109 ha = node.hex(nodetoverify)
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1110 if 'noother' in constraints and ha not in expected:
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1111 raise error.Abort(
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1112 _('may not use "%s" with changesets '
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1113 'other than the ones listed') % verb)
27083 6d5d7ac41ef4 histedit: add forceother constraint Mateusz Kwapich <mitrandir@fb.com> parents: 27082 diff changeset	1114 if 'forceother' in constraints and ha in expected:
6d5d7ac41ef4 histedit: add forceother constraint Mateusz Kwapich <mitrandir@fb.com> parents: 27082 diff changeset	1115 raise error.Abort(
6d5d7ac41ef4 histedit: add forceother constraint Mateusz Kwapich <mitrandir@fb.com> parents: 27082 diff changeset	1116 _('may not use "%s" with changesets '
6d5d7ac41ef4 histedit: add forceother constraint Mateusz Kwapich <mitrandir@fb.com> parents: 27082 diff changeset	1117 'within the edited list') % verb)
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1118 if 'noduplicates' in constraints and ha in seen:
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1119 raise error.Abort(_('duplicated command for changeset %s') %
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1120 ha[:12])
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1121 seen.add(ha)
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1122 rest = ha
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1123 parsed.append([verb, rest])
19048 1163ff06ce89 histedit: more precise user message when changeset is missing Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19047 diff changeset	1124 missing = sorted(expected - seen) # sort to stabilize output
1163ff06ce89 histedit: more precise user message when changeset is missing Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19047 diff changeset	1125 if missing:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1126 raise error.Abort(_('missing rules for changeset %s') %
24002 96d130697f07 histedit: store full node hash in rules Mateusz Kwapich <mitrandir@fb.com> parents: 22987 diff changeset	1127 missing[0][:12],
96d130697f07 histedit: store full node hash in rules Mateusz Kwapich <mitrandir@fb.com> parents: 22987 diff changeset	1128 hint=_('do you want to use the drop action?'))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1129 return parsed
17663 c6de8c696644 histedit: extract bookmark logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17662 diff changeset	1130
25898 4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1131 def newnodestoabort(state):
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1132 """process the list of replacements to return
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1133
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1134 1) the list of final node
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1135 2) the list of temporary node
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1136
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1137 This meant to be used on abort as less data are required in this case.
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1138 """
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1139 replacements = state.replacements
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1140 allsuccs = set()
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1141 replaced = set()
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1142 for rep in replacements:
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1143 allsuccs.update(rep[1])
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1144 replaced.add(rep[0])
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1145 newnodes = allsuccs - replaced
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1146 tmpnodes = allsuccs & replaced
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1147 return newnodes, tmpnodes
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1148
4dcc9b5d786a histedit: extract a simpler function to process replacement on abort Pierre-Yves David <pierre-yves.david@fb.com> parents: 25894 diff changeset	1149
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	1150 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	1151 """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	1152
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1153 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	1154 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	1155 3) the list of new commit created by histedit"""
22981 aa1ad9594dde histedit: pass state to processreplacement David Soria Parra <davidsp@fb.com> parents: 22980 diff changeset	1156 replacements = 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	1157 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	1158 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	1159 fullmapping = {}
26039 84dcc37b1272 histedit: correct spelling etc in more comments Augie Fackler <augie@google.com> parents: 26038 diff changeset	1160 # initialize basic set
84dcc37b1272 histedit: correct spelling etc in more comments Augie Fackler <augie@google.com> parents: 26038 diff changeset	1161 # 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	1162 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	1163 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	1164 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	1165 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	1166 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	1167 tmpnodes = allsuccs & replaced
26039 84dcc37b1272 histedit: correct spelling etc in more comments Augie Fackler <augie@google.com> parents: 26038 diff changeset	1168 # 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	1169 # 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	1170 # 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	1171 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	1172 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	1173 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	1174 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	1175 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	1176 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	1177 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	1178 # 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	1179 # 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	1180 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	1181 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	1182 # 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	1183 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	1184 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	1185 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	1186 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	1187 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	1188 # 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	1189 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	1190 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	1191 # 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	1192 # 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	1193 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	1194 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	1195 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	1196
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	1197 # 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	1198 if new:
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	1199 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	1200 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	1201 # 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	1202 # 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	1203 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	1204 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	1205 # 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	1206 r = state.repo.changelog.rev
0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	1207 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	1208
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1209 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	1210
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	1211 def movebookmarks(ui, repo, mapping, oldtopmost, 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	1212 """Move bookmark from old to newly created node"""
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1213 if not 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	1214 # if nothing got rewritten there is not purpose for this function
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1215 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	1216 moves = []
18370 c605e12dd622 histedit: process bookmarks in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18324 diff changeset	1217 for bk, old in sorted(repo._bookmarks.iteritems()):
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	1218 if old == oldtopmost:
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	1219 # special case ensure bookmark stay on tip.
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	1220 #
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1221 # This is arguably a feature and we may only want that for the
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1222 # active bookmark. But the behavior is kept compatible with the old
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1223 # version for 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	1224 moves.append((bk, 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	1225 continue
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1226 base = old
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1227 new = mapping.get(base, 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	1228 if new is 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	1229 continue
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1230 while not new:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1231 # base is killed, trying with parent
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1232 base = repo[base].p1().node()
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1233 new = mapping.get(base, (base,))
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1234 # nothing to move
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1235 moves.append((bk, new[-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	1236 if moves:
27051 1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1237 lock = tr = None
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1238 try:
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1239 lock = repo.lock()
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1240 tr = repo.transaction('histedit')
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1241 marks = repo._bookmarks
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1242 for mark, new in moves:
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1243 old = marks[mark]
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1244 ui.note(_('histedit: moving bookmarks %s from %s to %s\n')
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1245 % (mark, node.short(old), node.short(new)))
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1246 marks[mark] = new
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1247 marks.recordchange(tr)
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1248 tr.close()
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1249 finally:
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1250 release(tr, lock)
17664 4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1251
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1252 def cleanupnode(ui, repo, name, nodes):
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1253 """strip a group of nodes from the repository
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1254
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1255 The set of node to strip may contains unknown nodes."""
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1256 ui.debug('should strip %s nodes %s\n' %
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1257 (name, ', '.join([node.short(n) for n in nodes])))
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1258 lock = None
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1259 try:
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1260 lock = repo.lock()
25906 5d0e1e95e30f histedit: make cleanupnode more robust Pierre-Yves David <pierre-yves.david@fb.com> parents: 25898 diff changeset	1261 # do not let filtering get in the way of the cleanse
26203 b764f3c61bc7 histedit: fix grammar in cleanupnode comment timeless@mozdev.org parents: 26171 diff changeset	1262 # we should probably get rid of obsolescence marker created during the
25906 5d0e1e95e30f histedit: make cleanupnode more robust Pierre-Yves David <pierre-yves.david@fb.com> parents: 25898 diff changeset	1263 # histedit, but we currently do not have such information.
5d0e1e95e30f histedit: make cleanupnode more robust Pierre-Yves David <pierre-yves.david@fb.com> parents: 25898 diff changeset	1264 repo = repo.unfiltered()
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	1265 # Find all nodes that need to be stripped
49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	1266 # (we use %lr instead of %ln to silently ignore unknown items)
17664 4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1267 nm = repo.changelog.nodemap
22873 9fe8e1e80841 histedit: stabilise the order nodes that are stripped Pierre-Yves David <pierre-yves.david@fb.com> parents: 22416 diff changeset	1268 nodes = sorted(n for n in nodes if n in nm)
17664 4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1269 roots = [c.node() for c in repo.set("roots(%ln)", nodes)]
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1270 for c in roots:
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1271 # We should process node in reverse order to strip tip most first.
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1272 # but this trigger a bug in changegroup hook.
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1273 # This would reduce bundle overhead
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1274 repair.strip(ui, repo, c)
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1275 finally:
20647 70d02abff434 histedit: clean up lock imports Olle Lundberg <geek@nerd.sh> parents: 20511 diff changeset	1276 release(lock)
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1277
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1278 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	1279 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	1280 nodelist = [nodelist]
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1281 if os.path.exists(os.path.join(repo.path, 'histedit-state')):
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1282 state = histeditstate(repo)
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1283 state.read()
24626 e767f5aba810 histedit: fix preventing strips during histedit Durham Goode <durham@fb.com> parents: 24267 diff changeset	1284 histedit_nodes = set([repo[rulehash].node() for (action, rulehash)
e767f5aba810 histedit: fix preventing strips during histedit Durham Goode <durham@fb.com> parents: 24267 diff changeset	1285 in state.rules if rulehash in repo])
e767f5aba810 histedit: fix preventing strips during histedit Durham Goode <durham@fb.com> parents: 24267 diff changeset	1286 strip_nodes = set([repo[n].node() for n in 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	1287 common_nodes = histedit_nodes & strip_nodes
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1288 if common_nodes:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1289 raise error.Abort(_("histedit in progress, can't strip %s")
24196 c3d13202144d histedit: fix style of new error message Matt Mackall <mpm@selenic.com> parents: 24142 diff changeset	1290 % ', '.join(node.short(x) for x in common_nodes))
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1291 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	1292
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1293 extensions.wrapfunction(repair, 'strip', stripwrapper)
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1294
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1295 def summaryhook(ui, repo):
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1296 if not os.path.exists(repo.join('histedit-state')):
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1297 return
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	1298 state = histeditstate(repo)
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	1299 state.read()
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	1300 if state.rules:
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1301 # i18n: column positioning for "hg summary"
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1302 ui.write(_('hist: %s (histedit --continue)\n') %
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1303 (ui.label(_('%d remaining'), 'histedit.remaining') %
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	1304 len(state.rules)))
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1305
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1306 def extsetup(ui):
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1307 cmdutil.summaryhooks.add('histedit', summaryhook)
19479 11664641fbad histedit: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19473 diff changeset	1308 cmdutil.unfinishedstates.append(
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19479 diff changeset	1309 ['histedit-state', False, True, _('histedit in progress'),
19479 11664641fbad histedit: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19473 diff changeset	1310 _("use 'hg histedit --continue' or 'hg histedit --abort'")])
27085 d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	1311 if ui.configbool("experimental", "histeditng"):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	1312 actiontable.update({'b': base, 'base': base})

Mercurial > public > mercurial-scm > hg

annotate hgext/histedit.py @ 27085:d50ff8f4891f