( )⚙ D6678 continue: added support for histedit

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6678

continue: added support for histedit
AcceptedPublic

Authored by taapas1128 on Jul 23 2019, 2:28 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Summary

This patch adds the support for histedit in hg continue plan.

As seperate hgcontinuehistedit() function is created to handle
independent calls for resuming histedit. This function is
then registered as continuefunc for state detection API.

Results are shown as tests.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Jul 23 2019, 2:28 PM
taapas1128 updated this revision to Diff 16019.Jul 23 2019, 2:31 PM
pulkit added a subscriber: pulkit.Aug 7 2019, 6:02 PM
pulkit added inline comments.
hgext/histedit.py
1842

I see that we can have a unified function, resumehistedit(..) which can be called from _histedit() too.

taapas1128 marked an inline comment as done.Aug 8 2019, 12:11 PM
taapas1128 updated this revision to Diff 16157.
taapas1128 added a comment.Aug 17 2019, 6:13 AM

@pulkit This one is ready too.

durin42 accepted this revision.Sep 11 2019, 11:28 AM
This revision is now accepted and ready to land.Sep 11 2019, 11:28 AM

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (19 lines)
Mtests/test-histedit-arguments.t (22 lines)

Diff 16019

hgext/histedit.py

actobj.torule())) actobj.torule()))
parentctx, replacement_ = actobj.run() parentctx, replacement_ = actobj.run()
state.parentctxnode = parentctx.node() state.parentctxnode = parentctx.node()
state.replacements.extend(replacement_) state.replacements.extend(replacement_)
state.actions.pop(0) state.actions.pop(0)
state.write() state.write()
def hgcontinuehistedit(ui, repo):
pulkitUnsubmitted
Done

I see that we can have a unified function, resumehistedit(..) which can be called from _histedit() too.

pulkit: I see that we can have a unified function, `resumehistedit(..)` which can be called from…
state = histeditstate(repo)
with repo.wlock() as wlock, repo.lock() as lock:
state.wlock = wlock
state.lock = lock
opts = {'keep' : state.keep}
fm = ui.formatter('histedit', opts)
fm.startitem()
state.read()
state = bootstrapcontinue(ui, state, opts)
_continuehistedit(ui, repo, state)
_finishhistedit(ui, repo, state, fm)
fm.end()
def _finishhistedit(ui, repo, state, fm): def _finishhistedit(ui, repo, state, fm):
"""This action runs when histedit is finishing its session""" """This action runs when histedit is finishing its session"""
hg.updaterepo(repo, state.parentctxnode, overwrite=False) hg.updaterepo(repo, state.parentctxnode, overwrite=False)
mapping, tmpnodes, created, ntm = processreplacement(state) mapping, tmpnodes, created, ntm = processreplacement(state)
if mapping: if mapping:
for prec, succs in mapping.iteritems(): for prec, succs in mapping.iteritems():
if not succs: if not succs:
# i18n: column positioning for "hg summary" # i18n: column positioning for "hg summary"
ui.write(_('hist: %s (histedit --continue)\n') % ui.write(_('hist: %s (histedit --continue)\n') %
(ui.label(_('%d remaining'), 'histedit.remaining') % (ui.label(_('%d remaining'), 'histedit.remaining') %
len(state.actions))) len(state.actions)))
def extsetup(ui): def extsetup(ui):
cmdutil.summaryhooks.add('histedit', summaryhook) cmdutil.summaryhooks.add('histedit', summaryhook)
statemod.addunfinished('histedit', fname='histedit-state', allowcommit=True, statemod.addunfinished('histedit', fname='histedit-state', allowcommit=True,
continueflag=True, abortfunc=hgaborthistedit) continueflag=True, abortfunc=hgaborthistedit,
continuefunc=hgcontinuehistedit)

tests/test-histedit-arguments.t

#testcases abortcommand abortflag #testcases commandmode abortflag continueflag
#if abortflag #if abortflag
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [alias] > [alias]
> abort = histedit --abort > abort = histedit --abort
> EOF > EOF
#endif #endif
#if continueflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> continue = histedit --continue
> EOF
#endif
Test argument handling and various data parsing Test argument handling and various data parsing
================================================== ==================================================
Enable extensions used by this test. Enable extensions used by this test.
$ cat >>$HGRCPATH <<EOF $ cat >>$HGRCPATH <<EOF
> [extensions] > [extensions]
> histedit= > histedit=
| |
o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test
one one
histedit --continue/--abort with no existing state histedit --continue/--abort with no existing state
-------------------------------------------------- --------------------------------------------------
$ hg histedit --continue $ hg continue
abort: no histedit in progress abort: no histedit in progress (continueflag !)
abort: no operation in progress (no-continueflag !)
[255] [255]
$ hg abort $ hg abort
abort: no histedit in progress (abortflag !) abort: no histedit in progress (abortflag !)
abort: no operation in progress (abortcommand !) abort: no operation in progress (no-abortflag !)
[255] [255]
Run a dummy edit to make sure we get tip^^ correctly via revsingle. Run a dummy edit to make sure we get tip^^ correctly via revsingle.
-------------------------------------------------------------------- --------------------------------------------------------------------
$ HGEDITOR=cat hg histedit "tip^^" $ HGEDITOR=cat hg histedit "tip^^"
pick eb57da33312f 2 three pick eb57da33312f 2 three
pick c8e68270e35a 3 four pick c8e68270e35a 3 four
(continue: hg histedit --continue) (continue: hg histedit --continue)
[255] [255]
$ mv .hg/histedit-state .hg/histedit-state.back $ mv .hg/histedit-state .hg/histedit-state.back
$ hg update --quiet --clean 2 $ hg update --quiet --clean 2
$ echo alpha >> alpha $ echo alpha >> alpha
$ mv .hg/histedit-state.back .hg/histedit-state $ mv .hg/histedit-state.back .hg/histedit-state
$ hg histedit --continue $ hg continue
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg saved backup bundle to $TESTTMP/foo/.hg/strip-backup/08d98a8350f3-02594089-histedit.hg
$ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2:: $ hg log -G -T '{rev} {shortest(node)} {desc}\n' -r 2::
@ 4 f5ed five @ 4 f5ed five
| |
| o 3 c8e6 four | o 3 c8e6 four
|/ |/
o 2 eb57 three o 2 eb57 three
| |
merging foo merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
Fix up the change (pick 8cde254db839) Fix up the change (pick 8cde254db839)
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg resolve -m --all $ hg resolve -m --all
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg histedit --cont $ hg continue
merging foo merging foo
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
Editing (6f2f0241f119), you may commit or record as needed now. Editing (6f2f0241f119), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg resolve -m --all $ hg resolve -m --all
(no more unresolved files) (no more unresolved files)
continue: hg histedit --continue continue: hg histedit --continue
$ hg commit --amend -m 'reject this fold' $ hg commit --amend -m 'reject this fold'
abort: histedit in progress abort: histedit in progress
(use 'hg histedit --continue' or 'hg histedit --abort') (use 'hg histedit --continue' or 'hg histedit --abort')
[255] [255]
With markers enabled, histedit does not get confused, and With markers enabled, histedit does not get confused, and
amend should not be blocked by the ongoing histedit. amend should not be blocked by the ongoing histedit.
$ cat >>$HGRCPATH <<EOF $ cat >>$HGRCPATH <<EOF
> [experimental] > [experimental]
> evolution.createmarkers=True > evolution.createmarkers=True
> evolution.allowunstable=True > evolution.allowunstable=True
> EOF > EOF
$ hg commit --amend -m 'allow this fold' $ hg commit --amend -m 'allow this fold'
$ hg histedit --continue $ hg continue
$ cd .. $ cd ..
Test autoverb feature Test autoverb feature
$ hg init autoverb $ hg init autoverb
$ cd autoverb $ cd autoverb
$ echo alpha >> alpha $ echo alpha >> alpha