D642: checknlink: renmae file object from 'fd' to 'fp'
quark (Jun Wu)
phabricator at mercurial-scm.org
Wed Sep 6 21:11:36 UTC 2017
quark created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Make it clear that `fp` (`file` object) is different from `fd` (low-level
file descriptor number).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D642
AFFECTED FILES
mercurial/util.py
CHANGE DETAILS
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1457,24 +1457,23 @@
# testfile may be open, so we need a separate file for checking to
# work around issue2543 (or testfile may get lost on Samba shares)
- f1, f2, fd = None, None, None
+ f1, f2, fp = None, None, None
try:
fd, f1 = tempfile.mkstemp(prefix='.%s-' % os.path.basename(testfile),
suffix='1~', dir=os.path.dirname(testfile))
os.close(fd)
- fd = None
f2 = '%s2~' % f1[:-2]
oslink(f1, f2)
# nlinks() may behave differently for files on Windows shares if
# the file is open.
- fd = posixfile(f2)
+ fp = posixfile(f2)
return nlinks(f2) > 1
except OSError:
return False
finally:
- if fd is not None:
- fd.close()
+ if fp is not None:
+ fp.close()
for f in (f1, f2):
try:
if f is not None:
To: quark, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list