[Request] [+- ] D8689: extdiff: add comments and minor variable renames diffpatch()
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Tue Jul 7 09:28:04 UTC 2020
pulkit created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REVISION SUMMARY
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.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8689
AFFECTED FILES
hgext/extdiff.py
CHANGE DETAILS
diff --git a/hgext/extdiff.py b/hgext/extdiff.py
--- a/hgext/extdiff.py
+++ b/hgext/extdiff.py
@@ -352,30 +352,30 @@
def diffpatch(ui, repo, node1, node2, tmproot, matcher, cmdline):
template = b'hg-%h.patch'
+ # write patches to temporary files
with formatter.nullformatter(ui, b'extdiff', {}) as fm:
cmdutil.export(
repo,
- [repo[node1a].rev(), repo[node2].rev()],
+ [repo[node1].rev(), repo[node2].rev()],
fm,
fntemplate=repo.vfs.reljoin(tmproot, template),
match=matcher,
)
- label1a = cmdutil.makefilename(repo[node1a], template)
+ label1 = cmdutil.makefilename(repo[node1], template)
label2 = cmdutil.makefilename(repo[node2], template)
- dir1a = repo.vfs.reljoin(tmproot, label1a)
- dir2 = repo.vfs.reljoin(tmproot, label2)
- dir1b = None
- label1b = None
+ file1 = repo.vfs.reljoin(tmproot, label1)
+ file2 = repo.vfs.reljoin(tmproot, label2)
cmdline = formatcmdline(
cmdline,
repo.root,
- parent1=dir1a,
- plabel1=label1a,
- parent2=dir1b,
- plabel2=label1b,
- child=dir2,
# no 3way while comparing patches
do3way=False,
+ parent1=file1,
+ plabel1=label1,
+ # while comparing patches, there is no second parent
+ parent2=None,
+ plabel2=None,
+ child=file2,
clabel=label2,
)
ui.debug(b'running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot))
To: pulkit, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200707/d6315a02/attachment-0001.html>
More information about the Mercurial-patches
mailing list