Mercurial > public > mercurial-scm > hg-stable
diff hgext/histedit.py @ 34489:270e344a6c74
histedit: removing the experimental config 'histeditng'
This config has been around for about 2 years now. So, it can be
assumed to be stable. Therefore, I am removing the config. This also makes the
test 'test-histedit-base.t' compatible with chg.
Test Plan:
- Ran the test 'test-histedit-base.t' with and without '--chg' option.
- Ran all the other tests without '--chg' option.
- Checked the output of 'hg help histedit'.
Differential Revision: https://phab.mercurial-scm.org/D942
| author | Saurabh Singh <singhsrb@fb.com> |
|---|---|
| date | Thu, 05 Oct 2017 21:56:25 +0000 |
| parents | 272b83a6b591 |
| children | babd168e994b |
line wrap: on
line diff
--- 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)