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

annotate hgext/histedit.py @ 29881:1c19d3efe15d

histedit: temporarily shorten name of 'constraints' variable An upcoming changeset will make the line where this variable is used slightly too long. Other later changesets will clean that up further and makes the variable unnecessary, so this is only temporary and it does seems useful to put anything more complicate in place.

author	Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date	Fri, 26 Aug 2016 20:42:18 +0200
parents	034d38b5f6fb
children	d7de02efa47e

rev	line source
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1 # histedit.py - interactive history editing for mercurial
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	2 #
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	3 # Copyright 2009 Augie Fackler <raf@durin42.com>
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	4 #
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	7 """interactive history editing
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	8
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	9 With this extension installed, Mercurial gains one new command: histedit. Usage
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	10 is as follows, assuming the following history::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	11
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	12 @ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	13 \| Add delta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	14 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	15 o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	16 \| Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	17 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	18 o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	19 \| Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	20 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	21 o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	22 Add alpha
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	23
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	24 If you were to run ``hg histedit c561b4e977df``, you would see the following
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	25 file open in your editor::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	26
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	27 pick c561b4e977df Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	28 pick 030b686bedc4 Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	29 pick 7c2fd3b9020c Add delta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	30
18322 e819c12a8bd0 histedit: correct changeset IDs in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17771 diff changeset	31 # Edit history between c561b4e977df and 7c2fd3b9020c
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	32 #
20503 23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	33 # Commits are listed from least to most recent
23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	34 #
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	35 # Commands:
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	36 # p, pick = use commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	37 # e, edit = use commit, but stop for amending
20511 5840da876235 histedit: shorten new fold message Matt Mackall <mpm@selenic.com> parents: 20503 diff changeset	38 # f, fold = use commit, but combine it with the one above
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	39 # r, roll = like fold, but discard this commit's description
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	40 # d, drop = remove commit from history
26100 5706d130ec16 histedit: improve discoverability of edit commit message timeless@mozdev.org parents: 26098 diff changeset	41 # m, mess = edit commit message without changing commit content
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	42 #
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	43
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	44 In this file, lines beginning with ``#`` are ignored. You must specify a rule
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	45 for each revision in your history. For example, if you had meant to add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	46 before beta, and then wanted to add delta in the same revision as beta, you
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	47 would reorganize the file to look like this::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	48
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	49 pick 030b686bedc4 Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	50 pick c561b4e977df Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	51 fold 7c2fd3b9020c Add delta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	52
18322 e819c12a8bd0 histedit: correct changeset IDs in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17771 diff changeset	53 # Edit history between c561b4e977df and 7c2fd3b9020c
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	54 #
20503 23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	55 # Commits are listed from least to most recent
23dc77874191 histedit: clarify description of fold command Adrian Zgorza?ek <adek@fb.com> parents: 20071 diff changeset	56 #
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	57 # Commands:
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	58 # p, pick = use commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	59 # e, edit = use commit, but stop for amending
20511 5840da876235 histedit: shorten new fold message Matt Mackall <mpm@selenic.com> parents: 20503 diff changeset	60 # f, fold = use commit, but combine it with the one above
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	61 # r, roll = like fold, but discard this commit's description
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	62 # d, drop = remove commit from history
26100 5706d130ec16 histedit: improve discoverability of edit commit message timeless@mozdev.org parents: 26098 diff changeset	63 # m, mess = edit commit message without changing commit content
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	64 #
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	65
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	66 At which point you close the editor and ``histedit`` starts working. When you
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	67 specify a ``fold`` operation, ``histedit`` will open an editor when it folds
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	68 those revisions together, offering you a chance to clean up the commit message::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	69
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	70 Add beta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	71 ***
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	72 Add delta
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	73
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	74 Edit the commit message to your liking, then close the editor. For
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	75 this example, let's assume that the commit message was changed to
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	76 ``Add beta and delta.`` After histedit has run and had a chance to
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	77 remove any old or temporary revisions it needed, the history looks
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	78 like this::
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	79
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	80 @ 2[tip] 989b4d060121 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	81 \| Add beta and delta.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	82 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	83 o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	84 \| Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	85 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	86 o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	87 Add alpha
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	88
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	89 Note that ``histedit`` does not remove any revisions (even its own temporary
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	90 ones) until after it has completed all the editing operations, so it will
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	91 probably perform several strip operations when it's done. For the above example,
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	92 it had to run strip twice. Strip can be slow depending on a variety of factors,
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	93 so you might need to be a little patient. You can choose to keep the original
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	94 revisions by passing the ``--keep`` flag.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	95
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	96 The ``edit`` operation will drop you back to a command prompt,
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	97 allowing you to edit files freely, or even use ``hg record`` to commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	98 some changes as a separate commit. When you're done, any remaining
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	99 uncommitted changes will be committed as well. When done, run ``hg
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	100 histedit --continue`` to finish this step. You'll be prompted for a
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	101 new commit message, but the default commit message will be the
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	102 original message for the ``edit`` ed revision.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	103
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	104 The ``message`` operation will give you a chance to revise a commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	105 message without changing the contents. It's a shortcut for doing
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	106 ``edit`` immediately followed by `hg histedit --continue``.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	107
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	108 If ``histedit`` encounters a conflict when moving a revision (while
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	109 handling ``pick`` or ``fold``), it'll stop in a similar manner to
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	110 ``edit`` with the difference that it won't prompt you for a commit
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	111 message when done. If you decide at this point that you don't like how
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	112 much work it will be to rearrange history, or that you made a mistake,
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	113 you can use ``hg histedit --abort`` to abandon the new changes you
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	114 have made and return to the state before you attempted to edit your
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	115 history.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	116
18323 7648b87e76db histedit: correct the number of added revisions in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18322 diff changeset	117 If we clone the histedit-ed example repository above and add four more
7648b87e76db histedit: correct the number of added revisions in online help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 18322 diff changeset	118 changes, such that we have the following history::
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	119
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	120 @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	121 \| Add theta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	122 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	123 o 5 140988835471 2009-04-27 18:04 -0500 stefan
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	124 \| Add eta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	125 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	126 o 4 122930637314 2009-04-27 18:04 -0500 stefan
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	127 \| Add zeta
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	128 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	129 o 3 836302820282 2009-04-27 18:04 -0500 stefan
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	130 \| Add epsilon
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	131 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	132 o 2 989b4d060121 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	133 \| Add beta and delta.
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	134 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	135 o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	136 \| Add gamma
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	137 \|
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	138 o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	139 Add alpha
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	140
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	141 If you run ``hg histedit --outgoing`` on the clone then it is the same
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	142 as running ``hg histedit 836302820282``. If you need plan to push to a
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	143 repository that Mercurial does not detect to be related to the source
4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	144 repo, you can add a ``--force`` option.
24199 4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	145
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	146 Config
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	147 ------
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	148
24199 4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	149 Histedit rule lines are truncated to 80 characters by default. You
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	150 can customize this behavior by setting a different length in your
24869 95a67d687903 histedit: fix reST syntax problem of example code in help document FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24831 diff changeset	151 configuration file::
24199 4047982904f8 histedit: add a config allowing changing histedit rule line length limit Mateusz Kwapich <mitrandir@fb.com> parents: 24196 diff changeset	152
24869 95a67d687903 histedit: fix reST syntax problem of example code in help document FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24831 diff changeset	153 [histedit]
95a67d687903 histedit: fix reST syntax problem of example code in help document FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 24831 diff changeset	154 linelen = 120 # truncate rule lines at 120 characters
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	155
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	156 ``hg histedit`` attempts to automatically choose an appropriate base
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	157 revision to use. To change which base revision is used, define a
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	158 revset in your configuration file::
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	159
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	160 [histedit]
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	161 defaultrev = only(.) & draft()
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	162
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	163 By default each edited revision needs to be present in histedit commands.
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	164 To remove revision you need to use ``drop`` operation. You can configure
27957 c54f017fcd52 doc: prevent literal text block from being treated as non-literal one FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27956 diff changeset	165 the drop to be implicit for missing commits by adding::
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	166
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	167 [histedit]
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	168 dropmissing = True
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	169
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	170 """
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	171
29126 7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	172 from __future__ import absolute_import
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	173
22368 802dffd62de5 histedit: abort gracefully on --continue/--abort with no state Siddharth Agarwal <sid0@fb.com> parents: 22147 diff changeset	174 import errno
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	175 import os
19018 730614b9b352 histedit: allow "-" as a command file Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19017 diff changeset	176 import sys
29205 a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29126 diff changeset	177
a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29126 diff changeset	178 from mercurial.i18n import _
29126 7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	179 from mercurial import (
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	180 bundle2,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	181 cmdutil,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	182 context,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	183 copies,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	184 destutil,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	185 discovery,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	186 error,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	187 exchange,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	188 extensions,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	189 hg,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	190 lock,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	191 merge as mergemod,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	192 node,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	193 obsolete,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	194 repair,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	195 scmutil,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	196 util,
7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	197 )
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	198
29324 b501579147f1 py3: conditionalize cPickle import by adding in util Pulkit Goyal <7895pulkit@gmail.com> parents: 29214 diff changeset	199 pickle = util.pickle
29126 7dd5d19c9773 py3: make hgext/hisedit.py use absolute_import Pulkit Goyal <7895pulkit@gmail.com> parents: 28592 diff changeset	200 release = lock.release
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	201 cmdtable = {}
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	202 command = cmdutil.command(cmdtable)
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	203
27086 5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	204 class _constraints(object):
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	205 # aborts if there are multiple rules for one node
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	206 noduplicates = 'noduplicates'
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	207 # abort if the node does belong to edited stack
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	208 forceother = 'forceother'
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	209 # abort if the node doesn't belong to edited stack
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	210 noother = 'noother'
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	211
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	212 @classmethod
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	213 def known(cls):
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	214 return set([v for k, v in cls.__dict__.items() if k[0] != '_'])
5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	215
29852 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 29831 diff changeset	216 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
25186 80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	217 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	218 # be specifying the version(s) of Mercurial they are tested with, or
80c5b2666a96 extensions: document that `testedwith = 'internal'` is special Augie Fackler <augie@google.com> parents: 25149 diff changeset	219 # leave the attribute unspecified.
29852 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 29831 diff changeset	220 testedwith = 'ships-with-hg-core'
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	221
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	222 actiontable = {}
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	223 primaryactions = set()
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	224 secondaryactions = set()
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	225 tertiaryactions = set()
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	226 internalactions = set()
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	227
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	228 def geteditcomment(ui, first, last):
27673 d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	229 """ construct the editor comment
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	230 The comment includes::
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	231 - an intro
27674 78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27673 diff changeset	232 - sorted primary commands
78d86664e3a2 histedit: prefer edit commit, edit message, use commit timeless <timeless@mozdev.org> parents: 27673 diff changeset	233 - sorted short commands
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	234 - sorted long commands
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	235 - additional hints
27673 d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	236
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	237 Commands are only included once.
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	238 """
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	239 intro = _("""Edit history between %s and %s
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	240
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	241 Commits are listed from least to most recent
d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	242
28396 5490b04e6132 histedit: adds hint how to reorder changesets at editor (issue3766) liscju <piotr.listkiewicz@gmail.com> parents: 28340 diff changeset	243 You can reorder changesets by reordering the lines
5490b04e6132 histedit: adds hint how to reorder changesets at editor (issue3766) liscju <piotr.listkiewicz@gmail.com> parents: 28340 diff changeset	244
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	245 Commands:
17315 f320d7ed912f histedit: make comment part of the file describing rules as translatable FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17285 diff changeset	246 """)
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	247 actions = []
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	248 def addverb(v):
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	249 a = actiontable[v]
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	250 lines = a.message.split("\n")
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	251 if len(a.verbs):
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	252 v = ', '.join(sorted(a.verbs, key=lambda v: len(v)))
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	253 actions.append(" %s = %s" % (v, lines[0]))
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	254 actions.extend([' %s' for l in lines[1:]])
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	255
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	256 for v in (
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	257 sorted(primaryactions) +
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	258 sorted(secondaryactions) +
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	259 sorted(tertiaryactions)
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	260 ):
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	261 addverb(v)
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	262 actions.append('')
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	263
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	264 hints = []
cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	265 if ui.configbool('histedit', 'dropmissing'):
cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	266 hints.append("Deleting a changeset from the list "
cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	267 "will DISCARD it from the edited history!")
cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	268
cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	269 lines = (intro % (first, last)).split('\n') + actions + hints
cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	270
cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	271 return ''.join(['# %s\n' % l if l else '#\n' for l in lines])
27673 d93d340dc6ee histedit: replace editcomment with a function timeless <timeless@mozdev.org> parents: 27630 diff changeset	272
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	273 class histeditstate(object):
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	274 def __init__(self, repo, parentctxnode=None, actions=None, keep=None,
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	275 topmost=None, replacements=None, lock=None, wlock=None):
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	276 self.repo = repo
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	277 self.actions = actions
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	278 self.keep = keep
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	279 self.topmost = topmost
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	280 self.parentctxnode = parentctxnode
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	281 self.lock = lock
e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	282 self.wlock = wlock
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	283 self.backupfile = None
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	284 if replacements is None:
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	285 self.replacements = []
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	286 else:
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	287 self.replacements = replacements
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	288
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	289 def read(self):
22986 7b93b49286d0 histedit: update docstring on histeditstate.read() Augie Fackler <raf@durin42.com> parents: 22985 diff changeset	290 """Load histedit state from disk and set fields appropriately."""
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	291 try:
27527 dbfaf361c062 histedit: only use pickle if not using the modern save format Bryan O'Sullivan <bos@serpentine.com> parents: 27451 diff changeset	292 state = self.repo.vfs.read('histedit-state')
25660 328739ea70c3 global: mass rewrite to use modern exception syntax Gregory Szorc <gregory.szorc@gmail.com> parents: 25452 diff changeset	293 except IOError as err:
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	294 if err.errno != errno.ENOENT:
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	295 raise
28123 6c1b7f80f90f histedit: suggest the correct tool to continue (not histedit) timeless <timeless@mozdev.org> parents: 28077 diff changeset	296 cmdutil.wrongtooltocontinue(self.repo, _('histedit'))
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	297
27527 dbfaf361c062 histedit: only use pickle if not using the modern save format Bryan O'Sullivan <bos@serpentine.com> parents: 27451 diff changeset	298 if state.startswith('v1\n'):
dbfaf361c062 histedit: only use pickle if not using the modern save format Bryan O'Sullivan <bos@serpentine.com> parents: 27451 diff changeset	299 data = self._load()
dbfaf361c062 histedit: only use pickle if not using the modern save format Bryan O'Sullivan <bos@serpentine.com> parents: 27451 diff changeset	300 parentctxnode, rules, keep, topmost, replacements, backupfile = data
dbfaf361c062 histedit: only use pickle if not using the modern save format Bryan O'Sullivan <bos@serpentine.com> parents: 27451 diff changeset	301 else:
dbfaf361c062 histedit: only use pickle if not using the modern save format Bryan O'Sullivan <bos@serpentine.com> parents: 27451 diff changeset	302 data = pickle.loads(state)
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	303 parentctxnode, rules, keep, topmost, replacements = data
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	304 backupfile = None
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	305
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	306 self.parentctxnode = parentctxnode
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	307 rules = "\n".join(["%s %s" % (verb, rest) for [verb, rest] in rules])
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	308 actions = parserules(rules, self)
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	309 self.actions = actions
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	310 self.keep = keep
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	311 self.topmost = topmost
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	312 self.replacements = replacements
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	313 self.backupfile = backupfile
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	314
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	315 def write(self):
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	316 fp = self.repo.vfs('histedit-state', 'w')
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	317 fp.write('v1\n')
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	318 fp.write('%s\n' % node.hex(self.parentctxnode))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	319 fp.write('%s\n' % node.hex(self.topmost))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	320 fp.write('%s\n' % self.keep)
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	321 fp.write('%d\n' % len(self.actions))
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	322 for action in self.actions:
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	323 fp.write('%s\n' % action.tostate())
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	324 fp.write('%d\n' % len(self.replacements))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	325 for replacement in self.replacements:
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	326 fp.write('%s%s\n' % (node.hex(replacement[0]), ''.join(node.hex(r)
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	327 for r in replacement[1])))
24958 a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	328 backupfile = self.backupfile
a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	329 if not backupfile:
a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	330 backupfile = ''
a920abf5a592 histedit: fix serializing of None backupfile Durham Goode <durham@fb.com> parents: 24920 diff changeset	331 fp.write('%s\n' % backupfile)
22976 886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	332 fp.close()
886711722db6 histedit: add histedit state class David Soria Parra <davidsp@fb.com> parents: 22952 diff changeset	333
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	334 def _load(self):
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	335 fp = self.repo.vfs('histedit-state', 'r')
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	336 lines = [l[:-1] for l in fp.readlines()]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	337
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	338 index = 0
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	339 lines[index] # version number
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	340 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	341
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	342 parentctxnode = node.bin(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	343 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	344
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	345 topmost = node.bin(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	346 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	347
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	348 keep = lines[index] == 'True'
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	349 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	350
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	351 # Rules
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	352 rules = []
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	353 rulelen = int(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	354 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	355 for i in xrange(rulelen):
24810 f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	356 ruleaction = lines[index]
f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	357 index += 1
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	358 rule = lines[index]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	359 index += 1
24810 f5416657e661 histedit: change state format to allow non-hash lines Durham Goode <durham@fb.com> parents: 24774 diff changeset	360 rules.append((ruleaction, rule))
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	361
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	362 # Replacements
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	363 replacements = []
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	364 replacementlen = int(lines[index])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	365 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	366 for i in xrange(replacementlen):
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	367 replacement = lines[index]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	368 original = node.bin(replacement[:40])
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	369 succ = [node.bin(replacement[i:i + 40]) for i in
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	370 range(40, len(replacement), 40)]
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	371 replacements.append((original, succ))
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	372 index += 1
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	373
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	374 backupfile = lines[index]
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	375 index += 1
7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	376
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	377 fp.close()
d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	378
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	379 return parentctxnode, rules, keep, topmost, replacements, backupfile
24756 d71c2da01d0d histedit: replace pickle with custom serialization Durham Goode <durham@fb.com> parents: 24626 diff changeset	380
22978 d4e764521249 histedit: add clear method to remove state David Soria Parra <davidsp@fb.com> parents: 22977 diff changeset	381 def clear(self):
26583 49b568a4e539 histedit: check presence of statefile before deleting it Christian Delahousse <cdelahousse@fb.com> parents: 26582 diff changeset	382 if self.inprogress():
49b568a4e539 histedit: check presence of statefile before deleting it Christian Delahousse <cdelahousse@fb.com> parents: 26582 diff changeset	383 self.repo.vfs.unlink('histedit-state')
22978 d4e764521249 histedit: add clear method to remove state David Soria Parra <davidsp@fb.com> parents: 22977 diff changeset	384
26582 42b908673866 histedit: add inprogress method to state class Christian Delahousse <cdelahousse@fb.com> parents: 26335 diff changeset	385 def inprogress(self):
42b908673866 histedit: add inprogress method to state class Christian Delahousse <cdelahousse@fb.com> parents: 26335 diff changeset	386 return self.repo.vfs.exists('histedit-state')
42b908673866 histedit: add inprogress method to state class Christian Delahousse <cdelahousse@fb.com> parents: 26335 diff changeset	387
27200 62b9a87a365e histedit: add actions property to histedit state Mateusz Kwapich <mitrandir@fb.com> parents: 27171 diff changeset	388
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	389 class histeditaction(object):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	390 def __init__(self, state, node):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	391 self.state = state
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	392 self.repo = state.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	393 self.node = node
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	394
29879 478e4a2a9952 histedit: make 'constraints' a class attribute instead of a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29878 diff changeset	395 constraints = set([_constraints.noduplicates, _constraints.noother])
478e4a2a9952 histedit: make 'constraints' a class attribute instead of a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29878 diff changeset	396
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	397 @classmethod
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	398 def fromrule(cls, state, rule):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	399 """Parses the given rule, returning an instance of the histeditaction.
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	400 """
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	401 rulehash = rule.strip().split(' ', 1)[0]
27547 1cbfeb1dc5aa histedit: handle exceptions from node.bin in fromrule timeless <timeless@mozdev.org> parents: 27546 diff changeset	402 try:
1cbfeb1dc5aa histedit: handle exceptions from node.bin in fromrule timeless <timeless@mozdev.org> parents: 27546 diff changeset	403 rev = node.bin(rulehash)
1cbfeb1dc5aa histedit: handle exceptions from node.bin in fromrule timeless <timeless@mozdev.org> parents: 27546 diff changeset	404 except TypeError:
1cbfeb1dc5aa histedit: handle exceptions from node.bin in fromrule timeless <timeless@mozdev.org> parents: 27546 diff changeset	405 raise error.ParseError("invalid changeset %s" % rulehash)
1cbfeb1dc5aa histedit: handle exceptions from node.bin in fromrule timeless <timeless@mozdev.org> parents: 27546 diff changeset	406 return cls(state, rev)
27202 2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	407
27541 69df2081aeb5 histedit: pass previous action to verify timeless <timeless@mozdev.org> parents: 27534 diff changeset	408 def verify(self, prev):
27202 2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	409 """ Verifies semantic correctness of the rule"""
2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	410 repo = self.repo
2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	411 ha = node.hex(self.node)
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	412 try:
27202 2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	413 self.node = repo[ha].node()
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	414 except error.RepoError:
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	415 raise error.ParseError(_('unknown changeset %s listed')
27202 2226cd4f32ed histedit: add verify() to histeditaction Mateusz Kwapich <mitrandir@fb.com> parents: 27201 diff changeset	416 % ha[:12])
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	417
29466 a0efbfbba7b5 histedit: remove unneeded initial parameter Sean Farley <sean@farley.io> parents: 29465 diff changeset	418 def torule(self):
27203 b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	419 """build a histedit rule line for an action
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	420
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	421 by default lines are in the form:
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	422 <hash> <rev> <summary>
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	423 """
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	424 ctx = self.repo[self.node]
29468 04b68ce5e964 histedit: use _getsummary in torule Sean Farley <sean@farley.io> parents: 29467 diff changeset	425 summary = _getsummary(ctx)
27203 b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	426 line = '%s %s %d %s' % (self.verb, ctx, ctx.rev(), summary)
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	427 # trim to 75 columns by default so it's not stupidly wide in my editor
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	428 # (the 5 more are left for verb)
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	429 maxlen = self.repo.ui.configint('histedit', 'linelen', default=80)
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	430 maxlen = max(maxlen, 22) # avoid truncating hash
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	431 return util.ellipsis(line, maxlen)
b6a0f0895a25 histedit: add torule method to histedit action objects Mateusz Kwapich <mitrandir@fb.com> parents: 27202 diff changeset	432
27206 7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	433 def tostate(self):
7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	434 """Print an action in format used by histedit state files
7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	435 (the first line is a verb, the remainder is the second)
7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	436 """
7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	437 return "%s\n%s" % (self.verb, node.hex(self.node))
7a523b6d5265 histedit: add tostate method to histedit action Mateusz Kwapich <mitrandir@fb.com> parents: 27205 diff changeset	438
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	439 def run(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	440 """Runs the action. The default behavior is simply apply the action's
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	441 rulectx onto the current parentctx."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	442 self.applychange()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	443 self.continuedirty()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	444 return self.continueclean()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	445
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	446 def applychange(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	447 """Applies the changes from this action's rulectx onto the current
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	448 parentctx, but does not commit them."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	449 repo = self.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	450 rulectx = repo[self.node]
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	451 repo.ui.pushbuffer(error=True, labeled=True)
27405 5837ca674da9 histedit: omit useless message from update (histeditaction) timeless <timeless@mozdev.org> parents: 27403 diff changeset	452 hg.update(repo, self.state.parentctxnode, quietempty=True)
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	453 stats = applychanges(repo.ui, repo, rulectx, {})
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	454 if stats and stats[3] > 0:
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	455 buf = repo.ui.popbuffer()
34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	456 repo.ui.write(*buf)
27629 e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	457 raise error.InterventionRequired(
e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	458 _('Fix up the change (%s %s)') %
e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	459 (self.verb, node.short(self.node)),
e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	460 hint=_('hg histedit --continue to resume'))
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	461 else:
34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	462 repo.ui.popbuffer()
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	463
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	464 def continuedirty(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	465 """Continues the action when changes have been applied to the working
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	466 copy. The default behavior is to commit the dirty changes."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	467 repo = self.repo
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	468 rulectx = repo[self.node]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	469
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	470 editor = self.commiteditor()
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	471 commit = commitfuncfor(repo, rulectx)
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	472
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	473 commit(text=rulectx.description(), user=rulectx.user(),
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	474 date=rulectx.date(), extra=rulectx.extra(), editor=editor)
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	475
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	476 def commiteditor(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	477 """The editor to be used to edit the commit message."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	478 return False
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	479
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	480 def continueclean(self):
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	481 """Continues the action when the working copy is clean. The default
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	482 behavior is to accept the current commit as the new version of the
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	483 rulectx."""
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	484 ctx = self.repo['.']
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	485 if ctx.node() == self.state.parentctxnode:
28340 c100dbd593e2 histedit: reword message when a changeset produces no changes timeless <timeless@mozdev.org> parents: 28294 diff changeset	486 self.repo.ui.warn(_('%s: skipping changeset (no changes)\n') %
24765 bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	487 node.short(self.node))
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	488 return ctx, [(self.node, tuple())]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	489 if ctx.node() == self.node:
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	490 # Nothing changed
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	491 return ctx, []
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	492 return ctx, [(self.node, (ctx.node(),))]
bdf84cc2115b histedit: add a new histeditaction class Durham Goode <durham@fb.com> parents: 24764 diff changeset	493
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	494 def commitfuncfor(repo, src):
b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	495 """Build a commit function for the replacement of <src>
b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	496
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18609 diff changeset	497 This function ensure we apply the same treatment to all changesets.
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	498
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18436 diff changeset	499 - Add a 'histedit_source' entry in extra.
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	500
25450 7e36c3000ead histedit: copyedit docstring wording problem I noticed while here Augie Fackler <augie@google.com> parents: 25412 diff changeset	501 Note that fold has its own separated logic because its handling is a bit
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	502 different and not easily factored out of the fold method.
b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	503 """
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	504 phasemin = src.phase()
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	505 def commitfunc(**kwargs):
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	506 phasebackup = repo.ui.backupconfig('phases', 'new-commit')
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	507 try:
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	508 repo.ui.setconfig('phases', 'new-commit', phasemin,
49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	509 'histedit')
18440 35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	510 extra = kwargs.get('extra', {}).copy()
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	511 extra['histedit_source'] = src.hex()
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	512 kwargs['extra'] = extra
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	513 return repo.commit(**kwargs)
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	514 finally:
35513c59f376 histedit: proper phase conservation (issue3724) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18437 diff changeset	515 repo.ui.restoreconfig(phasebackup)
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	516 return commitfunc
b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	517
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	518 def applychanges(ui, repo, ctx, opts):
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	519 """Merge changeset from ctx (only) in the current working directory"""
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	520 wcpar = repo.dirstate.parents()[0]
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	521 if ctx.p1().node() == wcpar:
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	522 # edits are "in place" we do not need to make any merge,
27603 8a87627d263a histedit: fix comment in applychanges timeless <timeless@mozdev.org> parents: 27600 diff changeset	523 # just applies changes on parent for editing
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	524 cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	525 stats = None
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	526 else:
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	527 try:
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	528 # ui.forcemerge is an internal variable, do not document
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	529 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	530 'histedit')
22904 baa3cfa03a83 histedit: use merge.graft Matt Mackall <mpm@selenic.com> parents: 22901 diff changeset	531 stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit'])
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	532 finally:
20790 49f2d5644f04 config: set a 'source' in most cases where config don't come from file but code Mads Kiilerich <madski@unity3d.com> parents: 20773 diff changeset	533 repo.ui.setconfig('ui', 'forcemerge', '', 'histedit')
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17645 diff changeset	534 return stats
17407 31c123a2f273 histedit: factored out diff/patch logic Leah Xue <leahxue@fb.com> parents: 17340 diff changeset	535
24828 5045a003260b histedit: fix rollup prompting for a commit message (issue4606) Durham Goode <durham@fb.com> parents: 24810 diff changeset	536 def collapse(repo, first, last, commitopts, skipprompt=False):
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	537 """collapse the set of revisions from first to last as new one.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	538
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	539 Expected commit options are:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	540 - message
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	541 - date
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	542 - username
17738 b8424c92ba2b spelling: fix minor spell checker issues Mads Kiilerich <mads@kiilerich.com> parents: 17666 diff changeset	543 Commit message is edited in all cases.
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	544
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	545 This function works in memory."""
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	546 ctxs = list(repo.set('%d::%d', first, last))
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	547 if not ctxs:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	548 return None
25452 43906060a3f4 histedit: abort rather than edit a public changeset (issue4704) Augie Fackler <augie@google.com> parents: 25450 diff changeset	549 for c in ctxs:
43906060a3f4 histedit: abort rather than edit a public changeset (issue4704) Augie Fackler <augie@google.com> parents: 25450 diff changeset	550 if not c.mutable():
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	551 raise error.ParseError(
25452 43906060a3f4 histedit: abort rather than edit a public changeset (issue4704) Augie Fackler <augie@google.com> parents: 25450 diff changeset	552 _("cannot fold into public change %s") % node.short(c.node()))
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	553 base = first.parents()[0]
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	554
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	555 # commit a new version of the old changeset, including the update
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	556 # collect all files which might be affected
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	557 files = set()
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	558 for ctx in ctxs:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	559 files.update(ctx.files())
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	560
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	561 # Recompute copies (avoid recording a -> b -> a)
19392 f6b047cf9272 histedit: use base for computing renames when folding (issue3729) Martin Geisler <martin@geisler.net> parents: 19284 diff changeset	562 copied = copies.pathcopies(base, last)
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	563
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	564 # prune files which were reverted by the updates
29831 e1a4015f5e34 histedit: use samefile function from cmdutil Hannes Oldenburg <hannes.christian.oldenburg@gmail.com> parents: 29470 diff changeset	565 files = [f for f in files if not cmdutil.samefile(f, last, base)]
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	566 # commit version of these files as defined by head
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	567 headmf = last.manifest()
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	568 def filectxfn(repo, ctx, path):
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	569 if path in headmf:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	570 fctx = last[path]
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	571 flags = fctx.flags()
21689 503bb3af70fe memfilectx: call super.__init__ instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 21409 diff changeset	572 mctx = context.memfilectx(repo,
503bb3af70fe memfilectx: call super.__init__ instead of duplicating code Sean Farley <sean.michael.farley@gmail.com> parents: 21409 diff changeset	573 fctx.path(), fctx.data(),
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	574 islink='l' in flags,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	575 isexec='x' in flags,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	576 copied=copied.get(path))
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	577 return mctx
22296 650b5b6e75ed convert: use None value for missing files instead of overloading IOError Mads Kiilerich <madski@unity3d.com> parents: 22280 diff changeset	578 return None
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	579
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	580 if commitopts.get('message'):
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	581 message = commitopts['message']
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	582 else:
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	583 message = first.description()
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	584 user = commitopts.get('user')
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	585 date = commitopts.get('date')
18437 358c23e8f1c6 histedit: record histedit source (issue3681) Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18436 diff changeset	586 extra = commitopts.get('extra')
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	587
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	588 parents = (first.p1().node(), first.p2().node())
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	589 editor = None
24828 5045a003260b histedit: fix rollup prompting for a commit message (issue4606) Durham Goode <durham@fb.com> parents: 24810 diff changeset	590 if not skipprompt:
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	591 editor = cmdutil.getcommiteditor(edit=True, editform='histedit.fold')
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	592 new = context.memctx(repo,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	593 parents=parents,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	594 text=message,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	595 files=files,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	596 filectxfn=filectxfn,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	597 user=user,
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	598 date=date,
21239 19d98da5c018 histedit: pass "editor" argument to "memctx.__init__()" for "collapse" command FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21233 diff changeset	599 extra=extra,
22002 a44b7b6f3cd7 histedit: pass 'editform' argument to 'cmdutil.getcommiteditor' FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 21950 diff changeset	600 editor=editor)
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	601 return repo.commitctx(new)
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17643 diff changeset	602
26981 cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	603 def _isdirtywc(repo):
cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	604 return repo[None].dirty(missing=True)
cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	605
27084 383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	606 def abortdirty():
383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	607 raise error.Abort(_('working copy has pending changes'),
383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	608 hint=_('amend, commit, or revert them and run histedit '
383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	609 '--continue, or abort with histedit --abort'))
383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	610
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	611 def action(verbs, message, priority=False, internal=False):
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	612 def wrap(cls):
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	613 assert not priority or not internal
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	614 verb = verbs[0]
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	615 if priority:
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	616 primaryactions.add(verb)
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	617 elif internal:
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	618 internalactions.add(verb)
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	619 elif len(verbs) > 1:
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	620 secondaryactions.add(verb)
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	621 else:
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	622 tertiaryactions.add(verb)
27201 dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	623
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	624 cls.verb = verb
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	625 cls.verbs = verbs
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	626 cls.message = message
27201 dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	627 for verb in verbs:
dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	628 actiontable[verb] = cls
dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	629 return cls
dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	630 return wrap
dcb536d2e138 histedit: add addhisteditaction decorator Mateusz Kwapich <mitrandir@fb.com> parents: 27200 diff changeset	631
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	632 @action(['pick', 'p'],
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	633 _('use commit'),
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	634 priority=True)
24767 477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	635 class pick(histeditaction):
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	636 def run(self):
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	637 rulectx = self.repo[self.node]
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	638 if rulectx.parents()[0].node() == self.state.parentctxnode:
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	639 self.repo.ui.debug('node %s unchanged\n' % node.short(self.node))
477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	640 return rulectx, []
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	641
24767 477e76936b1d histedit: convert pick action into a class Durham Goode <durham@fb.com> parents: 24766 diff changeset	642 return super(pick, self).run()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	643
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	644 @action(['edit', 'e'],
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	645 _('use commit, but stop for amending'),
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	646 priority=True)
24770 facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	647 class edit(histeditaction):
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	648 def run(self):
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	649 repo = self.repo
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	650 rulectx = repo[self.node]
27407 bf4d5d8dc2aa histedit: omit useless message from update (edit) timeless <timeless@mozdev.org> parents: 27406 diff changeset	651 hg.update(repo, self.state.parentctxnode, quietempty=True)
24770 facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	652 applychanges(repo.ui, repo, rulectx, {})
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	653 raise error.InterventionRequired(
27629 e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	654 _('Editing (%s), you may commit or record as needed now.')
e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	655 % node.short(self.node),
e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	656 hint=_('hg histedit --continue to resume'))
24770 facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	657
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	658 def commiteditor(self):
facdb20e60e9 histedit: convert edit action into a class Durham Goode <durham@fb.com> parents: 24769 diff changeset	659 return cmdutil.getcommiteditor(edit=True, editform='histedit.edit')
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	660
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	661 @action(['fold', 'f'],
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	662 _('use commit, but combine it with the one above'))
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	663 class fold(histeditaction):
27542 bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	664 def verify(self, prev):
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	665 """ Verifies semantic correctness of the fold rule"""
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	666 super(fold, self).verify(prev)
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	667 repo = self.repo
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	668 if not prev:
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	669 c = repo[self.node].parents()[0]
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	670 elif not prev.verb in ('pick', 'base'):
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	671 return
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	672 else:
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	673 c = repo[prev.node]
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	674 if not c.mutable():
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	675 raise error.ParseError(
27542 bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	676 _("cannot fold into public change %s") % node.short(c.node()))
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	677
bf0900d3819c histedit: check fold of public change during verify timeless <timeless@mozdev.org> parents: 27541 diff changeset	678
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	679 def continuedirty(self):
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	680 repo = self.repo
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	681 rulectx = repo[self.node]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	682
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	683 commit = commitfuncfor(repo, rulectx)
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	684 commit(text='fold-temp-revision %s' % node.short(self.node),
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	685 user=rulectx.user(), date=rulectx.date(),
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	686 extra=rulectx.extra())
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	687
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	688 def continueclean(self):
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	689 repo = self.repo
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	690 ctx = repo['.']
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	691 rulectx = repo[self.node]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	692 parentctxnode = self.state.parentctxnode
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	693 if ctx.node() == parentctxnode:
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	694 repo.ui.warn(_('%s: empty changeset\n') %
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	695 node.short(self.node))
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	696 return ctx, [(self.node, (parentctxnode,))]
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 22059 diff changeset	697
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	698 parentctx = repo[parentctxnode]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	699 newcommits = set(c.node() for c in repo.set('(%d::. - %d)', parentctx,
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	700 parentctx))
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	701 if not newcommits:
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	702 repo.ui.warn(_('%s: cannot fold - working copy is not a '
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	703 'descendant of previous commit %s\n') %
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	704 (node.short(self.node), node.short(parentctxnode)))
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	705 return ctx, [(self.node, (ctx.node(),))]
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	706
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	707 middlecommits = newcommits.copy()
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	708 middlecommits.discard(ctx.node())
3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	709
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	710 return self.finishfold(repo.ui, repo, parentctx, rulectx, ctx.node(),
090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	711 middlecommits)
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	712
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	713 def skipprompt(self):
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	714 """Returns true if the rule should skip the message editor.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	715
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	716 For example, 'fold' wants to show an editor, but 'rollup'
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	717 doesn't want to.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	718 """
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	719 return False
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	720
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	721 def mergedescs(self):
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	722 """Returns true if the rule should merge messages of multiple changes.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	723
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	724 This exists mainly so that 'rollup' rules can be a subclass of
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	725 'fold'.
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	726 """
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	727 return True
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	728
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	729 def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	730 parent = ctx.parents()[0].node()
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	731 repo.ui.pushbuffer()
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	732 hg.update(repo, parent)
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	733 repo.ui.popbuffer()
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	734 ### prepare new commit data
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	735 commitopts = {}
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	736 commitopts['user'] = ctx.user()
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	737 # commit message
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	738 if not self.mergedescs():
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	739 newmessage = ctx.description()
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	740 else:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	741 newmessage = '\n***\n'.join(
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	742 [ctx.description()] +
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	743 [repo[r].description() for r in internalchanges] +
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	744 [oldctx.description()]) + '\n'
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	745 commitopts['message'] = newmessage
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	746 # date
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	747 commitopts['date'] = max(ctx.date(), oldctx.date())
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	748 extra = ctx.extra().copy()
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	749 # histedit_source
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	750 # note: ctx is likely a temporary commit but that the best we can do
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	751 # here. This is sufficient to solve issue3681 anyway.
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	752 extra['histedit_source'] = '%s,%s' % (ctx.hex(), oldctx.hex())
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	753 commitopts['extra'] = extra
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	754 phasebackup = repo.ui.backupconfig('phases', 'new-commit')
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	755 try:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	756 phasemin = max(ctx.phase(), oldctx.phase())
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	757 repo.ui.setconfig('phases', 'new-commit', phasemin, 'histedit')
24828 5045a003260b histedit: fix rollup prompting for a commit message (issue4606) Durham Goode <durham@fb.com> parents: 24810 diff changeset	758 n = collapse(repo, ctx, repo[newnode], commitopts,
5045a003260b histedit: fix rollup prompting for a commit message (issue4606) Durham Goode <durham@fb.com> parents: 24810 diff changeset	759 skipprompt=self.skipprompt())
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	760 finally:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	761 repo.ui.restoreconfig(phasebackup)
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	762 if n is None:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	763 return ctx, []
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	764 repo.ui.pushbuffer()
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	765 hg.update(repo, n)
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	766 repo.ui.popbuffer()
24772 8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	767 replacements = [(oldctx.node(), (newnode,)),
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	768 (ctx.node(), (n,)),
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	769 (newnode, (n,)),
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	770 ]
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	771 for ich in internalchanges:
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	772 replacements.append((ich, (n,)))
8f6494eb16eb histedit: move finishfold into fold class Durham Goode <durham@fb.com> parents: 24771 diff changeset	773 return repo[n], replacements
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	774
27085 d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	775 class base(histeditaction):
29879 478e4a2a9952 histedit: make 'constraints' a class attribute instead of a method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29878 diff changeset	776 constraints = set([_constraints.forceother])
27085 d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	777
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	778 def run(self):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	779 if self.repo['.'].node() != self.node:
27344 43c00ca887d1 merge: have merge.update use a matcher instead of partial fn Augie Fackler <augie@google.com> parents: 27262 diff changeset	780 mergemod.update(self.repo, self.node, False, True)
43c00ca887d1 merge: have merge.update use a matcher instead of partial fn Augie Fackler <augie@google.com> parents: 27262 diff changeset	781 # branchmerge, force)
27085 d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	782 return self.continueclean()
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	783
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	784 def continuedirty(self):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	785 abortdirty()
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	786
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	787 def continueclean(self):
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	788 basectx = self.repo['.']
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	789 return basectx, []
d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	790
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	791 @action(['_multifold'],
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	792 _(
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	793 """fold subclass used for when multiple folds happen in a row
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	794
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	795 We only want to fire the editor for the folded message once when
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	796 (say) four changes are folded down into a single change. This is
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	797 similar to rollup, but we should preserve both messages so that
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	798 when the last fold operation runs we can show the user all the
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	799 commit messages in their editor.
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	800 """),
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	801 internal=True)
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	802 class _multifold(fold):
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	803 def skipprompt(self):
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	804 return True
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	805
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	806 @action(["roll", "r"],
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	807 _("like fold, but discard this commit's description"))
24771 3133e246c912 histedit: convert fold/roll actions into a class Durham Goode <durham@fb.com> parents: 24770 diff changeset	808 class rollup(fold):
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	809 def mergedescs(self):
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	810 return False
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	811
24773 090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	812 def skipprompt(self):
090da03361c5 histedit: improve roll action integration with fold Durham Goode <durham@fb.com> parents: 24772 diff changeset	813 return True
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	814
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	815 @action(["drop", "d"],
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	816 _('remove commit from history'))
24768 342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	817 class drop(histeditaction):
342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	818 def run(self):
342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	819 parentctx = self.repo[self.state.parentctxnode]
342671704344 histedit: convert drop action into a class Durham Goode <durham@fb.com> parents: 24767 diff changeset	820 return parentctx, [(self.node, tuple())]
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	821
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	822 @action(["mess", "m"],
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	823 _('edit commit message without changing commit content'),
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	824 priority=True)
24769 e875b94dc94c histedit: convert message action into a class Durham Goode <durham@fb.com> parents: 24768 diff changeset	825 class message(histeditaction):
e875b94dc94c histedit: convert message action into a class Durham Goode <durham@fb.com> parents: 24768 diff changeset	826 def commiteditor(self):
e875b94dc94c histedit: convert message action into a class Durham Goode <durham@fb.com> parents: 24768 diff changeset	827 return cmdutil.getcommiteditor(edit=True, editform='histedit.mess')
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	828
26335 6c93834d7d66 histedit: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26246 diff changeset	829 def findoutgoing(ui, repo, remote=None, force=False, opts=None):
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	830 """utility function to find the first outgoing changeset
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	831
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	832 Used by initialization code"""
26335 6c93834d7d66 histedit: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26246 diff changeset	833 if opts is None:
6c93834d7d66 histedit: remove a mutable default argument Pierre-Yves David <pierre-yves.david@fb.com> parents: 26246 diff changeset	834 opts = {}
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	835 dest = ui.expandpath(remote or 'default-push', remote or 'default')
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	836 dest, revs = hg.parseurl(dest, None)[:2]
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	837 ui.status(_('comparing with %s\n') % util.hidepassword(dest))
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	838
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	839 revs, checkout = hg.addbranchrevs(repo, repo, revs, None)
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	840 other = hg.peer(repo, opts, dest)
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	841
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	842 if revs:
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	843 revs = [repo.lookup(rev) for rev in revs]
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	844
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	845 outgoing = discovery.findcommonoutgoing(repo, other, revs, force=force)
26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	846 if not outgoing.missing:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	847 raise error.Abort(_('no outgoing ancestors'))
19841 fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	848 roots = list(repo.revs("roots(%ln)", outgoing.missing))
fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	849 if 1 < len(roots):
fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	850 msg = _('there are ambiguous outgoing revisions')
fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	851 hint = _('see "hg help histedit" for more detail')
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	852 raise error.Abort(msg, hint=hint)
19841 fab753424e78 histedit: abort if there are multiple roots in "--outgoing" revisions FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19622 diff changeset	853 return repo.lookup(roots[0])
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	854
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	855
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	856 @command('histedit',
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	857 [('', 'commands', '',
24232 f9e8739018d5 histedit: use better meta-variable names than VALUE in help text Anton Shestakov <engored@ya.ru> parents: 24231 diff changeset	858 _('read history edits from the specified file'), _('FILE')),
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	859 ('c', 'continue', False, _('continue an edit already in progress')),
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	860 ('', 'edit-plan', False, _('edit remaining actions list')),
17147 80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	861 ('k', 'keep', False,
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	862 _("don't strip old nodes after edit is complete")),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	863 ('', 'abort', False, _('abort an edit in progress')),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	864 ('o', 'outgoing', False, _('changesets not found in destination')),
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	865 ('f', 'force', False,
80e861511e2b histedit: use cmdutil.command decorator Adrian Buehlmann <adrian@cadifra.com> parents: 17131 diff changeset	866 _('force outgoing even for unrelated repositories')),
24232 f9e8739018d5 histedit: use better meta-variable names than VALUE in help text Anton Shestakov <engored@ya.ru> parents: 24231 diff changeset	867 ('r', 'rev', [], _('first revision to be edited'), _('REV'))],
27714 bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	868 _("[OPTIONS] ([ANCESTOR] \| --outgoing [URL])"))
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	869 def histedit(ui, repo, freeargs, *opts):
17131 4fb2d3d16743 histedit: add extension docstring from external README Augie Fackler <raf@durin42.com> parents: 17130 diff changeset	870 """interactively edit changeset history
19621 11de0651d3b6 histedit: add description about basic histedit function to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19519 diff changeset	871
27713 fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	872 This command lets you edit a linear series of changesets (up to
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	873 and including the working directory, which should be clean).
27956 f3eb98b8fe12 doc: prevent non-literal text block from being treated as literal one FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27955 diff changeset	874 You can:
27713 fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	875
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	876 - `pick` to [re]order a changeset
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	877
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	878 - `drop` to omit changeset
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	879
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	880 - `mess` to reword the changeset commit message
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	881
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	882 - `fold` to combine it with the preceding changeset
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	883
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	884 - `roll` like fold, but discarding this commit's description
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	885
fb2c77ba577a histedit: explain basics of histedit commands timeless <timeless@mozdev.org> parents: 27712 diff changeset	886 - `edit` to edit this changeset
19622 3d0ece7523c8 histedit: add description about "histedit --outgoing" to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19621 diff changeset	887
27972 92a61d7618ac histedit: fix typo in documentation Wagner Bruna <wbruna@softwareexpress.com.br> parents: 27958 diff changeset	888 There are a number of ways to select the root changeset:
27714 bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	889
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	890 - Specify ANCESTOR directly
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	891
27714 bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	892 - Use --outgoing -- it will be the first linear changeset not
28077 27ae22a4f9f9 doc: describe full help document hierarchy to create a valid link in HTML FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 28004 diff changeset	893 included in destination. (See :hg:`help config.paths.default-push`)
27714 bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	894
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	895 - Otherwise, the value from the "histedit.defaultrev" config option
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	896 is used as a revset to select the base revision when ANCESTOR is not
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	897 specified. The first revision returned by the revset is used. By
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	898 default, this selects the editable history that is unique to the
bbb61a8314c3 histedit: clarify modes timeless <timeless@mozdev.org> parents: 27713 diff changeset	899 ancestry of the working directory.
19842 1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	900
27630 9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	901 .. container:: verbose
19842 1aaefba2a3a9 histedit: add more detailed help about "--outgoing" FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19841 diff changeset	902
27630 9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	903 If you use --outgoing, this command will abort if there are ambiguous
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	904 outgoing revisions. For example, if there are multiple branches
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	905 containing outgoing revisions.
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	906
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	907 Use "min(outgoing() and ::.)" or similar revset specification
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	908 instead of --outgoing to specify edit target revision exactly in
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	909 such ambiguous situation. See :hg:`help revsets` for detail about
9358124b4a65 histedit: hide --outgoing warnings timeless <timeless@mozdev.org> parents: 27629 diff changeset	910 selecting revisions.
19972 1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	911
27145 3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	912 .. container:: verbose
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	913
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	914 Examples:
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	915
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	916 - A number of changes have been made.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	917 Revision 3 is no longer needed.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	918
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	919 Start history editing from revision 3::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	920
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	921 hg histedit -r 3
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	922
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	923 An editor opens, containing the list of revisions,
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	924 with specific actions specified::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	925
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	926 pick 5339bf82f0ca 3 Zworgle the foobar
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	927 pick 8ef592ce7cc4 4 Bedazzle the zerlog
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	928 pick 0a9639fcda9d 5 Morgify the cromulancy
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	929
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	930 Additional information about the possible actions
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	931 to take appears below the list of revisions.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	932
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	933 To remove revision 3 from the history,
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	934 its action (at the beginning of the relevant line)
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	935 is changed to 'drop'::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	936
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	937 drop 5339bf82f0ca 3 Zworgle the foobar
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	938 pick 8ef592ce7cc4 4 Bedazzle the zerlog
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	939 pick 0a9639fcda9d 5 Morgify the cromulancy
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	940
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	941 - A number of changes have been made.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	942 Revision 2 and 4 need to be swapped.
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	943
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	944 Start history editing from revision 2::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	945
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	946 hg histedit -r 2
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	947
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	948 An editor opens, containing the list of revisions,
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	949 with specific actions specified::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	950
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	951 pick 252a1af424ad 2 Blorb a morgwazzle
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	952 pick 5339bf82f0ca 3 Zworgle the foobar
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	953 pick 8ef592ce7cc4 4 Bedazzle the zerlog
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	954
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	955 To swap revision 2 and 4, its lines are swapped
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	956 in the editor::
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	957
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	958 pick 8ef592ce7cc4 4 Bedazzle the zerlog
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	959 pick 5339bf82f0ca 3 Zworgle the foobar
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	960 pick 252a1af424ad 2 Blorb a morgwazzle
3a2fd83182fb histedit: add examples Mathias De Mar? <mathias.demare@gmail.com> parents: 27086 diff changeset	961
19972 1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	962 Returns 0 on success, 1 if user intervention is required (not only
1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	963 for intentional "edit" command, but also for resolving unexpected
1e13a5a9c66e histedit: add description about exit code FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19852 diff changeset	964 conflicts).
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	965 """
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	966 state = histeditstate(repo)
20071 4778f398ec83 histedit: hold wlock and lock while in progress Siddharth Agarwal <sid0@fb.com> parents: 19972 diff changeset	967 try:
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	968 state.wlock = repo.wlock()
e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	969 state.lock = repo.lock()
e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	970 _histedit(ui, repo, state, freeargs, *opts)
20071 4778f398ec83 histedit: hold wlock and lock while in progress Siddharth Agarwal <sid0@fb.com> parents: 19972 diff changeset	971 finally:
22984 e0b5f5e3afe8 histedit: move locks into state David Soria Parra <davidsp@fb.com> parents: 22983 diff changeset	972 release(state.lock, state.wlock)
20071 4778f398ec83 histedit: hold wlock and lock while in progress Siddharth Agarwal <sid0@fb.com> parents: 19972 diff changeset	973
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	974 goalcontinue = 'continue'
ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	975 goalabort = 'abort'
ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	976 goaleditplan = 'edit-plan'
ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	977 goalnew = 'new'
ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	978
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	979 def _getgoal(opts):
df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	980 if opts.get('continue'):
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	981 return goalcontinue
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	982 if opts.get('abort'):
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	983 return goalabort
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	984 if opts.get('edit_plan'):
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	985 return goaleditplan
ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	986 return goalnew
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	987
28550 e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	988 def _readfile(path):
e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	989 if path == '-':
e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	990 return sys.stdin.read()
e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	991 else:
e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	992 with open(path, 'rb') as f:
e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	993 return f.read()
e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	994
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	995 def _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs):
27169 dd214130a4f6 histedit: improve grammar for _histedit comment timeless <timeless@mozdev.org> parents: 27154 diff changeset	996 # TODO only abort if we try to histedit mq patches, not just
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	997 # blanket if mq patches are applied somewhere
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	998 mq = getattr(repo, 'mq', None)
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	999 if mq and mq.applied:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1000 raise error.Abort(_('source has mq patches applied'))
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1001
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1002 # basic argument incompatibility processing
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1003 outg = opts.get('outgoing')
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	1004 editplan = opts.get('edit_plan')
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1005 abort = opts.get('abort')
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1006 force = opts.get('force')
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1007 if force and not outg:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1008 raise error.Abort(_('--force only allowed with --outgoing'))
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1009 if goal == 'continue':
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 24959 diff changeset	1010 if any((outg, abort, revs, freeargs, rules, editplan)):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1011 raise error.Abort(_('no arguments allowed with --continue'))
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1012 elif goal == 'abort':
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 24959 diff changeset	1013 if any((outg, revs, freeargs, rules, editplan)):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1014 raise error.Abort(_('no arguments allowed with --abort'))
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1015 elif goal == 'edit-plan':
25149 3f0744eeaeaf cleanup: use __builtins__.any instead of util.any Augie Fackler <augie@google.com> parents: 24959 diff changeset	1016 if any((outg, revs, freeargs)):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1017 raise error.Abort(_('only --commands argument allowed with '
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	1018 '--edit-plan'))
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1019 else:
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1020 if os.path.exists(os.path.join(repo.path, 'histedit-state')):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1021 raise error.Abort(_('history edit already in progress, try '
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1022 '--continue or --abort'))
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1023 if outg:
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1024 if revs:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1025 raise error.Abort(_('no revisions allowed with --outgoing'))
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1026 if len(freeargs) > 1:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1027 raise error.Abort(
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1028 _('only one repo argument allowed with --outgoing'))
12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1029 else:
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1030 revs.extend(freeargs)
24009 00d331763442 histedit: allow configuring default behavior Durham Goode <durham@fb.com> parents: 24002 diff changeset	1031 if len(revs) == 0:
27262 3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	1032 defaultrev = destutil.desthistedit(ui, repo)
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	1033 if defaultrev is not None:
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	1034 revs.append(defaultrev)
3d0feb2f978b histedit: pick an appropriate base changeset by default (BC) Gregory Szorc <gregory.szorc@gmail.com> parents: 27217 diff changeset	1035
19021 26b41a902195 histedit: move outgoing processing to its own function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19020 diff changeset	1036 if len(revs) != 1:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1037 raise error.Abort(
19621 11de0651d3b6 histedit: add description about basic histedit function to command help FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 19519 diff changeset	1038 _('histedit requires exactly one ancestor revision'))
19020 12c06686d371 histedit: move all arguments checks to the beginning of the command Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19018 diff changeset	1039
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1040 def _histedit(ui, repo, state, freeargs, *opts):
df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1041 goal = _getgoal(opts)
df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1042 revs = opts.get('rev', [])
df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1043 rules = opts.get('commands', '')
df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1044 state.keep = opts.get('keep', False)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1045
28134 df206e030c59 histedit: break _histedit function into smaller pieces Kostia Balytskyi <ikostia@fb.com> parents: 28133 diff changeset	1046 _validateargs(ui, repo, state, freeargs, opts, goal, rules, revs)
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	1047
29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	1048 # rebuild state
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1049 if goal == goalcontinue:
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	1050 state.read()
22980 b3483bc1ec8c histedit: pass state to boostrapcontinue David Soria Parra <davidsp@fb.com> parents: 22979 diff changeset	1051 state = bootstrapcontinue(ui, state, opts)
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1052 elif goal == goaleditplan:
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1053 _edithisteditplan(ui, repo, state, rules)
24142 be7cb25186be histedit: add --edit-plan option to histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24141 diff changeset	1054 return
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1055 elif goal == goalabort:
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1056 _aborthistedit(ui, repo, state)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1057 return
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1058 else:
28144 ed6d650b7cb7 histedit: change string literals to constants in goal naming Kostia Balytskyi <ikostia@fb.com> parents: 28134 diff changeset	1059 # goal == goalnew
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1060 _newhistedit(ui, repo, state, revs, freeargs, opts)
24757 7b59f16174c5 histedit: store backup file before histedit Durham Goode <durham@fb.com> parents: 24756 diff changeset	1061
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1062 _continuehistedit(ui, repo, state)
47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1063 _finishhistedit(ui, repo, state)
28133 8fc55388ece5 histedit: break _histedit function into smaller pieces (add _continueaction) Kostia Balytskyi <ikostia@fb.com> parents: 28132 diff changeset	1064
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1065 def _continuehistedit(ui, repo, state):
47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1066 """This function runs after either:
28133 8fc55388ece5 histedit: break _histedit function into smaller pieces (add _continueaction) Kostia Balytskyi <ikostia@fb.com> parents: 28132 diff changeset	1067 - bootstrapcontinue (if the goal is 'continue')
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1068 - _newhistedit (if the goal is 'new')
28133 8fc55388ece5 histedit: break _histedit function into smaller pieces (add _continueaction) Kostia Balytskyi <ikostia@fb.com> parents: 28132 diff changeset	1069 """
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	1070 # preprocess rules so that we can hide inner folds from the user
bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	1071 # and only show one editor
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1072 actions = state.actions[:]
2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1073 for idx, (action, nextact) in enumerate(
2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1074 zip(actions, actions[1:] + [None])):
2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1075 if action.verb == 'fold' and nextact and nextact.verb == 'fold':
2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1076 state.actions[idx].__class__ = _multifold
26246 bf81b696b8f4 histedit: use one editor when multiple folds happen in a row (issue3524) (BC) Augie Fackler <augie@google.com> parents: 26203 diff changeset	1077
27451 f209c85183a7 histedit: add progress support timeless <timeless@mozdev.org> parents: 27414 diff changeset	1078 total = len(state.actions)
f209c85183a7 histedit: add progress support timeless <timeless@mozdev.org> parents: 27414 diff changeset	1079 pos = 0
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1080 while state.actions:
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	1081 state.write()
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1082 actobj = state.actions.pop(0)
27451 f209c85183a7 histedit: add progress support timeless <timeless@mozdev.org> parents: 27414 diff changeset	1083 pos += 1
f209c85183a7 histedit: add progress support timeless <timeless@mozdev.org> parents: 27414 diff changeset	1084 ui.progress(_("editing"), pos, actobj.torule(),
f209c85183a7 histedit: add progress support timeless <timeless@mozdev.org> parents: 27414 diff changeset	1085 _('changes'), total)
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1086 ui.debug('histedit: processing %s %s\n' % (actobj.verb,\
2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1087 actobj.torule()))
24774 a9d63d87b837 histedit: delete all non-actionclass related code Durham Goode <durham@fb.com> parents: 24773 diff changeset	1088 parentctx, replacement_ = actobj.run()
24112 5d5ec4fb7ada histedit: switch state to store node instead of ctx Mateusz Kwapich <mitrandir@fb.com> parents: 24111 diff changeset	1089 state.parentctxnode = parentctx.node()
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	1090 state.replacements.extend(replacement_)
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1091 state.write()
27451 f209c85183a7 histedit: add progress support timeless <timeless@mozdev.org> parents: 27414 diff changeset	1092 ui.progress(_("editing"), None)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1093
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1094 def _finishhistedit(ui, repo, state):
28153 17c474fdb225 histedit: break _histedit into smaller pieces (add _finishaction) Kostia Balytskyi <ikostia@fb.com> parents: 28144 diff changeset	1095 """This action runs when histedit is finishing its session"""
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	1096 repo.ui.pushbuffer()
27406 11be6b7f95da histedit: omit useless message from update (_histedit) timeless <timeless@mozdev.org> parents: 27405 diff changeset	1097 hg.update(repo, state.parentctxnode, quietempty=True)
28004 34165875fa5d histedit: limit updated and merging output to important updates timeless <timeless@mozdev.org> parents: 27972 diff changeset	1098 repo.ui.popbuffer()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1099
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	1100 mapping, tmpnodes, created, ntm = processreplacement(state)
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1101 if mapping:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1102 for prec, succs in mapping.iteritems():
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1103 if not succs:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1104 ui.debug('histedit: %s is dropped\n' % node.short(prec))
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1105 else:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1106 ui.debug('histedit: %s is replaced by %s\n' % (
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1107 node.short(prec), node.short(succs[0])))
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1108 if len(succs) > 1:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1109 m = 'histedit: %s'
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1110 for n in succs[1:]:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1111 ui.debug(m % node.short(n))
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1112
28133 8fc55388ece5 histedit: break _histedit function into smaller pieces (add _continueaction) Kostia Balytskyi <ikostia@fb.com> parents: 28132 diff changeset	1113 supportsmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
26763 50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	1114 if supportsmarkers:
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	1115 # Only create markers if the temp nodes weren't already removed.
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	1116 obsolete.createmarkers(repo, ((repo[t],()) for t in sorted(tmpnodes)
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	1117 if t in repo))
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	1118 else:
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	1119 cleanupnode(ui, repo, 'temp', tmpnodes)
50fc80e46786 histedit: make histedit prune when obsolete is enabled Durham Goode <durham@fb.com> parents: 26696 diff changeset	1120
25330 8594d0b3018e histedit: fix keep during --continue Durham Goode <durham@fb.com> parents: 24959 diff changeset	1121 if not state.keep:
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1122 if mapping:
22977 29ae3b190ec5 histedit: use state object where necessary David Soria Parra <davidsp@fb.com> parents: 22976 diff changeset	1123 movebookmarks(ui, repo, mapping, state.topmost, ntm)
17663 c6de8c696644 histedit: extract bookmark logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17662 diff changeset	1124 # TODO update mq state
25808 425839c8ec79 histedit: minor refactoring of createmarkers check Laurent Charignon <lcharignon@fb.com> parents: 25660 diff changeset	1125 if supportsmarkers:
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1126 markers = []
17771 dcfa526b180b histedit: create obsolescence markers in deterministic order Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17769 diff changeset	1127 # sort by revision number because it sound "right"
dcfa526b180b histedit: create obsolescence markers in deterministic order Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17769 diff changeset	1128 for prec in sorted(mapping, key=repo.changelog.rev):
dcfa526b180b histedit: create obsolescence markers in deterministic order Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17769 diff changeset	1129 succs = mapping[prec]
17759 9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1130 markers.append((repo[prec],
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1131 tuple(repo[s] for s in succs)))
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1132 if markers:
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1133 obsolete.createmarkers(repo, markers)
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1134 else:
9c7497cd39fd histedit: add obsolete support Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17758 diff changeset	1135 cleanupnode(ui, repo, 'replaced', mapping)
25894 54f9561088c7 histedit: backout ebb5bb9bc32e Pierre-Yves David <pierre-yves.david@fb.com> parents: 25824 diff changeset	1136
22978 d4e764521249 histedit: add clear method to remove state David Soria Parra <davidsp@fb.com> parents: 22977 diff changeset	1137 state.clear()
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1138 if os.path.exists(repo.sjoin('undo')):
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1139 os.unlink(repo.sjoin('undo'))
27546 c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	1140 if repo.vfs.exists('histedit-last-edit.txt'):
c00924c54607 histedit: limit cleanup of histedit-last-edit.txt to success timeless <timeless@mozdev.org> parents: 27545 diff changeset	1141 repo.vfs.unlink('histedit-last-edit.txt')
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1142
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1143 def _aborthistedit(ui, repo, state):
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1144 try:
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1145 state.read()
28179 2e11f6756d9c histedit: unifying the way replacements are computed for abort and success Kostia Balytskyi <ikostia@fb.com> parents: 28154 diff changeset	1146 __, leafs, tmpnodes, __ = processreplacement(state)
28130 47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1147 ui.debug('restore wc to old parent %s\n'
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1148 % node.short(state.topmost))
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1149
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1150 # Recover our old commits if necessary
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1151 if not state.topmost in repo and state.backupfile:
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1152 backupfile = repo.join(state.backupfile)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1153 f = hg.openpath(ui, backupfile)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1154 gen = exchange.readbundle(ui, f, backupfile)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1155 with repo.transaction('histedit.abort') as tr:
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1156 if not isinstance(gen, bundle2.unbundle20):
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1157 gen.apply(repo, 'histedit', 'bundle:' + backupfile)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1158 if isinstance(gen, bundle2.unbundle20):
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1159 bundle2.applybundle(repo, gen, tr,
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1160 source='histedit',
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1161 url='bundle:' + backupfile)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1162
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1163 os.remove(backupfile)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1164
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1165 # check whether we should update away
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1166 if repo.unfiltered().revs('parents() and (%n or %ln::)',
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1167 state.parentctxnode, leafs \| tmpnodes):
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1168 hg.clean(repo, state.topmost, show_stats=True, quietempty=True)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1169 cleanupnode(ui, repo, 'created', tmpnodes)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1170 cleanupnode(ui, repo, 'temp', leafs)
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1171 except Exception:
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1172 if state.inprogress():
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1173 ui.warn(_('warning: encountered an exception during histedit '
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1174 '--abort; the repository may not have been completely '
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1175 'cleaned up\n'))
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1176 raise
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1177 finally:
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1178 state.clear()
47317570ab8c histedit: break _histedit function into smaller pieces (add _abortaction) Kostia Balytskyi <ikostia@fb.com> parents: 28123 diff changeset	1179
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1180 def _edithisteditplan(ui, repo, state, rules):
28131 5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1181 state.read()
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1182 if not rules:
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	1183 comment = geteditcomment(ui,
cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	1184 node.short(state.parentctxnode),
28131 5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1185 node.short(state.topmost))
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1186 rules = ruleeditor(repo, ui, state.actions, comment)
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1187 else:
28550 e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	1188 rules = _readfile(rules)
28131 5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1189 actions = parserules(rules, state)
29878 0099e29fc95c histedit: drop the 'nodetoverify' method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29852 diff changeset	1190 ctxs = [repo[act.node] \
0099e29fc95c histedit: drop the 'nodetoverify' method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29852 diff changeset	1191 for act in state.actions if act.node]
28131 5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1192 warnverifyactions(ui, repo, actions, state, ctxs)
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1193 state.actions = actions
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1194 state.write()
5a2fb2680a39 histedit: break _histedit function into smaller pieces (add _editplanaction) Kostia Balytskyi <ikostia@fb.com> parents: 28130 diff changeset	1195
28154 47f56b6bfed1 histedit: renaming parts to which _histedit was split Kostia Balytskyi <ikostia@fb.com> parents: 28153 diff changeset	1196 def _newhistedit(ui, repo, state, revs, freeargs, opts):
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1197 outg = opts.get('outgoing')
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1198 rules = opts.get('commands', '')
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1199 force = opts.get('force')
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1200
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1201 cmdutil.checkunfinished(repo)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1202 cmdutil.bailifchanged(repo)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1203
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1204 topmost, empty = repo.dirstate.parents()
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1205 if outg:
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1206 if freeargs:
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1207 remote = freeargs[0]
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1208 else:
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1209 remote = None
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1210 root = findoutgoing(ui, repo, remote, force, opts)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1211 else:
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1212 rr = list(repo.set('roots(%ld)', scmutil.revrange(repo, revs)))
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1213 if len(rr) != 1:
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1214 raise error.Abort(_('The specified revisions must have '
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1215 'exactly one common root'))
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1216 root = rr[0].node()
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1217
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1218 revs = between(repo, root, topmost, state.keep)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1219 if not revs:
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1220 raise error.Abort(_('%s is not an ancestor of working directory') %
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1221 node.short(root))
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1222
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1223 ctxs = [repo[r] for r in revs]
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1224 if not rules:
28592 cdbd9c0c0775 histedit: add a hint about enabled dropmissing to histedit edit comment Mateusz Kwapich <mitrandir@fb.com> parents: 28550 diff changeset	1225 comment = geteditcomment(ui, node.short(root), node.short(topmost))
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1226 actions = [pick(state, r) for r in revs]
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1227 rules = ruleeditor(repo, ui, actions, comment)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1228 else:
28550 e2b9145e35d8 histedit: do not close stdin Jun Wu <quark@fb.com> parents: 28519 diff changeset	1229 rules = _readfile(rules)
28132 2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1230 actions = parserules(rules, state)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1231 warnverifyactions(ui, repo, actions, state, ctxs)
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1232
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1233 parentctxnode = repo[root].parents()[0].node()
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1234
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1235 state.parentctxnode = parentctxnode
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1236 state.actions = actions
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1237 state.topmost = topmost
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1238 state.replacements = []
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1239
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1240 # Create a backup so we can always abort completely.
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1241 backupfile = None
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1242 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1243 backupfile = repair._bundle(repo, [parentctxnode], [topmost], root,
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1244 'histedit')
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1245 state.backupfile = backupfile
2d09a400b495 histedit: break _histedit function into smaller pieces (add _newaction) Kostia Balytskyi <ikostia@fb.com> parents: 28131 diff changeset	1246
29467 4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	1247 def _getsummary(ctx):
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	1248 # a common pattern is to extract the summary but default to the empty
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	1249 # string
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	1250 summary = ctx.description() or ''
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	1251 if summary:
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	1252 summary = summary.splitlines()[0]
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	1253 return summary
4c4232e51167 histedit: extract common summary code into method Sean Farley <sean@farley.io> parents: 29466 diff changeset	1254
24774 a9d63d87b837 histedit: delete all non-actionclass related code Durham Goode <durham@fb.com> parents: 24773 diff changeset	1255 def bootstrapcontinue(ui, state, opts):
a9d63d87b837 histedit: delete all non-actionclass related code Durham Goode <durham@fb.com> parents: 24773 diff changeset	1256 repo = state.repo
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1257 if state.actions:
2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1258 actobj = state.actions.pop(0)
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1259
26981 cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	1260 if _isdirtywc(repo):
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1261 actobj.continuedirty()
26981 cda2e980281e histedit: extracts _isdirtywc function liscju <piotr.listkiewicz@gmail.com> parents: 26798 diff changeset	1262 if _isdirtywc(repo):
27084 383f10b67fd6 histedit: add abortdirty function Mateusz Kwapich <mitrandir@fb.com> parents: 27083 diff changeset	1263 abortdirty()
24766 cfb8f5e3ca49 histedit: integrate action class into flow Durham Goode <durham@fb.com> parents: 24765 diff changeset	1264
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1265 parentctx, replacements = actobj.continueclean()
17666 5b6c8f2fbda5 histedit: move `continue` logic into a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17665 diff changeset	1266
24959 3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1267 state.parentctxnode = parentctx.node()
3c762cceedde histedit: fix --continue when rules are finished Durham Goode <durham@fb.com> parents: 24958 diff changeset	1268 state.replacements.extend(replacements)
22980 b3483bc1ec8c histedit: pass state to boostrapcontinue David Soria Parra <davidsp@fb.com> parents: 22979 diff changeset	1269
b3483bc1ec8c histedit: pass state to boostrapcontinue David Soria Parra <davidsp@fb.com> parents: 22979 diff changeset	1270 return state
17666 5b6c8f2fbda5 histedit: move `continue` logic into a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17665 diff changeset	1271
17642 bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	1272 def between(repo, old, new, keep):
bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	1273 """select and validate the set of revision to edit
bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	1274
bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	1275 When keep is false, the specified set can't have children."""
17765 ef7760f0be87 histedit: rename `revs` in `ctxs` inside the `between` function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17762 diff changeset	1276 ctxs = list(repo.set('%n::%n', old, new))
17766 d9da327516f8 histedit: clean abort when there is nothing to edit Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17765 diff changeset	1277 if ctxs and not keep:
22952 8792ac090e3b obsolete: add allowunstable option Durham Goode <durham@fb.com> parents: 22951 diff changeset	1278 if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and
18270 48deb483a8f8 clfilter: drop unnecessary explicit filtering on histedit Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18165 diff changeset	1279 repo.revs('(%ld::) - (%ld)', ctxs, ctxs)):
28294 89e04a33e958 histedit: improve error when run on nodes with children (issue5056) liscju <piotr.listkiewicz@gmail.com> parents: 28224 diff changeset	1280 raise error.Abort(_('can only histedit a changeset together '
89e04a33e958 histedit: improve error when run on nodes with children (issue5056) liscju <piotr.listkiewicz@gmail.com> parents: 28224 diff changeset	1281 'with all its descendants'))
19473 10a0ae668fe6 histedit: refuse to edit history that contains merges (issue3962) Augie Fackler <raf@durin42.com> parents: 19393 diff changeset	1282 if repo.revs('(%ld) and merge()', ctxs):
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1283 raise error.Abort(_('cannot edit history that contains merges'))
17767 a787e46d3b94 histedit: do not use "min" on ctx Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17766 diff changeset	1284 root = ctxs[0] # list is already sorted by repo.set
22416 810d37485e85 histedit: check mutability of contexts correctly Augie Fackler <raf@durin42.com> parents: 22405 diff changeset	1285 if not root.mutable():
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1286 raise error.Abort(_('cannot edit public changeset: %s') % root,
25412 443d4635e630 phases: add `hg help phases` hint to failures to edit public commits Jordi Guti?rrez Hermoso <jordigh@octave.org> parents: 25411 diff changeset	1287 hint=_('see "hg help phases" for details'))
17765 ef7760f0be87 histedit: rename `revs` in `ctxs` inside the `between` function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17762 diff changeset	1288 return [c.node() for c in ctxs]
17642 bea381c16809 histedit: move `between function` outside the action logic Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17641 diff changeset	1289
27204 6b77e749af4a histedit: use torule instead of makedesc in ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 27203 diff changeset	1290 def ruleeditor(repo, ui, actions, editcomment=""):
24140 5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1291 """open an editor to edit rules
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1292
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1293 rules are in the format [ [act, ctx], ...] like in state.rules
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1294 """
29465 00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1295 if repo.ui.configbool("experimental", "histedit.autoverb"):
29470 2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1296 newact = util.sortdict()
29465 00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1297 for act in actions:
00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1298 ctx = repo[act.node]
29469 ffa194c3a83c histedit: use _getsummary in ruleeditor Sean Farley <sean@farley.io> parents: 29468 diff changeset	1299 summary = _getsummary(ctx)
29465 00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1300 fword = summary.split(' ', 1)[0].lower()
29470 2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1301 added = False
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1302
29465 00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1303 # if it doesn't end with the special character '!' just skip this
00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1304 if fword.endswith('!'):
00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1305 fword = fword[:-1]
00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1306 if fword in primaryactions \| secondaryactions \| tertiaryactions:
00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1307 act.verb = fword
29470 2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1308 # get the target summary
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1309 tsum = summary[len(fword) + 1:].lstrip()
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1310 # safe but slow: reverse iterate over the actions so we
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1311 # don't clash on two commits having the same summary
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1312 for na, l in reversed(list(newact.iteritems())):
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1313 actx = repo[na.node]
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1314 asum = _getsummary(actx)
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1315 if asum == tsum:
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1316 added = True
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1317 l.append(act)
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1318 break
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1319
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1320 if not added:
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1321 newact[act] = []
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1322
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1323 # copy over and flatten the new list
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1324 actions = []
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1325 for na, l in newact.iteritems():
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1326 actions.append(na)
2ff243c415b4 histedit: move autoverb rule to the commit it matches Sean Farley <sean@farley.io> parents: 29469 diff changeset	1327 actions += l
29465 00d2bf4137e6 histedit: move autoverb logic from torule to ruleeditor Sean Farley <sean@farley.io> parents: 29324 diff changeset	1328
29466 a0efbfbba7b5 histedit: remove unneeded initial parameter Sean Farley <sean@farley.io> parents: 29465 diff changeset	1329 rules = '\n'.join([act.torule() for act in actions])
24140 5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1330 rules += '\n\n'
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1331 rules += editcomment
27154 3bc7919fb215 histedit: edit with custom filename Mykola Nikishov <mn@mn.com.ua> parents: 27145 diff changeset	1332 rules = ui.edit(rules, ui.username(), {'prefix': 'histedit'})
24140 5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1333
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1334 # Save edit rules in .hg/histedit-last-edit.txt in case
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1335 # the user needs to ask for help after something
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1336 # surprising happens.
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1337 f = open(repo.join('histedit-last-edit.txt'), 'w')
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1338 f.write(rules)
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1339 f.close()
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1340
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1341 return rules
5a64b676c5d3 histedit: extract method ruleeditor Mateusz Kwapich <mitrandir@fb.com> parents: 24131 diff changeset	1342
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1343 def parserules(rules, state):
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1344 """Read the histedit rules string and return list of action objects """
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1345 rules = [l for l in (r.strip() for r in rules.splitlines())
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1346 if l and not l.startswith('#')]
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1347 actions = []
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1348 for r in rules:
168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	1349 if ' ' not in r:
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1350 raise error.ParseError(_('malformed line "%s"') % r)
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1351 verb, rest = r.split(' ', 1)
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1352
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1353 if verb not in actiontable:
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1354 raise error.ParseError(_('unknown action "%s"') % verb)
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1355
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1356 action = actiontable[verb].fromrule(state, rest)
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1357 actions.append(action)
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1358 return actions
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1359
27543 ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	1360 def warnverifyactions(ui, repo, actions, state, ctxs):
ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	1361 try:
ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	1362 verifyactions(actions, state, ctxs)
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1363 except error.ParseError:
27543 ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	1364 if repo.vfs.exists('histedit-last-edit.txt'):
ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	1365 ui.warn(_('warning: histedit rules saved '
ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	1366 'to: .hg/histedit-last-edit.txt\n'))
ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	1367 raise
ff0e4c8e642d histedit: limit mentioning histedit-last-edit.txt timeless <timeless@mozdev.org> parents: 27542 diff changeset	1368
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1369 def verifyactions(actions, state, ctxs):
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1370 """Verify that there exists exactly one action per given changeset and
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1371 other constraints.
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1372
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1373 Will abort if there are to many or too few rules, a malformed rule,
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1374 or a rule on a changeset outside of the user-given range.
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1375 """
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1376 expected = set(c.hex() for c in ctxs)
994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1377 seen = set()
27541 69df2081aeb5 histedit: pass previous action to verify timeless <timeless@mozdev.org> parents: 27534 diff changeset	1378 prev = None
27208 994d8dced775 histedit: get rid of state.rules Mateusz Kwapich <mitrandir@fb.com> parents: 27207 diff changeset	1379 for action in actions:
27541 69df2081aeb5 histedit: pass previous action to verify timeless <timeless@mozdev.org> parents: 27534 diff changeset	1380 action.verify(prev)
69df2081aeb5 histedit: pass previous action to verify timeless <timeless@mozdev.org> parents: 27534 diff changeset	1381 prev = action
29881 1c19d3efe15d histedit: temporarily shorten name of 'constraints' variable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29880 diff changeset	1382 constrs = action.constraints
1c19d3efe15d histedit: temporarily shorten name of 'constraints' variable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29880 diff changeset	1383 for constraint in constrs:
27086 5f5c7d9f4a08 histedit: constant-ify the constraints list Augie Fackler <augie@google.com> parents: 27085 diff changeset	1384 if constraint not in _constraints.known():
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1385 raise error.ParseError(_('unknown constraint "%s"') %
a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1386 constraint)
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1387
29880 034d38b5f6fb histedit: drop the 'nodetoverify' local variable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29879 diff changeset	1388 if action.node is not None:
034d38b5f6fb histedit: drop the 'nodetoverify' local variable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29879 diff changeset	1389 ha = node.hex(action.node)
29881 1c19d3efe15d histedit: temporarily shorten name of 'constraints' variable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29880 diff changeset	1390 if _constraints.noother in constrs and ha not in expected:
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1391 raise error.ParseError(
27712 bb810c8b3eca histedit: report the unacceptable changeset timeless <timeless@mozdev.org> parents: 27675 diff changeset	1392 _('%s "%s" changeset was not a candidate')
27955 b721c9543a4f histedit: show correct hash ID at verification error FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27869 diff changeset	1393 % (action.verb, ha[:12]),
27712 bb810c8b3eca histedit: report the unacceptable changeset timeless <timeless@mozdev.org> parents: 27675 diff changeset	1394 hint=_('only use listed changesets'))
29881 1c19d3efe15d histedit: temporarily shorten name of 'constraints' variable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29880 diff changeset	1395 if _constraints.forceother in constrs and ha in expected:
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1396 raise error.ParseError(
27712 bb810c8b3eca histedit: report the unacceptable changeset timeless <timeless@mozdev.org> parents: 27675 diff changeset	1397 _('%s "%s" changeset was not an edited list candidate')
27955 b721c9543a4f histedit: show correct hash ID at verification error FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 27869 diff changeset	1398 % (action.verb, ha[:12]),
27712 bb810c8b3eca histedit: report the unacceptable changeset timeless <timeless@mozdev.org> parents: 27675 diff changeset	1399 hint=_('only use listed changesets'))
29881 1c19d3efe15d histedit: temporarily shorten name of 'constraints' variable Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29880 diff changeset	1400 if _constraints.noduplicates in constrs and ha in seen:
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1401 raise error.ParseError(_(
a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1402 'duplicated command for changeset %s') %
27082 4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1403 ha[:12])
4898e442f392 histedit: make verification configurable Mateusz Kwapich <mitrandir@fb.com> parents: 27051 diff changeset	1404 seen.add(ha)
19048 1163ff06ce89 histedit: more precise user message when changeset is missing Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 19047 diff changeset	1405 missing = sorted(expected - seen) # sort to stabilize output
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	1406
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	1407 if state.repo.ui.configbool('histedit', 'dropmissing'):
28519 518a5030acba histedit: have dropmissing abort on empty plan Mateusz Kwapich <mitrandir@fb.com> parents: 28396 diff changeset	1408 if len(actions) == 0:
518a5030acba histedit: have dropmissing abort on empty plan Mateusz Kwapich <mitrandir@fb.com> parents: 28396 diff changeset	1409 raise error.ParseError(_('no rules provided'),
518a5030acba histedit: have dropmissing abort on empty plan Mateusz Kwapich <mitrandir@fb.com> parents: 28396 diff changeset	1410 hint=_('use strip extension to remove commits'))
518a5030acba histedit: have dropmissing abort on empty plan Mateusz Kwapich <mitrandir@fb.com> parents: 28396 diff changeset	1411
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	1412 drops = [drop(state, node.bin(n)) for n in missing]
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	1413 # put the in the beginning so they execute immediately and
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	1414 # don't show in the edit-plan in the future
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	1415 actions[:0] = drops
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	1416 elif missing:
27545 a67d2e059a51 histedit: use parse-error exception for parsing timeless <timeless@mozdev.org> parents: 27543 diff changeset	1417 raise error.ParseError(_('missing rules for changeset %s') %
24002 96d130697f07 histedit: store full node hash in rules Mateusz Kwapich <mitrandir@fb.com> parents: 22987 diff changeset	1418 missing[0][:12],
27414 6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	1419 hint=_('use "drop %s" to discard, see also: '
6602a7b9deec histedit: delete to drop Mateusz Kwapich <mitrandir@fb.com> parents: 27407 diff changeset	1420 '"hg help -e histedit.config"') % missing[0][:12])
17663 c6de8c696644 histedit: extract bookmark logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17662 diff changeset	1421
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1422 def adjustreplacementsfrommarkers(repo, oldreplacements):
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1423 """Adjust replacements from obsolescense markers
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1424
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1425 Replacements structure is originally generated based on
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1426 histedit's state and does not account for changes that are
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1427 not recorded there. This function fixes that by adding
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1428 data read from obsolescense markers"""
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1429 if not obsolete.isenabled(repo, obsolete.createmarkersopt):
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1430 return oldreplacements
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1431
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1432 unfi = repo.unfiltered()
28224 8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	1433 nm = unfi.changelog.nodemap
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	1434 obsstore = repo.obsstore
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1435 newreplacements = list(oldreplacements)
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1436 oldsuccs = [r[1] for r in oldreplacements]
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1437 # successors that have already been added to succstocheck once
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1438 seensuccs = set().union(*oldsuccs) # create a set from an iterable of tuples
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1439 succstocheck = list(seensuccs)
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1440 while succstocheck:
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1441 n = succstocheck.pop()
28224 8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	1442 missing = nm.get(n) is None
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	1443 markers = obsstore.successors.get(n, ())
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	1444 if missing and not markers:
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	1445 # dead end, mark it as such
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1446 newreplacements.append((n, ()))
28224 8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	1447 for marker in markers:
8ec5478aa0d6 histedit: also handle locally missing nodes when reading obsolescence Pierre-Yves David <pierre-yves.david@fb.com> parents: 28216 diff changeset	1448 nsuccs = marker[1]
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1449 newreplacements.append((n, nsuccs))
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1450 for nsucc in nsuccs:
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1451 if nsucc not in seensuccs:
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1452 seensuccs.add(nsucc)
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1453 succstocheck.append(nsucc)
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1454
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1455 return newreplacements
eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1456
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	1457 def processreplacement(state):
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1458 """process the list of replacements to return
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1459
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1460 1) the final mapping between original and created nodes
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1461 2) the list of temporary node created by histedit
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1462 3) the list of new commit created by histedit"""
28216 eed7d8c07c20 histedit: make histedit aware of obsolescense not stored in state (issue4800) Kostia Balytskyi <ikostia@fb.com> parents: 28179 diff changeset	1463 replacements = adjustreplacementsfrommarkers(state.repo, state.replacements)
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1464 allsuccs = set()
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1465 replaced = set()
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1466 fullmapping = {}
26039 84dcc37b1272 histedit: correct spelling etc in more comments Augie Fackler <augie@google.com> parents: 26038 diff changeset	1467 # initialize basic set
84dcc37b1272 histedit: correct spelling etc in more comments Augie Fackler <augie@google.com> parents: 26038 diff changeset	1468 # fullmapping records all operations recorded in replacement
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1469 for rep in replacements:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1470 allsuccs.update(rep[1])
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1471 replaced.add(rep[0])
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1472 fullmapping.setdefault(rep[0], set()).update(rep[1])
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1473 new = allsuccs - replaced
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1474 tmpnodes = allsuccs & replaced
26039 84dcc37b1272 histedit: correct spelling etc in more comments Augie Fackler <augie@google.com> parents: 26038 diff changeset	1475 # Reduce content fullmapping into direct relation between original nodes
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1476 # and final node created during history edition
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1477 # Dropped changeset are replaced by an empty list
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1478 toproceed = set(fullmapping)
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1479 final = {}
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1480 while toproceed:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1481 for x in list(toproceed):
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1482 succs = fullmapping[x]
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1483 for s in list(succs):
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1484 if s in toproceed:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1485 # non final node with unknown closure
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1486 # We can't process this now
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1487 break
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1488 elif s in final:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1489 # non final node, replace with closure
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1490 succs.remove(s)
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1491 succs.update(final[s])
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1492 else:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1493 final[x] = succs
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1494 toproceed.remove(x)
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1495 # remove tmpnodes from final mapping
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1496 for n in tmpnodes:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1497 del final[n]
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1498 # we expect all changes involved in final to exist in the repo
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1499 # turn `final` into list (topologically sorted)
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	1500 nm = state.repo.changelog.nodemap
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1501 for prec, succs in final.items():
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1502 final[prec] = sorted(succs, key=nm.get)
17663 c6de8c696644 histedit: extract bookmark logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17662 diff changeset	1503
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1504 # computed topmost element (necessary for bookmark)
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1505 if new:
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	1506 newtopmost = sorted(new, key=state.repo.changelog.rev)[-1]
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1507 elif not final:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1508 # Nothing rewritten at all. we won't need `newtopmost`
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1509 # It is the same as `oldtopmost` and `processreplacement` know it
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1510 newtopmost = None
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1511 else:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1512 # every body died. The newtopmost is the parent of the root.
22985 0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	1513 r = state.repo.changelog.rev
0c14b9166da6 histedit: remove now-superfluous repo argument from processreplacement Augie Fackler <raf@durin42.com> parents: 22984 diff changeset	1514 newtopmost = state.repo[sorted(final, key=r)[0]].p1().node()
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1515
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1516 return final, tmpnodes, new, newtopmost
17663 c6de8c696644 histedit: extract bookmark logic in a dedicated function Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17662 diff changeset	1517
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1518 def movebookmarks(ui, repo, mapping, oldtopmost, newtopmost):
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1519 """Move bookmark from old to newly created node"""
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1520 if not mapping:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1521 # if nothing got rewritten there is not purpose for this function
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1522 return
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1523 moves = []
18370 c605e12dd622 histedit: process bookmarks in sorted order Mads Kiilerich <mads@kiilerich.com> parents: 18324 diff changeset	1524 for bk, old in sorted(repo._bookmarks.iteritems()):
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1525 if old == oldtopmost:
18436 b38c10502af9 histedit: factor most commit creation in a function Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18370 diff changeset	1526 # special case ensure bookmark stay on tip.
17758 5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1527 #
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1528 # This is arguably a feature and we may only want that for the
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1529 # active bookmark. But the behavior is kept compatible with the old
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1530 # version for now.
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1531 moves.append((bk, newtopmost))
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1532 continue
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1533 base = old
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1534 new = mapping.get(base, None)
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1535 if new is None:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1536 continue
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1537 while not new:
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1538 # base is killed, trying with parent
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1539 base = repo[base].p1().node()
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1540 new = mapping.get(base, (base,))
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1541 # nothing to move
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1542 moves.append((bk, new[-1]))
5863f0e4cd3a histedit: replace various nodes lists with replacement graph (and issue3582) Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17757 diff changeset	1543 if moves:
27051 1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1544 lock = tr = None
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1545 try:
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1546 lock = repo.lock()
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1547 tr = repo.transaction('histedit')
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1548 marks = repo._bookmarks
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1549 for mark, new in moves:
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1550 old = marks[mark]
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1551 ui.note(_('histedit: moving bookmarks %s from %s to %s\n')
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1552 % (mark, node.short(old), node.short(new)))
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1553 marks[mark] = new
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1554 marks.recordchange(tr)
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1555 tr.close()
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1556 finally:
1168499e5266 histedit: make use of bookmarks.recordchange instead of bookmarks.write Laurent Charignon <lcharignon@fb.com> parents: 26981 diff changeset	1557 release(tr, lock)
17664 4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1558
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1559 def cleanupnode(ui, repo, name, nodes):
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1560 """strip a group of nodes from the repository
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1561
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1562 The set of node to strip may contains unknown nodes."""
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1563 ui.debug('should strip %s nodes %s\n' %
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1564 (name, ', '.join([node.short(n) for n in nodes])))
27833 321759dfc049 with: use context manager for lock in histedit cleanupnode Bryan O'Sullivan <bryano@fb.com> parents: 27714 diff changeset	1565 with repo.lock():
25906 5d0e1e95e30f histedit: make cleanupnode more robust Pierre-Yves David <pierre-yves.david@fb.com> parents: 25898 diff changeset	1566 # do not let filtering get in the way of the cleanse
26203 b764f3c61bc7 histedit: fix grammar in cleanupnode comment timeless@mozdev.org parents: 26171 diff changeset	1567 # we should probably get rid of obsolescence marker created during the
25906 5d0e1e95e30f histedit: make cleanupnode more robust Pierre-Yves David <pierre-yves.david@fb.com> parents: 25898 diff changeset	1568 # histedit, but we currently do not have such information.
5d0e1e95e30f histedit: make cleanupnode more robust Pierre-Yves David <pierre-yves.david@fb.com> parents: 25898 diff changeset	1569 repo = repo.unfiltered()
26171 49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	1570 # Find all nodes that need to be stripped
49c1424424de histedit: fix English (en-US) timeless@mozdev.org parents: 26100 diff changeset	1571 # (we use %lr instead of %ln to silently ignore unknown items)
17664 4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1572 nm = repo.changelog.nodemap
22873 9fe8e1e80841 histedit: stabilise the order nodes that are stripped Pierre-Yves David <pierre-yves.david@fb.com> parents: 22416 diff changeset	1573 nodes = sorted(n for n in nodes if n in nm)
17664 4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1574 roots = [c.node() for c in repo.set("roots(%ln)", nodes)]
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1575 for c in roots:
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1576 # We should process node in reverse order to strip tip most first.
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1577 # but this trigger a bug in changegroup hook.
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1578 # This would reduce bundle overhead
4eb13b619785 histedit: factorise node stripping logic Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17663 diff changeset	1579 repair.strip(ui, repo, c)
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1580
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1581 def stripwrapper(orig, ui, repo, nodelist, args, *kwargs):
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1582 if isinstance(nodelist, str):
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1583 nodelist = [nodelist]
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1584 if os.path.exists(os.path.join(repo.path, 'histedit-state')):
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1585 state = histeditstate(repo)
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1586 state.read()
29878 0099e29fc95c histedit: drop the 'nodetoverify' method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29852 diff changeset	1587 histedit_nodes = set([action.node for action
0099e29fc95c histedit: drop the 'nodetoverify' method Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 29852 diff changeset	1588 in state.actions if action.node])
24626 e767f5aba810 histedit: fix preventing strips during histedit Durham Goode <durham@fb.com> parents: 24267 diff changeset	1589 strip_nodes = set([repo[n].node() for n in nodelist])
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1590 common_nodes = histedit_nodes & strip_nodes
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1591 if common_nodes:
26587 56b2bcea2529 error: get Abort from 'error' instead of 'util' Pierre-Yves David <pierre-yves.david@fb.com> parents: 26584 diff changeset	1592 raise error.Abort(_("histedit in progress, can't strip %s")
24196 c3d13202144d histedit: fix style of new error message Matt Mackall <mpm@selenic.com> parents: 24142 diff changeset	1593 % ', '.join(node.short(x) for x in common_nodes))
24111 11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1594 return orig(ui, repo, nodelist, args, *kwargs)
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1595
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1596 extensions.wrapfunction(repair, 'strip', stripwrapper)
11d72683f3de histedit: don't allow to strip nodes which are necessary to continue histedit Mateusz Kwapich <mitrandir@fb.com> parents: 24009 diff changeset	1597
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1598 def summaryhook(ui, repo):
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1599 if not os.path.exists(repo.join('histedit-state')):
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1600 return
22983 a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	1601 state = histeditstate(repo)
a3a981563ce8 histedit: read state from histeditstate David Soria Parra <davidsp@fb.com> parents: 22982 diff changeset	1602 state.read()
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1603 if state.actions:
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1604 # i18n: column positioning for "hg summary"
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1605 ui.write(_('hist: %s (histedit --continue)\n') %
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1606 (ui.label(_('%d remaining'), 'histedit.remaining') %
27207 2d8dbeb2462c histedit: change state.rules uses to state.actions Mateusz Kwapich <mitrandir@fb.com> parents: 27206 diff changeset	1607 len(state.actions)))
19215 f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1608
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1609 def extsetup(ui):
f184fe1e2ac5 summary: add a histedit hook Bryan O'Sullivan <bryano@fb.com> parents: 19048 diff changeset	1610 cmdutil.summaryhooks.add('histedit', summaryhook)
19479 11664641fbad histedit: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19473 diff changeset	1611 cmdutil.unfinishedstates.append(
19496 607191a45f8c checkunfinished: accommodate histedit quirk Matt Mackall <mpm@selenic.com> parents: 19479 diff changeset	1612 ['histedit-state', False, True, _('histedit in progress'),
19479 11664641fbad histedit: add checkunfinished support (issue3955) Matt Mackall <mpm@selenic.com> parents: 19473 diff changeset	1613 _("use 'hg histedit --continue' or 'hg histedit --abort'")])
27627 dcbba68e076f histedit: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27604 diff changeset	1614 cmdutil.afterresolvedstates.append(
dcbba68e076f histedit: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27604 diff changeset	1615 ['histedit-state', _('hg histedit --continue')])
27085 d50ff8f4891f histedit: add an experimental base action Mateusz Kwapich <mitrandir@fb.com> parents: 27084 diff changeset	1616 if ui.configbool("experimental", "histeditng"):
27675 d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	1617 globals()['base'] = action(['base', 'b'],
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	1618 _('checkout changeset and apply further changesets from there')
d073f4c70575 histedit: replace @addhisteditaction with @action timeless <timeless@mozdev.org> parents: 27674 diff changeset	1619 )(base)

Mercurial > public > mercurial-scm > hg-stable

annotate hgext/histedit.py @ 29881:1c19d3efe15d