This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

Commit 30c31de4 authored by Pulkit Goyal's avatar Pulkit Goyal
Browse files

extdiff: add comments and minor variable renames diffpatch()

Some variable names were now confusing as we refactored the code in a separate
function. For example, `node1a` leads to ideas why `1a` and not `1`. The
variable storing path to patch file was named as `dirX` instead of `fileX`.
Renamed these variables and added couple of comments.

Differential Revision: https://phab.mercurial-scm.org/D8689
parent d23881b17388
...@@ -350,5 +350,5 @@ ...@@ -350,5 +350,5 @@
proc.wait() proc.wait()
def diffpatch(ui, repo, node1a, node2, tmproot, matcher, cmdline): def diffpatch(ui, repo, node1, node2, tmproot, matcher, cmdline):
template = b'hg-%h.patch' template = b'hg-%h.patch'
...@@ -354,4 +354,5 @@ ...@@ -354,4 +354,5 @@
template = b'hg-%h.patch' template = b'hg-%h.patch'
# write patches to temporary files
with formatter.nullformatter(ui, b'extdiff', {}) as fm: with formatter.nullformatter(ui, b'extdiff', {}) as fm:
cmdutil.export( cmdutil.export(
repo, repo,
...@@ -355,8 +356,8 @@ ...@@ -355,8 +356,8 @@
with formatter.nullformatter(ui, b'extdiff', {}) as fm: with formatter.nullformatter(ui, b'extdiff', {}) as fm:
cmdutil.export( cmdutil.export(
repo, repo,
[repo[node1a].rev(), repo[node2].rev()], [repo[node1].rev(), repo[node2].rev()],
fm, fm,
fntemplate=repo.vfs.reljoin(tmproot, template), fntemplate=repo.vfs.reljoin(tmproot, template),
match=matcher, match=matcher,
) )
...@@ -359,6 +360,6 @@ ...@@ -359,6 +360,6 @@
fm, fm,
fntemplate=repo.vfs.reljoin(tmproot, template), fntemplate=repo.vfs.reljoin(tmproot, template),
match=matcher, match=matcher,
) )
label1a = cmdutil.makefilename(repo[node1a], template) label1 = cmdutil.makefilename(repo[node1], template)
label2 = cmdutil.makefilename(repo[node2], template) label2 = cmdutil.makefilename(repo[node2], template)
...@@ -364,8 +365,6 @@ ...@@ -364,8 +365,6 @@
label2 = cmdutil.makefilename(repo[node2], template) label2 = cmdutil.makefilename(repo[node2], template)
dir1a = repo.vfs.reljoin(tmproot, label1a) file1 = repo.vfs.reljoin(tmproot, label1)
dir2 = repo.vfs.reljoin(tmproot, label2) file2 = repo.vfs.reljoin(tmproot, label2)
dir1b = None
label1b = None
cmdline = formatcmdline( cmdline = formatcmdline(
cmdline, cmdline,
repo.root, repo.root,
...@@ -369,10 +368,5 @@ ...@@ -369,10 +368,5 @@
cmdline = formatcmdline( cmdline = formatcmdline(
cmdline, cmdline,
repo.root, repo.root,
parent1=dir1a,
plabel1=label1a,
parent2=dir1b,
plabel2=label1b,
child=dir2,
# no 3way while comparing patches # no 3way while comparing patches
do3way=False, do3way=False,
...@@ -377,5 +371,11 @@ ...@@ -377,5 +371,11 @@
# no 3way while comparing patches # no 3way while comparing patches
do3way=False, do3way=False,
parent1=file1,
plabel1=label1,
# while comparing patches, there is no second parent
parent2=None,
plabel2=None,
child=file2,
clabel=label2, clabel=label2,
) )
ui.debug(b'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot)) ui.debug(b'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment