This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5847

largefiles: drop "rel" prefix from filename variables
ClosedPublic

Authored by martinvonz on Feb 4 2019, 11:55 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG641c8b66a825: largefiles: drop "rel" prefix from filename variables
Summary

The prefixes were meant to indicate that these paths are repo-relative
as opposed to absolute. However, that's what the majority of paths in
our code base are, so "rel" made me think they were instead
cwd-relative. Let's just drop the prefixes.

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

martinvonz created this revision.Feb 4 2019, 11:55 PM
pulkit accepted this revision.Feb 5 2019, 12:37 PM
Closed by commit rHG641c8b66a825: largefiles: drop "rel" prefix from filename variables (authored by martinvonz). · Explain WhyFeb 5 2019, 1:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/lfcommands.py (46 lines)

Diff 13825

hgext/largefiles/lfcommands.py

lfiles = [f for f in lfiles if f in filelist] lfiles = [f for f in lfiles if f in filelist]
update = {} update = {}
dropped = set() dropped = set()
updated, removed = 0, 0 updated, removed = 0, 0
wvfs = repo.wvfs wvfs = repo.wvfs
wctx = repo[None] wctx = repo[None]
for lfile in lfiles: for lfile in lfiles:
rellfile = lfile lfileorig = os.path.relpath(
rellfileorig = os.path.relpath( scmutil.origpath(ui, repo, wvfs.join(lfile)),
scmutil.origpath(ui, repo, wvfs.join(rellfile)),
start=repo.root) start=repo.root)
relstandin = lfutil.standin(lfile) standin = lfutil.standin(lfile)
relstandinorig = os.path.relpath( standinorig = os.path.relpath(
scmutil.origpath(ui, repo, wvfs.join(relstandin)), scmutil.origpath(ui, repo, wvfs.join(standin)),
start=repo.root) start=repo.root)
if wvfs.exists(relstandin): if wvfs.exists(standin):
if (wvfs.exists(relstandinorig) and if (wvfs.exists(standinorig) and
wvfs.exists(rellfile)): wvfs.exists(lfile)):
shutil.copyfile(wvfs.join(rellfile), shutil.copyfile(wvfs.join(lfile),
wvfs.join(rellfileorig)) wvfs.join(lfileorig))
wvfs.unlinkpath(relstandinorig) wvfs.unlinkpath(standinorig)
expecthash = lfutil.readasstandin(wctx[relstandin]) expecthash = lfutil.readasstandin(wctx[standin])
if expecthash != '': if expecthash != '':
if lfile not in wctx: # not switched to normal file if lfile not in wctx: # not switched to normal file
if repo.dirstate[relstandin] != '?': if repo.dirstate[standin] != '?':
wvfs.unlinkpath(rellfile, ignoremissing=True) wvfs.unlinkpath(lfile, ignoremissing=True)
else: else:
dropped.add(rellfile) dropped.add(lfile)
# use normallookup() to allocate an entry in largefiles # use normallookup() to allocate an entry in largefiles
# dirstate to prevent lfilesrepo.status() from reporting # dirstate to prevent lfilesrepo.status() from reporting
# missing files as removed. # missing files as removed.
lfdirstate.normallookup(lfile) lfdirstate.normallookup(lfile)
update[lfile] = expecthash update[lfile] = expecthash
else: else:
# Remove lfiles for which the standin is deleted, unless the # Remove lfiles for which the standin is deleted, unless the
# lfile is added to the repository again. This happens when a # lfile is added to the repository again. This happens when a
# largefile is converted back to a normal file: the standin # largefile is converted back to a normal file: the standin
# disappears, but a new (normal) file appears as the lfile. # disappears, but a new (normal) file appears as the lfile.
if (wvfs.exists(rellfile) and if (wvfs.exists(lfile) and
repo.dirstate.normalize(lfile) not in wctx): repo.dirstate.normalize(lfile) not in wctx):
wvfs.unlinkpath(rellfile) wvfs.unlinkpath(lfile)
removed += 1 removed += 1
# largefile processing might be slow and be interrupted - be prepared # largefile processing might be slow and be interrupted - be prepared
lfdirstate.write() lfdirstate.write()
if lfiles: if lfiles:
lfiles = [f for f in lfiles if f not in dropped] lfiles = [f for f in lfiles if f not in dropped]
continue continue
# Synchronize largefile dirstate to the last modified # Synchronize largefile dirstate to the last modified
# time of the file # time of the file
lfdirstate.normal(lfile) lfdirstate.normal(lfile)
update1 = 1 update1 = 1
# copy the exec mode of largefile standin from the repository's # copy the exec mode of largefile standin from the repository's
# dirstate to its state in the lfdirstate. # dirstate to its state in the lfdirstate.
rellfile = lfile standin = lfutil.standin(lfile)
relstandin = lfutil.standin(lfile) if wvfs.exists(standin):
if wvfs.exists(relstandin):
# exec is decided by the users permissions using mask 0o100 # exec is decided by the users permissions using mask 0o100
standinexec = wvfs.stat(relstandin).st_mode & 0o100 standinexec = wvfs.stat(standin).st_mode & 0o100
st = wvfs.stat(rellfile) st = wvfs.stat(lfile)
mode = st.st_mode mode = st.st_mode
if standinexec != mode & 0o100: if standinexec != mode & 0o100:
# first remove all X bits, then shift all R bits to X # first remove all X bits, then shift all R bits to X
mode &= ~0o111 mode &= ~0o111
if standinexec: if standinexec:
mode |= (mode >> 2) & 0o111 & ~util.umask mode |= (mode >> 2) & 0o111 & ~util.umask
wvfs.chmod(rellfile, mode) wvfs.chmod(lfile, mode)
update1 = 1 update1 = 1
updated += update1 updated += update1
lfutil.synclfdirstate(repo, lfdirstate, lfile, normallookup) lfutil.synclfdirstate(repo, lfdirstate, lfile, normallookup)
lfdirstate.write() lfdirstate.write()
if lfiles: if lfiles: