[Updated] D8504: diff: add experimental support for "merge diffs"
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Mon May 11 22:23:06 UTC 2020
durin42 edited the summary of this revision.
durin42 updated this revision to Diff 21342.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8504?vs=21341&id=21342
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8504/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8504
AFFECTED FILES
mercurial/commands.py
tests/test-completion.t
tests/test-diff-change.t
CHANGE DETAILS
diff --git a/tests/test-diff-change.t b/tests/test-diff-change.t
--- a/tests/test-diff-change.t
+++ b/tests/test-diff-change.t
@@ -141,4 +141,105 @@
9
10
+merge diff should show only manual edits to a merge:
+
+ $ hg diff --merge -c 6
+ merging file.txt
+(no diff output is expected here)
+
+Construct an "evil merge" that does something other than just the merge.
+
+ $ hg co ".^"
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg merge -r 5
+ merging file.txt
+ 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+ $ echo 11 >> file.txt
+ $ hg ci -m 'merge 8 to y with manual edit of 11' # 7
+ created new head
+ $ hg diff -c 7
+ diff -r 273b50f17c6d -r 8ad85e839ba7 file.txt
+ --- a/file.txt Thu Jan 01 00:00:00 1970 +0000
+ +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
+ @@ -6,6 +6,7 @@
+ 5
+ 6
+ 7
+ -8
+ +y
+ 9
+ 10
+ +11
+Contrast with the `hg diff -c 7` version above: only the manual edit shows
+up, making it easy to identify changes someone is otherwise trying to sneak
+into a merge.
+ $ hg diff --merge -c 7
+ merging file.txt
+ diff -r 8ad85e839ba7 file.txt
+ --- a/file.txt Thu Jan 01 00:00:00 1970 +0000
+ +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
+ @@ -9,3 +9,4 @@
+ y
+ 9
+ 10
+ +11
+
+Set up a conflict.
+ $ hg co ".^"
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ sed -e 's,^8$,z,' file.txt > file.txt.tmp
+ $ mv file.txt.tmp file.txt
+ $ hg ci -m 'conflicting edit: 8 to z'
+ created new head
+ $ echo "this file is new in p1 of the merge" > new-file-p1.txt
+ $ hg ci -Am 'new file' new-file-p1.txt
+ $ hg log -r . --template 'p1 will be rev {rev}\n'
+ p1 will be rev 9
+ $ hg co 5
+ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ echo "this file is new in p2 of the merge" > new-file-p2.txt
+ $ hg ci -Am 'new file' new-file-p2.txt
+ created new head
+ $ hg log -r . --template 'p2 will be rev {rev}\n'
+ p2 will be rev 10
+ $ hg co -- 9
+ 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ hg merge -r 10
+ merging file.txt
+ warning: conflicts while merging file.txt! (edit, then use 'hg resolve --mark')
+ 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+ [1]
+ $ hg revert file.txt -r .
+ $ hg resolve -ma
+ (no more unresolved files)
+ $ hg commit -m 'merge conflicted edit'
+Without --merge, it's a diff against p1
+ $ hg diff --no-merge -c 11
+ diff -r fd1f17c90d7c -r 5010caab09f6 new-file-p2.txt
+ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+ +++ b/new-file-p2.txt Thu Jan 01 00:00:00 1970 +0000
+ @@ -0,0 +1,1 @@
+ +this file is new in p2 of the merge
+With --merge, it's a diff against the conflicted content.
+ $ hg diff --merge -c 11
+ diff -r 273b50f17c6d -r cd8ec38ff23b file.txt
+ --- a/file.txt Thu Jan 01 00:00:00 1970 +0000
+ +++ b/file.txt Thu Jan 01 00:00:00 1970 +0000
+ @@ -6,10 +6,6 @@
+ 5
+ 6
+ 7
+ -<<<<<<< working copy: fd1f17c90d7c - test: new file
+ z
+ -=======
+ -y
+ ->>>>>>> merge rev: 9085c5c02e52 - test: change 8 to y
+ 9
+ 10
+
+There must _NOT_ be a .hg/merge directory leftover.
+ $ test ! -e .hg/merge
+
$ cd ..
diff --git a/tests/test-completion.t b/tests/test-completion.t
--- a/tests/test-completion.t
+++ b/tests/test-completion.t
@@ -325,7 +325,7 @@
debugwhyunstable:
debugwireargs: three, four, five, ssh, remotecmd, insecure
debugwireproto: localssh, peer, noreadstderr, nologhandshake, ssh, remotecmd, insecure
- diff: rev, change, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
+ diff: rev, change, merge, text, git, binary, nodates, noprefix, show-function, reverse, ignore-all-space, ignore-space-change, ignore-blank-lines, ignore-space-at-eol, unified, stat, root, include, exclude, subrepos
export: bookmark, output, switch-parent, rev, text, git, binary, nodates, template
files: rev, print0, include, exclude, template, subrepos
forget: interactive, include, exclude, dry-run
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -29,6 +29,7 @@
bundle2,
changegroup,
cmdutil,
+ context as contextmod,
copies,
debugcommands as debugcommandsmod,
destutil,
@@ -2406,6 +2407,16 @@
[
(b'r', b'rev', [], _(b'revision'), _(b'REV')),
(b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
+ (
+ b'',
+ b'merge',
+ False,
+ _(
+ b'show difference between auto-merge and committed '
+ b'merge for merge commits (EXPERIMENTAL)'
+ ),
+ _(b'REV'),
+ ),
]
+ diffopts
+ diffopts2
@@ -2481,11 +2492,26 @@
change = opts.get(b'change')
stat = opts.get(b'stat')
reverse = opts.get(b'reverse')
+ diffmerge = opts.get(b'merge')
if change:
repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn')
ctx2 = scmutil.revsingle(repo, change, None)
- ctx1 = ctx2.p1()
+ if diffmerge and ctx2.p2().node() != nullid:
+ mctx = ctx2
+ ctx1 = mctx.p1()
+ ctx2 = mctx.p2()
+ wctx = contextmod.overlayworkingctx(repo)
+ wctx.setbase(ctx1)
+ with ui.configoverride({
+ (b'ui', b'forcemerge'): b'internal:merge',
+ },
+ b'diff --merge'):
+ stats = mergemod.merge(ctx2, wc=wctx)
+ ctx1 = wctx
+ ctx2 = mctx
+ else:
+ ctx1 = ctx2.p1()
else:
repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn')
ctx1, ctx2 = scmutil.revpair(repo, revs)
To: durin42, #hg-reviewers
Cc: martinvonz, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20200511/7a6e3abd/attachment-0002.html>
More information about the Mercurial-patches
mailing list