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

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6181

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

Authored by martinvonz on Apr 2 2019, 12:50 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8de1b5a009ee: localrepo: rename crev in _filecommit() to cnode, since it's a node
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (12 lines)

Diff 14619

mercurial/localrepo.py

# #
# this allows this merge to succeed: # this allows this merge to succeed:
# #
# 0 --- 1 --- 3 rev4 reverts the content change from rev2 # 0 --- 1 --- 3 rev4 reverts the content change from rev2
# \ / merging rev3 and rev4 should use bar@rev2 # \ / merging rev3 and rev4 should use bar@rev2
# \- 2 --- 4 as the merge base # \- 2 --- 4 as the merge base
# #
crev = manifest1.get(cfname) cnode = manifest1.get(cfname)
newfparent = fparent2 newfparent = fparent2
if manifest2: # branch merge 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: if cfname in manifest2:
crev = manifest2[cfname] cnode= manifest2[cfname]
newfparent = fparent1 newfparent = fparent1
# Here, we used to search backwards through history to try to find # Here, we used to search backwards through history to try to find
# where the file copy came from if the source of a copy was not in # where the file copy came from if the source of a copy was not in
# the parent directory. However, this doesn't actually make sense to # the parent directory. However, this doesn't actually make sense to
# do (what does a copy from something not in your working copy even # do (what does a copy from something not in your working copy even
# mean?) and it causes bugs (eg, issue4476). Instead, we will warn # mean?) and it causes bugs (eg, issue4476). Instead, we will warn
# the user that copy information was dropped, so if they didn't # the user that copy information was dropped, so if they didn't
# expect this outcome it can be fixed, but this is the correct # expect this outcome it can be fixed, but this is the correct
# behavior in this circumstance. # behavior in this circumstance.
if crev: if cnode:
self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev))) self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(cnode)))
meta["copy"] = cfname meta["copy"] = cfname
meta["copyrev"] = hex(crev) meta["copyrev"] = hex(cnode)
fparent1, fparent2 = nullid, newfparent fparent1, fparent2 = nullid, newfparent
else: else:
self.ui.warn(_("warning: can't find ancestor for '%s' " self.ui.warn(_("warning: can't find ancestor for '%s' "
"copied from '%s'!\n") % (fname, cfname)) "copied from '%s'!\n") % (fname, cfname))
elif fparent1 == nullid: elif fparent1 == nullid:
fparent1, fparent2 = fparent2, nullid fparent1, fparent2 = fparent2, nullid
elif fparent2 != nullid: elif fparent2 != nullid: