D6181: localrepo: rename crev in _filecommit() to cnode, since it's a node

2019-04-04 Thread martinvonz (Martin von Zweigbergk) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8de1b5a009ee: localrepo: rename crev in _filecommit() to 
cnode, since its a node (authored by martinvonz, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D6181?vs=14619=14656#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6181?vs=14619=14656

REVISION DETAIL
  https://phab.mercurial-scm.org/D6181

AFFECTED FILES
  mercurial/localrepo.py

CHANGE DETAILS

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2342,13 +2342,13 @@
 #\- 2 --- 4as the merge base
 #
 
-crev = manifest1.get(cfname)
+cnode = manifest1.get(cfname)
 newfparent = fparent2
 
 if manifest2: # branch merge
-if fparent2 == nullid or crev is None: # copied on remote side
+if fparent2 == nullid or cnode is None: # copied on remote side
 if cfname in manifest2:
-crev = manifest2[cfname]
+cnode = manifest2[cfname]
 newfparent = fparent1
 
 # Here, we used to search backwards through history to try to find
@@ -2360,10 +2360,10 @@
 # expect this outcome it can be fixed, but this is the correct
 # behavior in this circumstance.
 
-if crev:
-self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
+if cnode:
+self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, 
hex(cnode)))
 meta["copy"] = cfname
-meta["copyrev"] = hex(crev)
+meta["copyrev"] = hex(cnode)
 fparent1, fparent2 = nullid, newfparent
 else:
 self.ui.warn(_("warning: can't find ancestor for '%s' "



To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D6181: localrepo: rename crev in _filecommit() to cnode, since it's a node

2019-04-02 Thread martinvonz (Martin von Zweigbergk) 
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I know we often use "rev" generically, but here's it always a node, so
  it helps to be specific.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6181

AFFECTED FILES
  mercurial/localrepo.py

CHANGE DETAILS

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -2331,13 +2331,13 @@
 #\- 2 --- 4as the merge base
 #
 
-crev = manifest1.get(cfname)
+cnode = manifest1.get(cfname)
 newfparent = fparent2
 
 if manifest2: # branch merge
-if fparent2 == nullid or crev is None: # copied on remote side
+if fparent2 == nullid or cnode is None: # copied on remote side
 if cfname in manifest2:
-crev = manifest2[cfname]
+cnode= manifest2[cfname]
 newfparent = fparent1
 
 # Here, we used to search backwards through history to try to find
@@ -2349,10 +2349,10 @@
 # expect this outcome it can be fixed, but this is the correct
 # behavior in this circumstance.
 
-if crev:
-self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
+if cnode:
+self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, 
hex(cnode)))
 meta["copy"] = cfname
-meta["copyrev"] = hex(crev)
+meta["copyrev"] = hex(cnode)
 fparent1, fparent2 = nullid, newfparent
 else:
 self.ui.warn(_("warning: can't find ancestor for '%s' "



To: martinvonz, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel