This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6582

abort: added support for histedit
ClosedPublic

Authored by taapas1128 on Jun 27 2019, 3:14 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGdb5560c07a28: abort: added support for histedit
Summary

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

As seperate hgaborthistedit() function is created to handle
independent calls for abortion of histedit. This function is
then registered as abortfunc for state detection API.

hg abort in case of histedit also supports history-editing-backup
config option.

Results are shown as tests.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

taapas1128 created this revision.Jun 27 2019, 3:14 PM
taapas1128 updated this revision to Diff 15735.Jul 1 2019, 5:51 PM
pulkit added a subscriber: pulkit.Jul 2 2019, 5:45 PM
pulkit added inline comments.
hgext/histedit.py
1922

you need to set locks for the state too. Refer line 1685 in this file.

taapas1128 edited the summary of this revision. (Show Details)Jul 3 2019, 7:02 PM
taapas1128 updated this revision to Diff 15754.
taapas1128 marked an inline comment as done.Jul 3 2019, 7:08 PM
taapas1128 updated this revision to Diff 15769.Jul 4 2019, 5:07 PM
taapas1128 updated this revision to Diff 15782.Jul 6 2019, 2:55 PM
pulkit added a comment.Jul 8 2019, 11:59 AM

Looking closely, the backup value comes from reading ui.configbool('rewrite', 'backup-bundle') instead of a --no-backup flag. It means we can get rid of the --backup flag to hg abort as there exists no such flag for histedit.

taapas1128 added a comment.Jul 8 2019, 12:11 PM

@pulkit Yeah I know that but look at D3965. histedit once did support --no-backup flag. It was dropped off for a different reason.

pulkit added a comment.Jul 8 2019, 12:36 PM
In D6582#96533, @taapas1128 wrote:

@pulkit Yeah I know that but look at D3965. histedit once did support --no-backup flag. It was dropped off for a different reason.

Yeah, so we should respect the config option and not re-introduce the flag.

taapas1128 added a comment.Jul 8 2019, 12:41 PM

Okay I will do that. So should I remove --no-backup flag altogether from this series of patches because none of the commands support --no-backup then.

pulkit added a comment.Jul 8 2019, 12:45 PM
In D6582#96537, @taapas1128 wrote:

Okay I will do that. So should I remove --no-backup flag altogether from this series of patches because none of the commands support --no-backup then.

Yes please remove. Also it will be nice if you fold all the abort related patches into one except D6608.

taapas1128 edited the summary of this revision. (Show Details)Jul 8 2019, 2:18 PM
taapas1128 updated this revision to Diff 15807.
taapas1128 edited the summary of this revision. (Show Details)Jul 9 2019, 8:25 AM
taapas1128 updated this revision to Diff 15834.
pulkit accepted this revision.Jul 10 2019, 8:43 AM
pulkit added inline comments.
tests/test-histedit-no-backup.t
63

Unwanted new line change, will drop it in flight.

This revision is now accepted and ready to land.Jul 10 2019, 8:43 AM
taapas1128 added a commit: rHGdb5560c07a28: abort: added support for histedit.Jul 10 2019, 9:13 AM
Closed by commit rHGdb5560c07a28: abort: added support for histedit (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 15848

hgext/histedit.py

if state.inprogress(): if state.inprogress():
ui.warn(_('warning: encountered an exception during histedit ' ui.warn(_('warning: encountered an exception during histedit '
'--abort; the repository may not have been completely ' '--abort; the repository may not have been completely '
'cleaned up\n')) 'cleaned up\n'))
raise raise
finally: finally:
state.clear() state.clear()
def hgaborthistedit(ui, repo):
pulkitUnsubmitted
Done

you need to set locks for the state too. Refer line 1685 in this file.

pulkit: you need to set locks for the state too. Refer line 1685 in this file.
state = histeditstate(repo)
nobackup = not ui.configbool('rewrite', 'backup-bundle')
with repo.wlock() as wlock, repo.lock() as lock:
state.wlock = wlock
state.lock = lock
_aborthistedit(ui, repo, state, nobackup=nobackup)
def _edithisteditplan(ui, repo, state, rules): def _edithisteditplan(ui, repo, state, rules):
state.read() state.read()
if not rules: if not rules:
comment = geteditcomment(ui, comment = geteditcomment(ui,
node.short(state.parentctxnode), node.short(state.parentctxnode),
node.short(state.topmost)) node.short(state.topmost))
rules = ruleeditor(repo, ui, state.actions, comment) rules = ruleeditor(repo, ui, state.actions, comment)
else: else:
# 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) continueflag=True, abortfunc=hgaborthistedit)

tests/test-histedit-arguments.t

#testcases abortcommand abortflag
#if abortflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> abort = histedit --abort
> 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=
histedit --continue/--abort with no existing state histedit --continue/--abort with no existing state
-------------------------------------------------- --------------------------------------------------
$ hg histedit --continue $ hg histedit --continue
abort: no histedit in progress abort: no histedit in progress
[255] [255]
$ hg histedit --abort $ hg abort
abort: no histedit in progress abort: no histedit in progress (abortflag !)
abort: no operation in progress (abortcommand !)
[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
> edit 8fda0c726bf2 6 x > edit 8fda0c726bf2 6 x
> EOF > EOF
Editing (8fda0c726bf2), you may commit or record as needed now. Editing (8fda0c726bf2), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
Corrupt histedit state file Corrupt histedit state file
$ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit $ sed 's/8fda0c726bf2/123456789012/' .hg/histedit-state > ../corrupt-histedit
$ mv ../corrupt-histedit .hg/histedit-state $ mv ../corrupt-histedit .hg/histedit-state
$ hg histedit --abort $ hg abort
warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up
abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows !) abort: $TESTTMP/foo/.hg/strip-backup/*-histedit.hg: $ENOENT$ (glob) (windows !)
abort: $ENOENT$: '$TESTTMP/foo/.hg/strip-backup/*-histedit.hg' (glob) (no-windows !) abort: $ENOENT$: '$TESTTMP/foo/.hg/strip-backup/*-histedit.hg' (glob) (no-windows !)
[255] [255]
Histedit state has been exited Histedit state has been exited
$ hg summary -q $ hg summary -q
parent: 5:63379946892c parent: 5:63379946892c
commit: 1 added, 1 unknown (new branch head) commit: 1 added, 1 unknown (new branch head)

tests/test-histedit-no-backup.t

#testcases abortcommand abortflag
#if abortflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> abort = histedit --abort
> EOF
#endif
$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
Enable extension used by this test Enable extension used by this test
$ cat >>$HGRCPATH <<EOF $ cat >>$HGRCPATH <<EOF
> [extensions] > [extensions]
> histedit= > histedit=
> EOF > EOF
> pick 6153eb23e623 1 two > pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three > roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four > edit 7d5187087c79 3 four
> EOF > EOF
merging file merging file
Editing (7d5187087c79), you may commit or record as needed now. Editing (7d5187087c79), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg histedit --abort $ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg saved backup bundle to $TESTTMP/foo/.hg/strip-backup/1d8f701c7b35-cf7be322-backup.hg
saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg saved backup bundle to $TESTTMP/foo/.hg/strip-backup/5c0056670bce-b54b65d0-backup.hg
Test when `backup-bundle` config option is not enabled Test when `backup-bundle` config option is not enabled
Enable config option: Enable config option:
$ cat >>$HGRCPATH <<EOF $ cat >>$HGRCPATH <<EOF
pulkitUnsubmitted
Not Done

Unwanted new line change, will drop it in flight.

pulkit: Unwanted new line change, will drop it in flight.
> [rewrite] > [rewrite]
> backup-bundle = False > backup-bundle = False
> EOF > EOF
$ hg histedit -r '36b4bdd91f5b' --commands - << EOF $ hg histedit -r '36b4bdd91f5b' --commands - << EOF
> pick 36b4bdd91f5b 0 one > pick 36b4bdd91f5b 0 one
> pick 6153eb23e623 1 two > pick 6153eb23e623 1 two
> roll 80d23dfa866d 2 three > roll 80d23dfa866d 2 three
> edit 7d5187087c79 3 four > edit 7d5187087c79 3 four
> EOF > EOF
merging file merging file
Editing (7d5187087c79), you may commit or record as needed now. Editing (7d5187087c79), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg histedit --abort
$ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-histedit-obsolete.t

#testcases abortcommand abortflag
#if abortflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> abort = histedit --abort
> EOF
#endif
$ . "$TESTDIR/histedit-helpers.sh" $ . "$TESTDIR/histedit-helpers.sh"
Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> logtemplate= {rev}:{node|short} {desc|firstline} > logtemplate= {rev}:{node|short} {desc|firstline}
> [phases] > [phases]
> pick b605fb7503f2 16 i > pick b605fb7503f2 16 i
> roll 3a6c53ee7f3d 17 j > roll 3a6c53ee7f3d 17 j
> edit ee118ab9fa44 18 k > edit ee118ab9fa44 18 k
> EOF > EOF
Editing (ee118ab9fa44), you may commit or record as needed now. Editing (ee118ab9fa44), you may commit or record as needed now.
(hg histedit --continue to resume) (hg histedit --continue to resume)
[1] [1]
$ hg histedit --abort #if abortcommand
when in dry-run mode
$ hg abort --dry-run
histedit in progress, will be aborted
#endif
$ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/abort/.hg/strip-backup/4dc06258baa6-dff4ef05-backup.hg saved backup bundle to $TESTTMP/abort/.hg/strip-backup/4dc06258baa6-dff4ef05-backup.hg
$ hg log -G $ hg log -G
@ 18:ee118ab9fa44 (secret) k @ 18:ee118ab9fa44 (secret) k
| |
o 17:3a6c53ee7f3d (secret) j o 17:3a6c53ee7f3d (secret) j
| |