This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3688

shelve: directly handle the abort process
ClosedPublic

Authored by lothiraldan on Jun 5 2018, 6:56 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG61e4cf1be5b2: shelve: directly handle the abort process
Summary

Shelve is currently sub-contracting some of its work to the rebase extension.
In order to make shelve more independent and flexible we would like shelve to
handle the parent alignment directly.

This change starts with the simplest bits, handling the abort process. It
turns out we have all the necessary bits in the shelvestate file. So we do
not need anything from the interrupted rebase.

As a nice side effect, a test about missing shelverebasestate state file now
behave better.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Jun 5 2018, 6:56 AM
durin42 accepted this revision.Jun 25 2018, 10:51 AM
This revision is now accepted and ready to land.Jun 25 2018, 10:51 AM
Closed by commit rHG61e4cf1be5b2: shelve: directly handle the abort process (authored by lothiraldan). · Explain WhyJun 25 2018, 11:21 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/shelve.py (16 lines)
Mtests/test-shelve.t (10 lines)

Diff 8976

hgext/shelve.py

return [repo.pathto(f, cwd) for f in files] return [repo.pathto(f, cwd) for f in files]
def unshelveabort(ui, repo, state, opts): def unshelveabort(ui, repo, state, opts):
"""subcommand that abort an in-progress unshelve""" """subcommand that abort an in-progress unshelve"""
with repo.lock(): with repo.lock():
try: try:
checkparents(repo, state) checkparents(repo, state)
merge.update(repo, state.pendingctx, False, True)
if (state.activebookmark
and state.activebookmark in repo._bookmarks):
bookmarks.activate(repo, state.activebookmark)
if repo.vfs.exists('unshelverebasestate'):
repo.vfs.rename('unshelverebasestate', 'rebasestate') repo.vfs.rename('unshelverebasestate', 'rebasestate')
try: rebase.clearstatus(repo)
rebase.rebase(ui, repo, **{
r'abort' : True
})
except Exception:
repo.vfs.rename('rebasestate', 'unshelverebasestate')
raise
mergefiles(ui, repo, state.wctx, state.pendingctx) mergefiles(ui, repo, state.wctx, state.pendingctx)
repair.strip(ui, repo, state.nodestoremove, backup=False, repair.strip(ui, repo, state.nodestoremove, backup=False,
topic='shelve') topic='shelve')
finally: finally:
shelvedstate.clear(repo) shelvedstate.clear(repo)
ui.warn(_("unshelve of '%s' aborted\n") % state.name) ui.warn(_("unshelve of '%s' aborted\n") % state.name)

tests/test-shelve.t

$ hg status $ hg status
M a/a M a/a
M b.rename/b M b.rename/b
M c.copy M c.copy
R b/b R b/b
? a/a.orig ? a/a.orig
$ hg unshelve -a $ hg unshelve -a
rebase aborted
unshelve of 'default' aborted unshelve of 'default' aborted
$ hg heads -q $ hg heads -q
3:2e69b451d1ea 3:2e69b451d1ea
$ hg parents $ hg parents
changeset: 3:2e69b451d1ea changeset: 3:2e69b451d1ea
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
g g
======= =======
f f
>>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff >>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff
$ cat f.orig $ cat f.orig
g g
$ hg unshelve --abort -t false $ hg unshelve --abort -t false
tool option will be ignored tool option will be ignored
rebase aborted
unshelve of 'default' aborted unshelve of 'default' aborted
$ hg st $ hg st
M a M a
? f.orig ? f.orig
$ cat f.orig $ cat f.orig
g g
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
<<<<<<< dest: * - test: intermediate other change (glob) <<<<<<< dest: * - test: intermediate other change (glob)
g g
======= =======
f f
>>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff >>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff
$ cat f.orig $ cat f.orig
g g
$ hg unshelve --abort $ hg unshelve --abort
rebase aborted
unshelve of 'default' aborted unshelve of 'default' aborted
$ hg st $ hg st
? f.orig ? f.orig
$ cat f.orig $ cat f.orig
g g
$ hg shelve --delete default $ hg shelve --delete default
Recreate some conflict again Recreate some conflict again
$ rm -rf .hg/origbackups $ rm -rf .hg/origbackups
test Abort unshelve always gets user out of the unshelved state test Abort unshelve always gets user out of the unshelved state
--------------------------------------------------------------- ---------------------------------------------------------------
Wreak havoc on the unshelve process Wreak havoc on the unshelve process
$ rm .hg/unshelverebasestate $ rm .hg/unshelverebasestate
$ hg unshelve --abort $ hg unshelve --abort
unshelve of 'default' aborted unshelve of 'default' aborted
abort: $ENOENT$* (glob)
[255]
Can the user leave the current state?
$ hg up -C .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Try again but with a corrupted shelve state file Try again but with a corrupted shelve state file
$ hg strip -r 406ad6fb39eb -r e22bdf25c863 -q
$ hg up -r 0 -q $ hg up -r 0 -q
$ echo '' > root $ echo '' > root
$ hg shelve -q $ hg shelve -q
$ echo 'contADDent' > root $ echo 'contADDent' > root
$ hg unshelve -q $ hg unshelve -q
warning: conflicts while merging root! (edit, then use 'hg resolve --mark') warning: conflicts while merging root! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate
$ mv ../corrupt-shelvedstate .hg/histedit-state $ mv ../corrupt-shelvedstate .hg/histedit-state
$ hg unshelve --abort 2>&1 | grep 'aborted' $ hg unshelve --abort 2>&1 | grep 'aborted'
rebase aborted
unshelve of 'default-01' aborted unshelve of 'default-01' aborted
$ hg summary $ hg summary
parent: 0:ae8c668541e8 tip parent: 0:ae8c668541e8 tip
root root
branch: default branch: default
commit: 1 modified, 1 unknown commit: 1 modified, 1 unknown
update: (current) update: (current)
phases: 1 draft phases: 1 draft