We'll want to reuse the logic that hg diff --change with
diff.merge uses. At least hg log -p should reuse it. This patch
therefore extracts that code to a function.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (23 lines) | |||
| M | mercurial/logcmdutil.py (31 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| from .pycompat import open | from .pycompat import open | ||||
| from . import ( | from . import ( | ||||
| archival, | archival, | ||||
| bookmarks, | bookmarks, | ||||
| bundle2, | bundle2, | ||||
| bundlecaches, | bundlecaches, | ||||
| changegroup, | changegroup, | ||||
| cmdutil, | cmdutil, | ||||
| context as contextmod, | |||||
| copies, | copies, | ||||
| debugcommands as debugcommandsmod, | debugcommands as debugcommandsmod, | ||||
| destutil, | destutil, | ||||
| dirstateguard, | dirstateguard, | ||||
| discovery, | discovery, | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| exchange, | exchange, | ||||
| cmdutil.check_at_most_one_arg(opts, 'rev', 'change') | cmdutil.check_at_most_one_arg(opts, 'rev', 'change') | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| revs = opts.get(b'rev') | revs = opts.get(b'rev') | ||||
| change = opts.get(b'change') | change = opts.get(b'change') | ||||
| from_rev = opts.get(b'from') | from_rev = opts.get(b'from') | ||||
| to_rev = opts.get(b'to') | to_rev = opts.get(b'to') | ||||
| stat = opts.get(b'stat') | stat = opts.get(b'stat') | ||||
| reverse = opts.get(b'reverse') | reverse = opts.get(b'reverse') | ||||
| diffmerge = ui.configbool(b'diff', b'merge') | |||||
| cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change']) | cmdutil.check_incompatible_arguments(opts, b'from', [b'rev', b'change']) | ||||
| cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change']) | cmdutil.check_incompatible_arguments(opts, b'to', [b'rev', b'change']) | ||||
| if change: | if change: | ||||
| repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') | repo = scmutil.unhidehashlikerevs(repo, [change], b'nowarn') | ||||
| ctx2 = scmutil.revsingle(repo, change, None) | ctx2 = scmutil.revsingle(repo, change, None) | ||||
| if diffmerge and ctx2.p2().node() != nullid: | ctx1 = logcmdutil.diff_parent(ctx2) | ||||
| pctx1 = ctx2.p1() | |||||
| pctx2 = ctx2.p2() | |||||
| wctx = contextmod.overlayworkingctx(repo) | |||||
| wctx.setbase(pctx1) | |||||
| with ui.configoverride( | |||||
| { | |||||
| ( | |||||
| b'ui', | |||||
| b'forcemerge', | |||||
| ): b'internal:merge3-lie-about-conflicts', | |||||
| }, | |||||
| b'diff --merge', | |||||
| ): | |||||
| repo.ui.pushbuffer() | |||||
| mergemod.merge(pctx2, wc=wctx) | |||||
| repo.ui.popbuffer() | |||||
| ctx1 = wctx | |||||
| else: | |||||
| ctx1 = ctx2.p1() | |||||
| elif from_rev or to_rev: | elif from_rev or to_rev: | ||||
| repo = scmutil.unhidehashlikerevs( | repo = scmutil.unhidehashlikerevs( | ||||
| repo, [from_rev] + [to_rev], b'nowarn' | repo, [from_rev] + [to_rev], b'nowarn' | ||||
| ) | ) | ||||
| ctx1 = scmutil.revsingle(repo, from_rev, None) | ctx1 = scmutil.revsingle(repo, from_rev, None) | ||||
| ctx2 = scmutil.revsingle(repo, to_rev, None) | ctx2 = scmutil.revsingle(repo, to_rev, None) | ||||
| else: | else: | ||||
| repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') | repo = scmutil.unhidehashlikerevs(repo, revs, b'nowarn') | ||||
| from . import ( | from . import ( | ||||
| dagop, | dagop, | ||||
| error, | error, | ||||
| formatter, | formatter, | ||||
| graphmod, | graphmod, | ||||
| match as matchmod, | match as matchmod, | ||||
| mdiff, | mdiff, | ||||
| merge, | |||||
| patch, | patch, | ||||
| pathutil, | pathutil, | ||||
| pycompat, | pycompat, | ||||
| revset, | revset, | ||||
| revsetlang, | revsetlang, | ||||
| scmutil, | scmutil, | ||||
| smartset, | smartset, | ||||
| templatekw, | templatekw, | ||||
| raise error.Abort(_(b'limit must be a positive integer')) | raise error.Abort(_(b'limit must be a positive integer')) | ||||
| if limit <= 0: | if limit <= 0: | ||||
| raise error.Abort(_(b'limit must be positive')) | raise error.Abort(_(b'limit must be positive')) | ||||
| else: | else: | ||||
| limit = None | limit = None | ||||
| return limit | return limit | ||||
| def diff_parent(ctx): | |||||
| """get the context object to use as parent when diffing | |||||
| If diff.merge is enabled, an overlayworkingctx of the auto-merged parents will be returned. | |||||
| """ | |||||
| repo = ctx.repo() | |||||
| if repo.ui.configbool(b"diff", b"merge") and ctx.p2().node() != nullid: | |||||
| # avoid cycle context -> subrepo -> cmdutil -> logcmdutil | |||||
| from . import context | |||||
| wctx = context.overlayworkingctx(repo) | |||||
| wctx.setbase(ctx.p1()) | |||||
| with repo.ui.configoverride( | |||||
| { | |||||
| ( | |||||
| b"ui", | |||||
| b"forcemerge", | |||||
| ): b"internal:merge3-lie-about-conflicts", | |||||
| }, | |||||
| b"merge-diff", | |||||
| ): | |||||
| repo.ui.pushbuffer() | |||||
| merge.merge(ctx.p2(), wc=wctx) | |||||
| repo.ui.popbuffer() | |||||
| return wctx | |||||
| else: | |||||
| return ctx.p1() | |||||
| def diffordiffstat( | def diffordiffstat( | ||||
| ui, | ui, | ||||
| repo, | repo, | ||||
| diffopts, | diffopts, | ||||
| ctx1, | ctx1, | ||||
| ctx2, | ctx2, | ||||
| match, | match, | ||||
| changes=None, | changes=None, | ||||