Patchwork D8689: extdiff: add comments and minor variable renames diffpatch()

login
register
mail settings
Submitter phabricator
Date July 7, 2020, 9:28 a.m.
Message ID <differential-rev-PHID-DREV-qh5rnewv2swrwzikubz5-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46642/
State Superseded
Headers show

Comments

phabricator - July 7, 2020, 9:28 a.m.
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




To: pulkit, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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))