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

annotate hgext/histedit.py @ 17315:f320d7ed912f stable

histedit: make comment part of the file describing rules as translatable "i18n.gettext()" invocation for "editcomment" itself should have little impact for whole initialization cost of histedit, because it is already invoked for initialization of the command table entry. '\n\n' has to be added to the text being edited separately from "editcomment", because leading 'line feed' characters are not exported to "hg.pot" file correctly.

author	FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date	Mon, 30 Jul 2012 03:27:07 +0900
parents	0f6f10d5f7a6
children	23b2ee0f758d

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
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	31 # Edit history between 633536316234 and 7c2fd3b9020c
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	32 #
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	33 # Commands:
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	34 # p, pick = use commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	35 # e, edit = use commit, but stop for amending
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	36 # f, fold = use commit, but fold into previous commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	37 # d, drop = remove commit from history
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	38 # m, mess = edit message without changing commit content
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	39 #
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	40
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	41 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	42 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	43 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	44 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	45
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	46 pick 030b686bedc4 Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	47 pick c561b4e977df Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	48 fold 7c2fd3b9020c Add delta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	49
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	50 # Edit history between 633536316234 and 7c2fd3b9020c
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	51 #
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	52 # Commands:
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	53 # p, pick = use commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	54 # e, edit = use commit, but stop for amending
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	55 # f, fold = use commit, but fold into previous commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	56 # d, drop = remove commit from history
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	57 # m, mess = edit message without changing commit content
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	58 #
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	59
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	60 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	61 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	62 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	63
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	64 Add beta
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 Add delta
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	67
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	68 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	69 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	70 ``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	71 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	72 like this::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	73
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	74 @ 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	75 \| Add beta and delta.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	76 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	77 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	78 \| Add gamma
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 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	81 Add alpha
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 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	84 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	85 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	86 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	87 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	88 revisions by passing the ``--keep`` flag.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	89
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	90 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	91 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	92 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	93 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	94 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	95 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	96 original message for the ``edit`` ed revision.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	97
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	98 The ``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	99 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	100 ``edit`` immediately followed by `hg histedit --continue``.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	101
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	102 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	103 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	104 ``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	105 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	106 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	107 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	108 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	109 history.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	110
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	111 If we clone the example repository above and add three more changes, such that
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	112 we have the following history::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	113
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	114 @ 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	115 \| Add theta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	116 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	117 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	118 \| Add eta
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 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	121 \| Add zeta
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 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	124 \| Add epsilon
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 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	127 \| Add beta and delta.
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 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	130 \| Add gamma
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 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	133 Add alpha
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 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	136 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	137 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	138 repo, you can add a ``--force`` option.
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	139 """
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	140
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	141 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	142 import cPickle as pickle
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	143 except ImportError:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	144 import pickle
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	145 import tempfile
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	146 import os
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	147
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	148 from mercurial import bookmarks
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	149 from mercurial import cmdutil
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	150 from mercurial import discovery
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	151 from mercurial import error
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	152 from mercurial import hg
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	153 from mercurial import node
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	154 from mercurial import patch
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	155 from mercurial import repair
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	156 from mercurial import scmutil
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	157 from mercurial import util
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	158 from mercurial.i18n import _
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	159
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	160 cmdtable = {}
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	161 command = cmdutil.command(cmdtable)
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	162
17069 2b1c78674230 histedit: mark as a first party extension Augie Fackler <raf@durin42.com> parents: 17068 diff changeset	163 testedwith = 'internal'
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	164
17315 f320d7ed912f histedit: make comment part of the file describing rules as translatable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17285 diff changeset	165 editcomment = _("""# Edit history between %s and %s
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	166 #
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	167 # Commands:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	168 # p, pick = use commit
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	169 # e, edit = use commit, but stop for amending
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	170 # f, fold = use commit, but fold into previous commit (combines N and N-1)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	171 # d, drop = remove commit from history
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	172 # m, mess = edit message without changing commit content
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	173 #
17315 f320d7ed912f histedit: make comment part of the file describing rules as translatable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17285 diff changeset	174 """)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	175
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	176 def between(repo, old, new, keep):
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	177 revs = [old]
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	178 current = old
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	179 while current != new:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	180 ctx = repo[current]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	181 if not keep and len(ctx.children()) > 1:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	182 raise util.Abort(_('cannot edit history that would orphan nodes'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	183 if len(ctx.parents()) != 1 and ctx.parents()[1] != node.nullid:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	184 raise util.Abort(_("can't edit history with merges"))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	185 if not ctx.children():
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	186 current = new
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	187 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	188 current = ctx.children()[0].node()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	189 revs.append(current)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	190 if len(repo[current].children()) and not keep:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	191 raise util.Abort(_('cannot edit history that would orphan nodes'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	192 return revs
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	193
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	194
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	195 def pick(ui, repo, ctx, ha, opts):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	196 oldctx = repo[ha]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	197 if oldctx.parents()[0] == ctx:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	198 ui.debug('node %s unchanged\n' % ha)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	199 return oldctx, [], [], []
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	200 hg.update(repo, ctx.node())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	201 fd, patchfile = tempfile.mkstemp(prefix='hg-histedit-')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	202 fp = os.fdopen(fd, 'w')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	203 diffopts = patch.diffopts(ui, opts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	204 diffopts.git = True
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	205 diffopts.ignorews = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	206 diffopts.ignorewsamount = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	207 diffopts.ignoreblanklines = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	208 gen = patch.diff(repo, oldctx.parents()[0].node(), ha, opts=diffopts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	209 for chunk in gen:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	210 fp.write(chunk)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	211 fp.close()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	212 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	213 files = set()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	214 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	215 patch.patch(ui, repo, patchfile, files=files, eolmode=None)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	216 if not files:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	217 ui.warn(_('%s: empty changeset')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	218 % node.hex(ha))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	219 return ctx, [], [], []
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	220 finally:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	221 os.unlink(patchfile)
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	222 except Exception:
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	223 raise util.Abort(_('Fix up the change and run '
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	224 'hg histedit --continue'))
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	225 n = repo.commit(text=oldctx.description(), user=oldctx.user(),
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	226 date=oldctx.date(), extra=oldctx.extra())
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	227 return repo[n], [n], [oldctx.node()], []
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	228
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	229
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	230 def edit(ui, repo, ctx, ha, opts):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	231 oldctx = repo[ha]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	232 hg.update(repo, ctx.node())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	233 fd, patchfile = tempfile.mkstemp(prefix='hg-histedit-')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	234 fp = os.fdopen(fd, 'w')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	235 diffopts = patch.diffopts(ui, opts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	236 diffopts.git = True
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	237 diffopts.ignorews = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	238 diffopts.ignorewsamount = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	239 diffopts.ignoreblanklines = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	240 gen = patch.diff(repo, oldctx.parents()[0].node(), ha, opts=diffopts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	241 for chunk in gen:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	242 fp.write(chunk)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	243 fp.close()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	244 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	245 files = set()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	246 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	247 patch.patch(ui, repo, patchfile, files=files, eolmode=None)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	248 finally:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	249 os.unlink(patchfile)
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	250 except Exception:
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	251 pass
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	252 raise util.Abort(_('Make changes as needed, you may commit or record as '
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	253 'needed now.\nWhen you are finished, run hg'
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	254 ' histedit --continue to resume.'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	255
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	256 def fold(ui, repo, ctx, ha, opts):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	257 oldctx = repo[ha]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	258 hg.update(repo, ctx.node())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	259 fd, patchfile = tempfile.mkstemp(prefix='hg-histedit-')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	260 fp = os.fdopen(fd, 'w')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	261 diffopts = patch.diffopts(ui, opts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	262 diffopts.git = True
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	263 diffopts.ignorews = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	264 diffopts.ignorewsamount = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	265 diffopts.ignoreblanklines = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	266 gen = patch.diff(repo, oldctx.parents()[0].node(), ha, opts=diffopts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	267 for chunk in gen:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	268 fp.write(chunk)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	269 fp.close()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	270 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	271 files = set()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	272 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	273 patch.patch(ui, repo, patchfile, files=files, eolmode=None)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	274 if not files:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	275 ui.warn(_('%s: empty changeset')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	276 % node.hex(ha))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	277 return ctx, [], [], []
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	278 finally:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	279 os.unlink(patchfile)
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	280 except Exception:
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	281 raise util.Abort(_('Fix up the change and run '
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	282 'hg histedit --continue'))
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	283 n = repo.commit(text='fold-temp-revision %s' % ha, user=oldctx.user(),
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	284 date=oldctx.date(), extra=oldctx.extra())
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	285 return finishfold(ui, repo, ctx, oldctx, n, opts, [])
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	286
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	287 def finishfold(ui, repo, ctx, oldctx, newnode, opts, internalchanges):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	288 parent = ctx.parents()[0].node()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	289 hg.update(repo, parent)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	290 fd, patchfile = tempfile.mkstemp(prefix='hg-histedit-')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	291 fp = os.fdopen(fd, 'w')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	292 diffopts = patch.diffopts(ui, opts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	293 diffopts.git = True
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	294 diffopts.ignorews = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	295 diffopts.ignorewsamount = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	296 diffopts.ignoreblanklines = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	297 gen = patch.diff(repo, parent, newnode, opts=diffopts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	298 for chunk in gen:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	299 fp.write(chunk)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	300 fp.close()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	301 files = set()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	302 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	303 patch.patch(ui, repo, patchfile, files=files, eolmode=None)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	304 finally:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	305 os.unlink(patchfile)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	306 newmessage = '\n***\n'.join(
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	307 [ctx.description()] +
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	308 [repo[r].description() for r in internalchanges] +
17241 c2f13180001f histedit: end folding message with an LF Patrick Mezard <patrick@mezard.eu> parents: 17191 diff changeset	309 [oldctx.description()]) + '\n'
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	310 # If the changesets are from the same author, keep it.
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	311 if ctx.user() == oldctx.user():
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	312 username = ctx.user()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	313 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	314 username = ui.username()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	315 newmessage = ui.edit(newmessage, username)
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	316 n = repo.commit(text=newmessage, user=username,
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	317 date=max(ctx.date(), oldctx.date()), extra=oldctx.extra())
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	318 return repo[n], [n], [oldctx.node(), ctx.node()], [newnode]
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	319
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	320 def drop(ui, repo, ctx, ha, opts):
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	321 return ctx, [], [repo[ha].node()], []
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	322
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	323
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	324 def message(ui, repo, ctx, ha, opts):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	325 oldctx = repo[ha]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	326 hg.update(repo, ctx.node())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	327 fd, patchfile = tempfile.mkstemp(prefix='hg-histedit-')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	328 fp = os.fdopen(fd, 'w')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	329 diffopts = patch.diffopts(ui, opts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	330 diffopts.git = True
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	331 diffopts.ignorews = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	332 diffopts.ignorewsamount = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	333 diffopts.ignoreblanklines = False
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	334 gen = patch.diff(repo, oldctx.parents()[0].node(), ha, opts=diffopts)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	335 for chunk in gen:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	336 fp.write(chunk)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	337 fp.close()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	338 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	339 files = set()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	340 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	341 patch.patch(ui, repo, patchfile, files=files, eolmode=None)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	342 finally:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	343 os.unlink(patchfile)
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	344 except Exception:
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	345 raise util.Abort(_('Fix up the change and run '
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	346 'hg histedit --continue'))
17285 0f6f10d5f7a6 histedit: add trailing newline when editing commit messages Mads Kiilerich <mads@kiilerich.com> parents: 17275 diff changeset	347 message = oldctx.description() + '\n'
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	348 message = ui.edit(message, ui.username())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	349 new = repo.commit(text=message, user=oldctx.user(), date=oldctx.date(),
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	350 extra=oldctx.extra())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	351 newctx = repo[new]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	352 if oldctx.node() != newctx.node():
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	353 return newctx, [new], [oldctx.node()], []
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	354 # We didn't make an edit, so just indicate no replaced nodes
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	355 return newctx, [new], [], []
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	356
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	357
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	358 def makedesc(c):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	359 summary = ''
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	360 if c.description():
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	361 summary = c.description().splitlines()[0]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	362 line = 'pick %s %d %s' % (c.hex()[:12], c.rev(), summary)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	363 return line[:80] # trim to 80 chars so it's not stupidly wide in my editor
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	364
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	365 actiontable = {'p': pick,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	366 'pick': pick,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	367 'e': edit,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	368 'edit': edit,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	369 'f': fold,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	370 'fold': fold,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	371 'd': drop,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	372 'drop': drop,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	373 'm': message,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	374 'mess': message,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	375 }
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	376
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	377 @command('histedit',
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	378 [('', 'commands', '',
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	379 _('Read history edits from the specified file.')),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	380 ('c', 'continue', False, _('continue an edit already in progress')),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	381 ('k', 'keep', False,
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	382 _("don't strip old nodes after edit is complete")),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	383 ('', 'abort', False, _('abort an edit in progress')),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	384 ('o', 'outgoing', False, _('changesets not found in destination')),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	385 ('f', 'force', False,
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	386 _('force outgoing even for unrelated repositories')),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	387 ('r', 'rev', [], _('first revision to be edited'))],
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	388 _("[PARENT]"))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	389 def histedit(ui, repo, parent, *opts):
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	390 """interactively edit changeset history
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	391 """
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	392 # 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	393 # blanket if mq patches are applied somewhere
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	394 mq = getattr(repo, 'mq', None)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	395 if mq and mq.applied:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	396 raise util.Abort(_('source has mq patches applied'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	397
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	398 parent = list(parent) + opts.get('rev', [])
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	399 if opts.get('outgoing'):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	400 if len(parent) > 1:
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	401 raise util.Abort(
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	402 _('only one repo argument allowed with --outgoing'))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	403 elif parent:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	404 parent = parent[0]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	405
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	406 dest = ui.expandpath(parent or 'default-push', parent or 'default')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	407 dest, revs = hg.parseurl(dest, None)[:2]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	408 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	409
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	410 revs, checkout = hg.addbranchrevs(repo, repo, revs, None)
17191 5884812686f7 peer: introduce peer methods to prepare for peer classes Sune Foldager <cryo@cyanite.org> parents: 17147 diff changeset	411 other = hg.peer(repo, opts, dest)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	412
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	413 if revs:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	414 revs = [repo.lookup(rev) for rev in revs]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	415
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	416 parent = discovery.findcommonoutgoing(
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	417 repo, other, [], force=opts.get('force')).missing[0:1]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	418 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	419 if opts.get('force'):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	420 raise util.Abort(_('--force only allowed with --outgoing'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	421
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	422 if opts.get('continue', False):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	423 if len(parent) != 0:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	424 raise util.Abort(_('no arguments allowed with --continue'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	425 (parentctxnode, created, replaced,
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	426 tmpnodes, existing, rules, keep, tip, replacemap) = readstate(repo)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	427 currentparent, wantnull = repo.dirstate.parents()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	428 parentctx = repo[parentctxnode]
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	429 # existing is the list of revisions initially considered by
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	430 # histedit. Here we use it to list new changesets, descendants
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	431 # of parentctx without an 'existing' changeset in-between. We
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	432 # also have to exclude 'existing' changesets which were
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	433 # previously dropped.
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	434 descendants = set(c.node() for c in
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	435 repo.set('(%n::) - %n', parentctxnode, parentctxnode))
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	436 existing = set(existing)
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	437 notdropped = set(n for n in existing if n in descendants and
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	438 (n not in replacemap or replacemap[n] in descendants))
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	439 # Discover any nodes the user has added in the interim. We can
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	440 # miss changesets which were dropped and recreated the same.
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	441 newchildren = list(c.node() for c in repo.set(
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	442 'sort(%ln - (%ln or %ln::))', descendants, existing, notdropped))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	443 action, currentnode = rules.pop(0)
17242 336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	444 if action in ('f', 'fold'):
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	445 tmpnodes.extend(newchildren)
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	446 else:
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	447 created.extend(newchildren)
336121088ef1 histedit: fix new nodes computation with --continue (issue3534) Patrick Mezard <patrick@mezard.eu> parents: 17241 diff changeset	448
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	449 m, a, r, d = repo.status()[:4]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	450 oldctx = repo[currentnode]
17285 0f6f10d5f7a6 histedit: add trailing newline when editing commit messages Mads Kiilerich <mads@kiilerich.com> parents: 17275 diff changeset	451 message = oldctx.description() + '\n'
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	452 if action in ('e', 'edit', 'm', 'mess'):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	453 message = ui.edit(message, ui.username())
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	454 elif action in ('f', 'fold'):
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	455 message = 'fold-temp-revision %s' % currentnode
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	456 new = None
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	457 if m or a or r or d:
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	458 new = repo.commit(text=message, user=oldctx.user(),
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	459 date=oldctx.date(), extra=oldctx.extra())
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	460
17130 0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17129 diff changeset	461 # If we're resuming a fold and we have new changes, mark the
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17129 diff changeset	462 # replacements and finish the fold. If not, it's more like a
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17129 diff changeset	463 # drop of the changesets that disappeared, and we can skip
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17129 diff changeset	464 # this step.
0a48f3d54543 histedit: don't crash if the result of fixing up a fold is empty Augie Fackler <raf@durin42.com> parents: 17129 diff changeset	465 if action in ('f', 'fold') and (new or newchildren):
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	466 if new:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	467 tmpnodes.append(new)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	468 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	469 new = newchildren[-1]
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	470 (parentctx, created_, replaced_, tmpnodes_) = finishfold(
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	471 ui, repo, parentctx, oldctx, new, opts, newchildren)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	472 replaced.extend(replaced_)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	473 created.extend(created_)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	474 tmpnodes.extend(tmpnodes_)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	475 elif action not in ('d', 'drop'):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	476 if new != oldctx.node():
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	477 replaced.append(oldctx.node())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	478 if new:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	479 if new != oldctx.node():
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	480 created.append(new)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	481 parentctx = repo[new]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	482
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	483 elif opts.get('abort', False):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	484 if len(parent) != 0:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	485 raise util.Abort(_('no arguments allowed with --abort'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	486 (parentctxnode, created, replaced, tmpnodes,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	487 existing, rules, keep, tip, replacemap) = readstate(repo)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	488 ui.debug('restore wc to old tip %s\n' % node.hex(tip))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	489 hg.clean(repo, tip)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	490 ui.debug('should strip created nodes %s\n' %
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	491 ', '.join([node.hex(n)[:12] for n in created]))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	492 ui.debug('should strip temp nodes %s\n' %
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	493 ', '.join([node.hex(n)[:12] for n in tmpnodes]))
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	494 for nodes in (created, tmpnodes):
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	495 for n in reversed(nodes):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	496 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	497 repair.strip(ui, repo, n)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	498 except error.LookupError:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	499 pass
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	500 os.unlink(os.path.join(repo.path, 'histedit-state'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	501 return
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	502 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	503 cmdutil.bailifchanged(repo)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	504 if os.path.exists(os.path.join(repo.path, 'histedit-state')):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	505 raise util.Abort(_('history edit already in progress, try '
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	506 '--continue or --abort'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	507
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	508 tip, empty = repo.dirstate.parents()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	509
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	510
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	511 if len(parent) != 1:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	512 raise util.Abort(_('histedit requires exactly one parent revision'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	513 parent = scmutil.revsingle(repo, parent[0]).node()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	514
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	515 keep = opts.get('keep', False)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	516 revs = between(repo, parent, tip, keep)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	517
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	518 ctxs = [repo[r] for r in revs]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	519 existing = [r.node() for r in ctxs]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	520 rules = opts.get('commands', '')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	521 if not rules:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	522 rules = '\n'.join([makedesc(c) for c in ctxs])
17315 f320d7ed912f histedit: make comment part of the file describing rules as translatable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17285 diff changeset	523 rules += '\n\n'
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	524 rules += editcomment % (node.hex(parent)[:12], node.hex(tip)[:12])
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	525 rules = ui.edit(rules, ui.username())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	526 # Save edit rules in .hg/histedit-last-edit.txt in case
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	527 # the user needs to ask for help after something
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	528 # surprising happens.
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	529 f = open(repo.join('histedit-last-edit.txt'), 'w')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	530 f.write(rules)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	531 f.close()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	532 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	533 f = open(rules)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	534 rules = f.read()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	535 f.close()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	536 rules = [l for l in (r.strip() for r in rules.splitlines())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	537 if l and not l[0] == '#']
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	538 rules = verifyrules(rules, repo, ctxs)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	539
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	540 parentctx = repo[parent].parents()[0]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	541 keep = opts.get('keep', False)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	542 replaced = []
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	543 replacemap = {}
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	544 tmpnodes = []
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	545 created = []
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	546
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	547
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	548 while rules:
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	549 writestate(repo, parentctx.node(), created, replaced,
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	550 tmpnodes, existing, rules, keep, tip, replacemap)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	551 action, ha = rules.pop(0)
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	552 (parentctx, created_, replaced_, tmpnodes_) = actiontable[action](
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	553 ui, repo, parentctx, ha, opts)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	554
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	555 if replaced_:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	556 clen, rlen = len(created_), len(replaced_)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	557 if clen == rlen == 1:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	558 ui.debug('histedit: exact replacement of %s with %s\n' % (
17129 ead4eb5b03c9 histedit: replace hexshort lambda with node.short Augie Fackler <raf@durin42.com> parents: 17084 diff changeset	559 node.short(replaced_[0]), node.short(created_[0])))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	560
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	561 replacemap[replaced_[0]] = created_[0]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	562 elif clen > rlen:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	563 assert rlen == 1, ('unexpected replacement of '
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	564 '%d changes with %d changes' % (rlen, clen))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	565 # made more changesets than we're replacing
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	566 # TODO synthesize patch names for created patches
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	567 replacemap[replaced_[0]] = created_[-1]
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	568 ui.debug('histedit: created many, assuming %s replaced by %s' %
17129 ead4eb5b03c9 histedit: replace hexshort lambda with node.short Augie Fackler <raf@durin42.com> parents: 17084 diff changeset	569 (node.short(replaced_[0]), node.short(created_[-1])))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	570 elif rlen > clen:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	571 if not created_:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	572 # This must be a drop. Try and put our metadata on
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	573 # the parent change.
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	574 assert rlen == 1
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	575 r = replaced_[0]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	576 ui.debug('histedit: %s seems replaced with nothing, '
17129 ead4eb5b03c9 histedit: replace hexshort lambda with node.short Augie Fackler <raf@durin42.com> parents: 17084 diff changeset	577 'finding a parent\n' % (node.short(r)))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	578 pctx = repo[r].parents()[0]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	579 if pctx.node() in replacemap:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	580 ui.debug('histedit: parent is already replaced\n')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	581 replacemap[r] = replacemap[pctx.node()]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	582 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	583 replacemap[r] = pctx.node()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	584 ui.debug('histedit: %s best replaced by %s\n' % (
17129 ead4eb5b03c9 histedit: replace hexshort lambda with node.short Augie Fackler <raf@durin42.com> parents: 17084 diff changeset	585 node.short(r), node.short(replacemap[r])))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	586 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	587 assert len(created_) == 1
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	588 for r in replaced_:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	589 ui.debug('histedit: %s replaced by %s\n' % (
17129 ead4eb5b03c9 histedit: replace hexshort lambda with node.short Augie Fackler <raf@durin42.com> parents: 17084 diff changeset	590 node.short(r), node.short(created_[0])))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	591 replacemap[r] = created_[0]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	592 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	593 assert False, (
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	594 'Unhandled case in replacement mapping! '
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	595 'replacing %d changes with %d changes' % (rlen, clen))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	596 created.extend(created_)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	597 replaced.extend(replaced_)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	598 tmpnodes.extend(tmpnodes_)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	599
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	600 hg.update(repo, parentctx.node())
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	601
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	602 if not keep:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	603 if replacemap:
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	604 ui.note(_('histedit: Should update metadata for the following '
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	605 'changes:\n'))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	606
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	607 def copybms(old, new):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	608 if old in tmpnodes or old in created:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	609 # can't have any metadata we'd want to update
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	610 return
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	611 while new in replacemap:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	612 new = replacemap[new]
17129 ead4eb5b03c9 histedit: replace hexshort lambda with node.short Augie Fackler <raf@durin42.com> parents: 17084 diff changeset	613 ui.note(_('histedit: %s to %s\n') % (node.short(old),
ead4eb5b03c9 histedit: replace hexshort lambda with node.short Augie Fackler <raf@durin42.com> parents: 17084 diff changeset	614 node.short(new)))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	615 octx = repo[old]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	616 marks = octx.bookmarks()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	617 if marks:
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	618 ui.note(_('histedit: moving bookmarks %s\n') %
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	619 ', '.join(marks))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	620 for mark in marks:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	621 repo._bookmarks[mark] = new
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	622 bookmarks.write(repo)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	623
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	624 # We assume that bookmarks on the tip should remain
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	625 # tipmost, but bookmarks on non-tip changesets should go
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	626 # to their most reasonable successor. As a result, find
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	627 # the old tip and new tip and copy those bookmarks first,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	628 # then do the rest of the bookmark copies.
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	629 oldtip = sorted(replacemap.keys(), key=repo.changelog.rev)[-1]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	630 newtip = sorted(replacemap.values(), key=repo.changelog.rev)[-1]
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	631 copybms(oldtip, newtip)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	632
17084 69dae7982c85 histedit: use stable iteration order for processing bookmarks Mads Kiilerich <mads@kiilerich.com> parents: 17069 diff changeset	633 for old, new in sorted(replacemap.iteritems()):
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	634 copybms(old, new)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	635 # TODO update mq state
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	636
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	637 ui.debug('should strip replaced nodes %s\n' %
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	638 ', '.join([node.hex(n)[:12] for n in replaced]))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	639 for n in sorted(replaced, key=lambda x: repo[x].rev()):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	640 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	641 repair.strip(ui, repo, n)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	642 except error.LookupError:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	643 pass
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	644
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	645 ui.debug('should strip temp nodes %s\n' %
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	646 ', '.join([node.hex(n)[:12] for n in tmpnodes]))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	647 for n in reversed(tmpnodes):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	648 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	649 repair.strip(ui, repo, n)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	650 except error.LookupError:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	651 pass
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	652 os.unlink(os.path.join(repo.path, 'histedit-state'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	653 if os.path.exists(repo.sjoin('undo')):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	654 os.unlink(repo.sjoin('undo'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	655
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	656
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	657 def writestate(repo, parentctxnode, created, replaced,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	658 tmpnodes, existing, rules, keep, oldtip, replacemap):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	659 fp = open(os.path.join(repo.path, 'histedit-state'), 'w')
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	660 pickle.dump((parentctxnode, created, replaced,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	661 tmpnodes, existing, rules, keep, oldtip, replacemap),
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	662 fp)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	663 fp.close()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	664
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	665 def readstate(repo):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	666 """Returns a tuple of (parentnode, created, replaced, tmp, existing, rules,
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	667 keep, oldtip, replacemap ).
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	668 """
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	669 fp = open(os.path.join(repo.path, 'histedit-state'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	670 return pickle.load(fp)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	671
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	672
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	673 def verifyrules(rules, repo, ctxs):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	674 """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	675
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	676 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	677 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	678 """
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	679 parsed = []
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	680 if len(rules) != len(ctxs):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	681 raise util.Abort(_('must specify a rule for each changeset once'))
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	682 for r in rules:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	683 if ' ' not in r:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	684 raise util.Abort(_('malformed line "%s"') % r)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	685 action, rest = r.split(' ', 1)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	686 if ' ' in rest.strip():
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	687 ha, rest = rest.split(' ', 1)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	688 else:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	689 ha = r.strip()
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	690 try:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	691 if repo[ha] not in ctxs:
17066 baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	692 raise util.Abort(
baf8887d40e2 histedit: fix most check-code violations Augie Fackler <raf@durin42.com> parents: 17064 diff changeset	693 _('may not use changesets other than the ones listed'))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	694 except error.RepoError:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	695 raise util.Abort(_('unknown changeset %s listed') % ha)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	696 if action not in actiontable:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	697 raise util.Abort(_('unknown action "%s"') % action)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	698 parsed.append([action, ha])
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	699 return parsed

Mercurial > public > mercurial-scm > hg

annotate hgext/histedit.py @ 17315:f320d7ed912f stable