This is an archive of the discontinued Mercurial Phabricator instance.

Differential D942

histedit: removing the experimental config 'histeditng'
ClosedPublic

Authored by singhsrb on Oct 4 2017, 6:24 PM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHG270e344a6c74: histedit: removing the experimental config 'histeditng'
Summary

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'.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

singhsrb created this revision.Oct 4 2017, 6:24 PM
singhsrb edited the test plan for this revision. (Show Details)Oct 4 2017, 6:38 PM
singhsrb updated this revision to Diff 2440.
quark accepted this revision.Oct 4 2017, 7:14 PM
quark added a subscriber: quark.
quark added inline comments.
hgext/histedit.py
796

You can use the decorator here:

@action(....)

just like line 819.

1613

And this becomes unnecessary.

durin42 requested changes to this revision.Oct 5 2017, 11:05 AM
durin42 added a subscriber: durin42.
durin42 added inline comments.
hgext/histedit.py
796

Please do this, then I think you're good to go.

This revision now requires changes to proceed.Oct 5 2017, 11:05 AM
singhsrb added a comment.Oct 5 2017, 5:32 PM

I totally missed the decorator. Thanks guys!

singhsrb updated this revision to Diff 2488.Oct 5 2017, 5:55 PM

Updating D942: Addressing the review comments and adding some documentation.

singhsrb edited the test plan for this revision. (Show Details)Oct 5 2017, 5:58 PM
singhsrb updated this revision to Diff 2489.

Updating D942: Modified test plan to account for documentation.

durin42 accepted this revision.Oct 5 2017, 6:45 PM
This revision is now accepted and ready to land.Oct 5 2017, 6:45 PM
Closed by commit rHG270e344a6c74: histedit: removing the experimental config 'histeditng' (authored by singhsrb). · Explain WhyOct 5 2017, 6:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 2440

hgext/histedit.py

replacements = [(oldctx.node(), (newnode,)), replacements = [(oldctx.node(), (newnode,)),
(ctx.node(), (n,)), (ctx.node(), (n,)),
(newnode, (n,)), (newnode, (n,)),
] ]
for ich in internalchanges: for ich in internalchanges:
replacements.append((ich, (n,))) replacements.append((ich, (n,)))
return repo[n], replacements return repo[n], replacements
class base(histeditaction): class base(histeditaction):
quarkUnsubmitted
Not Done

You can use the decorator here:

@action(....)

just like line 819.

quark: You can use the decorator here: @action(....) just like line 819.
durin42Unsubmitted
Not Done

Please do this, then I think you're good to go.

durin42: Please do this, then I think you're good to go.
def run(self): def run(self):
if self.repo['.'].node() != self.node: if self.repo['.'].node() != self.node:
mergemod.update(self.repo, self.node, False, True) mergemod.update(self.repo, self.node, False, True)
# branchmerge, force) # branchmerge, force)
return self.continueclean() return self.continueclean()
def continuedirty(self): def continuedirty(self):
def extsetup(ui): def extsetup(ui):
cmdutil.summaryhooks.add('histedit', summaryhook) cmdutil.summaryhooks.add('histedit', summaryhook)
cmdutil.unfinishedstates.append( cmdutil.unfinishedstates.append(
['histedit-state', False, True, _('histedit in progress'), ['histedit-state', False, True, _('histedit in progress'),
_("use 'hg histedit --continue' or 'hg histedit --abort'")]) _("use 'hg histedit --continue' or 'hg histedit --abort'")])
cmdutil.afterresolvedstates.append( cmdutil.afterresolvedstates.append(
['histedit-state', _('hg histedit --continue')]) ['histedit-state', _('hg histedit --continue')])
if ui.configbool("experimental", "histeditng"):
globals()['base'] = action(['base', 'b'], globals()['base'] = action(['base', 'b'],
quarkUnsubmitted
Not Done

And this becomes unnecessary.

quark: And this becomes unnecessary.
_('checkout changeset and apply further changesets from there') _('checkout changeset and apply further changesets from there')
)(base) )(base)

tests/test-histedit-arguments.t

# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
Run on a revision not ancestors of the current working directory. Run on a revision not ancestors of the current working directory.
-------------------------------------------------------------------- --------------------------------------------------------------------
# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
Test --continue with --keep Test --continue with --keep
$ hg strip -q -r . --config extensions.strip= $ hg strip -q -r . --config extensions.strip=
# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
$ cd .. $ cd ..

tests/test-histedit-base.t

$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [alias] > [alias]
> tglog = log -G --template "{rev}:{node}:{phase} '{desc}'\n" > tglog = log -G --template "{rev}:{node}:{phase} '{desc}'\n"
> [extensions] > [extensions]
> histedit= > histedit=
> [experimental]
> histeditng=True
> EOF > EOF
Create repo a: Create repo a:
$ hg init a $ hg init a
$ cd a $ cd a
$ hg unbundle "$TESTDIR/bundles/rebase.hg" $ hg unbundle "$TESTDIR/bundles/rebase.hg"
adding changesets adding changesets
> base d273e35dcdf2 B > base d273e35dcdf2 B
> pick e8c55b19d366 J > pick e8c55b19d366 J
> base d273e35dcdf2 B > base d273e35dcdf2 B
> pick b2f90fd8aa85 I > pick b2f90fd8aa85 I
> EOF > EOF
hg: parse error: base "d273e35dcdf2" changeset was an edited list candidate hg: parse error: base "d273e35dcdf2" changeset was an edited list candidate
(base must only use unlisted changesets) (base must only use unlisted changesets)
$ hg --config experimental.histeditng=False histedit 5 --commands - 2>&1 << EOF | fixbundle
> base cd010b8cd998 A
> pick d273e35dcdf2 B
> pick 03772da75548 X
> pick b2f90fd8aa85 I
> pick e8c55b19d366 J
> EOF
hg: parse error: unknown action "base"
$ hg tglog $ hg tglog
@ 8:e8c55b19d366b335626e805484110d1d5f6f2ea3:draft 'J' @ 8:e8c55b19d366b335626e805484110d1d5f6f2ea3:draft 'J'
| |
o 7:b2f90fd8aa85db5569e3cfc30cd1d7739546368e:draft 'I' o 7:b2f90fd8aa85db5569e3cfc30cd1d7739546368e:draft 'I'
| |
o 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X' o 6:03772da75548bb42a8f1eacd8c91d0717a147fcd:draft 'X'
| |
o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B'

tests/test-histedit-bookmark-motion.t

# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
$ hg histedit 1 --commands - --verbose << EOF | grep histedit $ hg histedit 1 --commands - --verbose << EOF | grep histedit
> pick 177f92b77385 2 c > pick 177f92b77385 2 c
> drop d2ae7f538514 1 b > drop d2ae7f538514 1 b
> pick 055a42cdd887 3 d > pick 055a42cdd887 3 d
# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
$ hg histedit 1 --commands - --verbose << EOF | grep histedit $ hg histedit 1 --commands - --verbose << EOF | grep histedit
> pick b346ab9a313d 1 c > pick b346ab9a313d 1 c
> pick cacdfd884a93 3 f > pick cacdfd884a93 3 f
> pick 59d9f330561f 2 d > pick 59d9f330561f 2 d

tests/test-histedit-commute.t

# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
edit the history edit the history
(use a hacky editor to check histedit-last-edit.txt backup) (use a hacky editor to check histedit-last-edit.txt backup)
# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
should also work if a commit message is missing should also work if a commit message is missing
$ BUNDLE="$TESTDIR/missing-comment.hg" $ BUNDLE="$TESTDIR/missing-comment.hg"
$ hg init missing $ hg init missing

tests/test-histedit-edit.t

# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, fold = use commit # p, fold = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #

tests/test-histedit-obsolete.t

# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
$ hg histedit 1 --commands - --verbose <<EOF | grep histedit $ hg histedit 1 --commands - --verbose <<EOF | grep histedit
> pick 177f92b77385 2 c > pick 177f92b77385 2 c
> drop d2ae7f538514 1 b > drop d2ae7f538514 1 b
> pick 055a42cdd887 3 d > pick 055a42cdd887 3 d

tests/test-histedit-outgoing.t

# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
$ cd .. $ cd ..
show the error from unrelated repos show the error from unrelated repos
$ cd r3 $ cd r3
# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
$ cd .. $ cd ..
test sensitivity to branch in URL: test sensitivity to branch in URL:
# #
# You can reorder changesets by reordering the lines # You can reorder changesets by reordering the lines
# #
# Commands: # Commands:
# #
# e, edit = use commit, but stop for amending # e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content # m, mess = edit commit message without changing commit content
# p, pick = use commit # p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history # d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above # f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date # r, roll = like fold, but discard this commit's description and date
# #
test to check number of roots in outgoing revisions test to check number of roots in outgoing revisions
$ hg -q outgoing -G --template '{node|short}({branch})' '../r' $ hg -q outgoing -G --template '{node|short}({branch})' '../r'