This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6724

unshelve: forget unknown files after a partial unshelve
ClosedPublic

Authored by navaneeth.suresh on Aug 13 2019, 1:21 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGd684449eef67: unshelve: forget unknown files after a partial unshelve
Summary

This is a follow-up patch to 6957f7b93e03. This allows hg to forget
unknown files after a partial unshelve.

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

pulkit accepted this revision.Aug 13 2019, 4:32 PM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
mercurial/shelve.py
1010

Can you add a comment here about why we don't perform unshelvecleanup() in the case of partial unshelve?

This revision is now accepted and ready to land.Aug 13 2019, 4:32 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (2 lines)
Mtests/test-shelve.t (27 lines)

Diff 16180

mercurial/shelve.py

tr, oldtiprev, basename, pctx, tmpwctx, shelvectx, tr, oldtiprev, basename, pctx, tmpwctx, shelvectx,
branchtorestore, activebookmark) branchtorestore, activebookmark)
overrides = {('ui', 'forcemerge'): opts.get('tool', '')} overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'unshelve'): with ui.configoverride(overrides, 'unshelve'):
mergefiles(ui, repo, pctx, shelvectx) mergefiles(ui, repo, pctx, shelvectx)
restorebranch(ui, repo, branchtorestore) restorebranch(ui, repo, branchtorestore)
shelvedstate.clear(repo) shelvedstate.clear(repo)
_finishunshelve(repo, oldtiprev, tr, activebookmark) _finishunshelve(repo, oldtiprev, tr, activebookmark)
if not ispartialunshelve:
_forgetunknownfiles(repo, shelvectx, addedbefore) _forgetunknownfiles(repo, shelvectx, addedbefore)
if not ispartialunshelve:
unshelvecleanup(ui, repo, basename, opts) unshelvecleanup(ui, repo, basename, opts)
pulkitUnsubmitted
Not Done

Can you add a comment here about why we don't perform unshelvecleanup() in the case of partial unshelve?

pulkit: Can you add a comment here about why we don't perform `unshelvecleanup()` in the case of…
finally: finally:
if tr: if tr:
tr.release() tr.release()
lockmod.release(lock) lockmod.release(lock)

tests/test-shelve.t

$ echo B > foo $ echo B > foo
$ hg add foo $ hg add foo
$ hg ci -m 'add B to foo' $ hg ci -m 'add B to foo'
$ cat > foo <<EOF $ cat > foo <<EOF
> A > A
> B > B
> C > C
> EOF > EOF
$ hg shelve $ echo > garbage
$ hg st
M foo
? garbage
$ hg shelve --unknown
shelved as default shelved as default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cat foo $ cat foo
B B
$ hg unshelve -i <<EOF $ hg unshelve -i <<EOF
> y > y
> y > y
> n > n
> y
> y
> EOF > EOF
unshelving change 'default' unshelving change 'default'
rebasing shelved changes rebasing shelved changes
diff --git a/foo b/foo diff --git a/foo b/foo
2 hunks, 2 lines changed 2 hunks, 2 lines changed
examine changes to 'foo'? examine changes to 'foo'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
+A +A
B B
record change 1/2 to 'foo'? record change 1/3 to 'foo'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
@@ -1,1 +2,2 @@ @@ -1,1 +2,2 @@
B B
+C +C
record change 2/2 to 'foo'? record change 2/3 to 'foo'?
(enter ? for help) [Ynesfdaq?] n (enter ? for help) [Ynesfdaq?] n
diff --git a/garbage b/garbage
new file mode 100644
examine changes to 'garbage'?
(enter ? for help) [Ynesfdaq?] y
@@ -0,0 +1,1 @@
+
record change 3/3 to 'garbage'?
(enter ? for help) [Ynesfdaq?] y
$ hg st
M foo
? garbage
$ cat foo $ cat foo
A A
B B
$ hg shelve --patch $ hg shelve --patch
default (*s ago) changes to: add B to foo (glob) default (*s ago) changes to: add B to foo (glob)
diff --git a/foo b/foo diff --git a/foo b/foo
--- a/foo --- a/foo