This is an archive of the discontinued Mercurial Phabricator instance.

Differential D642

checknlink: rename file object from 'fd' to 'fp'
ClosedPublic

Authored by quark on Sep 6 2017, 5:11 PM.

Details

Reviewers
phillco
Group Reviewers
hg-reviewers
Commits
rHG6c5cdb02f2f9: checknlink: rename file object from 'fd' to 'fp'
Summary

Make it clear that fp (file object) is different from fd (low-level
file descriptor number).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Sep 6 2017, 5:11 PM
phillco accepted this revision.Sep 6 2017, 5:38 PM
phillco added a subscriber: phillco.

*rename

LGTM

mercurial/util.py
1460

Too bad there's no similar naming convention for paths.

quark retitled this revision from checknlink: renmae file object from 'fd' to 'fp' to checknlink: rename file object from 'fd' to 'fp'.Sep 6 2017, 8:31 PM
Closed by commit rHG6c5cdb02f2f9: checknlink: rename file object from 'fd' to 'fp' (authored by quark). · Explain WhySep 7 2017, 10:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/util.py (9 lines)

Diff 1664

mercurial/util.py

''' '''
return getattr(osutil, 'getfstype', lambda x: None)(dirpath) return getattr(osutil, 'getfstype', lambda x: None)(dirpath)
def checknlink(testfile): def checknlink(testfile):
'''check whether hardlink count reporting works properly''' '''check whether hardlink count reporting works properly'''
# testfile may be open, so we need a separate file for checking to # testfile may be open, so we need a separate file for checking to
# work around issue2543 (or testfile may get lost on Samba shares) # work around issue2543 (or testfile may get lost on Samba shares)
f1, f2, fd = None, None, None f1, f2, fp = None, None, None
phillcoUnsubmitted
Not Done

Too bad there's no similar naming convention for paths.

phillco: Too bad there's no similar naming convention for paths.
try: try:
fd, f1 = tempfile.mkstemp(prefix='.%s-' % os.path.basename(testfile), fd, f1 = tempfile.mkstemp(prefix='.%s-' % os.path.basename(testfile),
suffix='1~', dir=os.path.dirname(testfile)) suffix='1~', dir=os.path.dirname(testfile))
os.close(fd) os.close(fd)
fd = None
f2 = '%s2~' % f1[:-2] f2 = '%s2~' % f1[:-2]
oslink(f1, f2) oslink(f1, f2)
# nlinks() may behave differently for files on Windows shares if # nlinks() may behave differently for files on Windows shares if
# the file is open. # the file is open.
fd = posixfile(f2) fp = posixfile(f2)
return nlinks(f2) > 1 return nlinks(f2) > 1
except OSError: except OSError:
return False return False
finally: finally:
if fd is not None: if fp is not None:
fd.close() fp.close()
for f in (f1, f2): for f in (f1, f2):
try: try:
if f is not None: if f is not None:
os.unlink(f) os.unlink(f)
except OSError: except OSError:
pass pass
def endswithsep(path): def endswithsep(path):