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
Lint Skipped
Unit
Unit Tests Skipped

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 ↗(On Diff #15834)

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

PathPackages
Mhgext/histedit.py (16 lines)
Mtests/test-abort.t (261 lines)

Diff 15754

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, **opts):
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 = False
if opts.get('no_backup'):
nobackup = True
if opts.get('dry_run'):
return 0
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-abort.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> shelve= > shelve=
> mq = > mq =
> histedit =
> [phases] > [phases]
> publish=False > publish=False
> > [experimental]
> evolution.createmarkers=True
> evolution.allowunstable=True
> [alias] > [alias]
> tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n" > tglog = log -G --template "{rev}:{phase} '{desc}' {branches}\n"
> EOF > EOF
####TEST `hg abort` operation rebase ####TEST `hg abort` operation rebase
$ hg init a $ hg init a
$ cd a $ cd a
abort: unshelve does not support no-backup flag abort: unshelve does not support no-backup flag
[255] [255]
normal abort normal abort
$ hg abort $ hg abort
unshelve of 'default' aborted unshelve of 'default' aborted
$ cd .. $ cd ..
####TEST `hg abort` operation histedit
$ cat >> $HGRCPATH << EOF
> [ui]
> logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n
> EOF
$ hg init base
$ cd base
$ for x in a b c d e f ; do
> echo $x > $x
> hg add $x
> hg ci -m $x
> done
$ hg log --graph
@ 5:652413bf663e (draft) f
|
o 4:e860deea161a (draft) e
|
o 3:055a42cdd887 (draft) d
|
o 2:177f92b77385 (draft) c
|
o 1:d2ae7f538514 (draft) b
|
o 0:cb9a9f314b8b (draft) a
$ HGEDITOR=cat hg histedit 1
pick d2ae7f538514 1 b
pick 177f92b77385 2 c
pick 055a42cdd887 3 d
pick e860deea161a 4 e
pick 652413bf663e 5 f
# Edit history between d2ae7f538514 and 652413bf663e
#
# Commits are listed from least to most recent
#
# You can reorder changesets by reordering the lines
#
# Commands:
#
# e, edit = use commit, but stop for amending
# m, mess = edit commit message without changing commit content
# p, pick = use commit
# b, base = checkout changeset and apply further changesets from there
# d, drop = remove commit from history
# f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date
#
$ hg histedit 1 --commands - --verbose <<EOF | grep histedit
> pick 177f92b77385 2 c
> drop d2ae7f538514 1 b
> pick 055a42cdd887 3 d
> fold e860deea161a 4 e
> pick 652413bf663e 5 f
> EOF
[1]
$ hg log --graph --hidden
@ 10:cacdfd884a93 (draft) f
|
o 9:59d9f330561f (draft) d
|
| x 8:b558abc46d09 (draft) fold-temp-revision e860deea161a
| |
| x 7:96e494a2d553 (draft) d
|/
o 6:b346ab9a313d (draft) c
|
| x 5:652413bf663e (draft) f
| |
| x 4:e860deea161a (draft) e
| |
| x 3:055a42cdd887 (draft) d
| |
| x 2:177f92b77385 (draft) c
| |
| x 1:d2ae7f538514 (draft) b
|/
o 0:cb9a9f314b8b (draft) a
$ hg debugobsolete
d2ae7f538514cd87c17547b0de4cea71fe1af9fb 0 {cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'histedit', 'user': 'test'}
177f92b773850b59254aa5e923436f921b55483b b346ab9a313db8537ecf96fca3ca3ca984ef3bd7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'histedit', 'user': 'test'}
055a42cdd88768532f9cf79daa407fc8d138de9b 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'histedit', 'user': 'test'}
e860deea161a2f77de56603b340ebbb4536308ae 59d9f330561fd6c88b1a6b32f0e45034d88db784 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'histedit', 'user': 'test'}
652413bf663ef2a641cab26574e46d5f5a64a55a cacdfd884a9321ec4e1de275ef3949fa953a1f83 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'histedit', 'user': 'test'}
96e494a2d553dd05902ba1cee1d94d4cb7b8faed 0 {b346ab9a313db8537ecf96fca3ca3ca984ef3bd7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'histedit', 'user': 'test'}
b558abc46d09c30f57ac31e85a8a3d64d2e906e4 0 {96e494a2d553dd05902ba1cee1d94d4cb7b8faed} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'histedit', 'user': 'test'}
Ensure hidden revision does not prevent histedit
-------------------------------------------------
create an hidden revision
$ hg histedit 6 --commands - << EOF
> pick b346ab9a313d 6 c
> drop 59d9f330561f 7 d
> pick cacdfd884a93 8 f
> EOF
$ hg log --graph
@ 11:c13eb81022ca (draft) f
|
o 6:b346ab9a313d (draft) c
|
o 0:cb9a9f314b8b (draft) a
check hidden revision are ignored (6 have hidden children 7 and 8)
$ hg histedit 6 --commands - << EOF
> pick b346ab9a313d 6 c
> pick c13eb81022ca 8 f
> EOF
Test phases support
===========================================
Check that histedit respect immutability
-------------------------------------------
$ cat >> $HGRCPATH << EOF
> [ui]
> logtemplate= {rev}:{node|short} ({phase}) {desc|firstline}\n
> EOF
$ hg ph -pv '.^'
phase changed for 2 changesets
$ hg log -G
@ 11:c13eb81022ca (draft) f
|
o 6:b346ab9a313d (public) c
|
o 0:cb9a9f314b8b (public) a
$ hg histedit -r '.~2'
abort: cannot edit public changeset: cb9a9f314b8b
(see 'hg help phases' for details)
[255]
Prepare further testing
-------------------------------------------
$ for x in g h i j k ; do
> echo $x > $x
> hg add $x
> hg ci -m $x
> done
$ hg phase --force --secret .~2
$ hg log -G
@ 16:9760be57ca09 (secret) k
|
o 15:139d1fe0be2e (secret) j
|
o 14:5f3453928107 (secret) i
|
o 13:c205b3dc9a3c (draft) h
|
o 12:b7fead4e1227 (draft) g
|
o 11:c13eb81022ca (draft) f
|
o 6:b346ab9a313d (public) c
|
o 0:cb9a9f314b8b (public) a
$ cd ..
Check abort behavior
-------------------------------------------
We checks that abort properly clean the repository so the same histedit can be
attempted later.
$ cd base
$ hg log -G
@ 16:9760be57ca09 (secret) k
|
o 15:139d1fe0be2e (secret) j
|
o 14:5f3453928107 (secret) i
|
o 13:c205b3dc9a3c (draft) h
|
o 12:b7fead4e1227 (draft) g
|
o 11:c13eb81022ca (draft) f
|
o 6:b346ab9a313d (public) c
|
o 0:cb9a9f314b8b (public) a
$ hg histedit -r 'c13eb81022ca' --commands - << EOF
> pick c13eb81022ca 13 f
> pick c205b3dc9a3c 15 h
> pick b7fead4e1227 14 g
> pick 5f3453928107 16 i
> roll 139d1fe0be2e 17 j
> edit 9760be57ca09 18 k
> EOF
Editing (9760be57ca09), you may commit or record as needed now.
(hg histedit --continue to resume)
[1]
when in dry-run mode
$ hg abort --dry-run
aborting histedit
when dry-run mode is used with no backup
$ hg abort --dry-run --no-backup
aborting histedit
normal abort
$ hg abort
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/a/base/.hg/strip-backup/e5be0ec66c6b-5a90294a-backup.hg
$ hg log -G
@ 16:9760be57ca09 (secret) k
|
o 15:139d1fe0be2e (secret) j
|
o 14:5f3453928107 (secret) i
|
o 13:c205b3dc9a3c (draft) h
|
o 12:b7fead4e1227 (draft) g
|
o 11:c13eb81022ca (draft) f
|
o 6:b346ab9a313d (public) c
|
o 0:cb9a9f314b8b (public) a
No-backup mode
$ hg histedit -r 'c13eb81022ca' --commands - << EOF
> pick c13eb81022ca 13 f
> pick c205b3dc9a3c 15 h
> pick b7fead4e1227 14 g
> pick 5f3453928107 16 i
> roll 139d1fe0be2e 17 j
> edit 9760be57ca09 18 k
> EOF
Editing (9760be57ca09), you may commit or record as needed now.
(hg histedit --continue to resume)
[1]
$ hg abort --no-backup
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
When no histedit is in progress
$ hg abort
abort: no operation in progress
[255]