This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12024

shelve: attempt to make merge labels more helpful
ClosedPublic

Authored by martinvonz on Jan 21 2022, 6:31 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbcc4820242cf: shelve: attempt to make merge labels more helpful

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

martinvonz created this revision.Jan 21 2022, 6:31 PM
Alphare accepted this revision.Jan 24 2022, 5:39 AM
This revision is now accepted and ready to land.Jan 24 2022, 5:39 AM
martinvonz added a commit: rHGbcc4820242cf: shelve: attempt to make merge labels more helpful.Jan 24 2022, 12:34 PM
Closed by commit rHGbcc4820242cf: shelve: attempt to make merge labels more helpful (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (6 lines)
Mtests/test-shelve.t (4 lines)
Mtests/test-shelve2.t (12 lines)

Diff 31837

mercurial/shelve.py

(b'ui', b'forcemerge'): opts.get(b'tool', b''), (b'ui', b'forcemerge'): opts.get(b'tool', b''),
(b'phases', b'new-commit'): phases.secret, (b'phases', b'new-commit'): phases.secret,
} }
with repo.ui.configoverride(overrides, b'unshelve'): with repo.ui.configoverride(overrides, b'unshelve'):
ui.status(_(b'rebasing shelved changes\n')) ui.status(_(b'rebasing shelved changes\n'))
stats = merge.graft( stats = merge.graft(
repo, repo,
shelvectx, shelvectx,
labels=[b'working-copy', b'shelve'], labels=[
b'working-copy',
b'shelved change',
b'parent of shelved change',
],
keepconflictparent=True, keepconflictparent=True,
) )
if stats.unresolvedcount: if stats.unresolvedcount:
tr.close() tr.close()
nodestoremove = [ nodestoremove = [
repo.changelog.node(rev) repo.changelog.node(rev)
for rev in pycompat.xrange(oldtiprev, len(repo)) for rev in pycompat.xrange(oldtiprev, len(repo))

tests/test-shelve.t

R d R d
? a/a.orig ? a/a.orig
$ hg diff $ hg diff
diff --git a/a/a b/a/a diff --git a/a/a b/a/a
--- a/a/a --- a/a/a
+++ b/a/a +++ b/a/a
@@ -1,2 +1,6 @@ @@ -1,2 +1,6 @@
a a
+<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit
c c
+======= +=======
+a +a
+>>>>>>> shelve: 203c9f771d2b - shelve: changes to: [mq]: second.patch +>>>>>>> shelved change: 203c9f771d2b - shelve: changes to: [mq]: second.patch
diff --git a/b/b b/b.rename/b diff --git a/b/b b/b.rename/b
rename from b/b rename from b/b
rename to b.rename/b rename to b.rename/b
diff --git a/c b/c.copy diff --git a/c b/c.copy
copy from c copy from c
copy to c.copy copy to c.copy
diff --git a/d b/d diff --git a/d b/d
deleted file mode 100644 deleted file mode 100644

tests/test-shelve2.t

o 0 a test 1970-01-01 00:00 +0000 o 0 a test 1970-01-01 00:00 +0000
#endif #endif
$ hg st $ hg st
M f M f
? f.orig ? f.orig
$ cat f $ cat f
<<<<<<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit <<<<<<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit
g g
======= =======
f f
>>>>>>> shelve: aef214a5229c - shelve: changes to: commit stuff >>>>>>> shelved change: aef214a5229c - 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
unshelve of 'default' aborted unshelve of 'default' aborted
$ hg st $ hg st
M a M a
? f.orig ? f.orig
merging f merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark') warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[240] [240]
$ hg st $ hg st
M f M f
? f.orig ? f.orig
$ cat f $ cat f
<<<<<<< working-copy: 6b563750f973 - test: intermediate other change <<<<<<< working-copy: 6b563750f973 - test: intermediate other change
g g
======= =======
f f
>>>>>>> shelve: aef214a5229c - shelve: changes to: commit stuff >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff
$ cat f.orig $ cat f.orig
g g
#if abortcommand #if abortcommand
when in dry-run mode when in dry-run mode
$ hg abort --dry-run $ hg abort --dry-run
unshelve in progress, will be aborted unshelve in progress, will be aborted
#endif #endif
$ hg shelve -q $ hg shelve -q
$ echo "this is in wdir, conflicts with shelve" >> foo $ echo "this is in wdir, conflicts with shelve" >> foo
$ hg unshelve -q $ hg unshelve -q
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[240] [240]
$ cat foo $ cat foo
r0 r0
<<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit <<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit
this is in wdir, conflicts with shelve this is in wdir, conflicts with shelve
======= =======
this will be shelved this will be shelved
>>>>>>> shelve: 9c072a2163db - shelve: changes to: r0 >>>>>>> shelved change: 9c072a2163db - shelve: changes to: r0
$ cd .. $ cd ..