Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: add comments and minor variable renames diffpatch()
authorPulkit Goyal <7895pulkit@gmail.com>
Tue, 07 Jul 2020 13:26:57 +0530
changeset 45129 30c31de4d1db
parent 45128 d23881b17388
child 45130 33524b6bef53
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
hgext/extdiff.py file | annotate | diff | comparison | revisions 
--- a/hgext/extdiff.py	Tue Jul 07 13:24:13 2020 +0530
+++ b/hgext/extdiff.py	Tue Jul 07 13:26:57 2020 +0530
@@ -350,32 +350,32 @@
                 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'
+    # 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))
mercurial