--- a/hgext/histedit.py Thu Oct 05 00:48:44 2017 +0000
+++ b/hgext/histedit.py Thu Oct 05 21:56:25 2017 +0000
@@ -39,6 +39,7 @@
# r, roll = like fold, but discard this commit's description and date
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
+ # b, base = checkout changeset and apply further changesets from there
#
In this file, lines beginning with ``#`` are ignored. You must specify a rule
@@ -61,6 +62,7 @@
# r, roll = like fold, but discard this commit's description and date
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
+ # b, base = checkout changeset and apply further changesets from there
#
At which point you close the editor and ``histedit`` starts working. When you
@@ -815,6 +817,8 @@
replacements.append((ich, (n,)))
return repo[n], replacements
+@action(['base', 'b'],
+ _('checkout changeset and apply further changesets from there'))
class base(histeditaction):
def run(self):
@@ -905,7 +909,6 @@
raise error.Abort(msg, hint=hint)
return repo.lookup(roots[0])
-
@command('histedit',
[('', 'commands', '',
_('read history edits from the specified file'), _('FILE')),
@@ -938,6 +941,8 @@
- `edit` to edit this changeset (preserving date)
+ - `base` to checkout changeset and apply further changesets from there
+
There are a number of ways to select the root changeset:
- Specify ANCESTOR directly
@@ -1631,7 +1636,3 @@
_("use 'hg histedit --continue' or 'hg histedit --abort'")])
cmdutil.afterresolvedstates.append(
['histedit-state', _('hg histedit --continue')])
- if ui.configbool("experimental", "histeditng"):
- globals()['base'] = action(['base', 'b'],
- _('checkout changeset and apply further changesets from there')
- )(base)