# HG changeset patch
# User FUJIWARA Katsunori <fo...@lares.dti.ne.jp>
# Date 1490361898 -32400
# Fri Mar 24 22:24:58 2017 +0900
# Node ID 287005e896abc735c0209e2369117b98399f43d8
# Parent 1f1ed3058fa829550b52110f35c65b4f79c92d10
largefiles: omit redundant isstandin() before splitstandin()
There are many isstandin() invocations before splitstandin().
The former examines whether specified path starts with ".hglf/". The
latter returns after ".hglf/" of specified path if it starts with that
prefix, or returns None otherwise.
Therefore, value returned by splitstandin() can be used for
replacement of preceding isstandin(), and this replacement can omit
redundant string comparison after isstandin().
diff --git a/hgext/largefiles/lfcommands.py b/hgext/largefiles/lfcommands.py
--- a/hgext/largefiles/lfcommands.py
+++ b/hgext/largefiles/lfcommands.py
@@ -244,10 +244,10 @@ def _lfconvert_addchangeset(rsrc, rdst,
dstfiles.append(f)
def getfilectx(repo, memctx, f):
- if lfutil.isstandin(f):
+ srcfname = lfutil.splitstandin(f)
+ if srcfname is not None:
# if the file isn't in the manifest then it was removed
# or renamed, return None to indicate this
- srcfname = lfutil.splitstandin(f)
try:
fctx = ctx.filectx(srcfname)
except error.LookupError:
diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py
--- a/hgext/largefiles/lfutil.py
+++ b/hgext/largefiles/lfutil.py
@@ -261,8 +261,8 @@ def copyalltostore(repo, node):
ctx = repo[node]
for filename in ctx.files():
- if isstandin(filename) and filename in ctx.manifest():
- realfile = splitstandin(filename)
+ realfile = splitstandin(filename)
+ if realfile is not None and filename in ctx.manifest():
copytostore(repo, ctx.node(), realfile)
def copytostoreabsolute(repo, file, hash):
@@ -478,8 +478,8 @@ def markcommitted(orig, ctx, node):
lfdirstate = openlfdirstate(repo.ui, repo)
for f in ctx.files():
- if isstandin(f):
- lfile = splitstandin(f)
+ lfile = splitstandin(f)
+ if lfile is not None:
synclfdirstate(repo, lfdirstate, lfile, False)
lfdirstate.write()
diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py
+++ b/hgext/largefiles/overrides.py
@@ -649,10 +649,13 @@ def overridecopy(orig, ui, repo, pats, o
m._files = [lfutil.standin(f) for f in m._files if lfile(f)]
m._fileroots = set(m._files)
origmatchfn = m.matchfn
- m.matchfn = lambda f: (lfutil.isstandin(f) and
- (f in manifest) and
- origmatchfn(lfutil.splitstandin(f)) or
- None)
+ def matchfn(f):
+ lfile = lfutil.splitstandin(f)
+ return (lfile is not None and
+ (f in manifest) and
+ origmatchfn(lfile) or
+ None)
+ m.matchfn = matchfn
return m
oldmatch = installmatchfn(overridematch)
listpats = []
@@ -767,8 +770,9 @@ def overriderevert(orig, ui, repo, ctx,
m._fileroots = set(m._files)
origmatchfn = m.matchfn
def matchfn(f):
- if lfutil.isstandin(f):
- return (origmatchfn(lfutil.splitstandin(f)) and
+ lfile = lfutil.splitstandin(f)
+ if lfile is not None:
+ return (origmatchfn(lfile) and
(f in ctx or f in mctx))
return origmatchfn(f)
m.matchfn = matchfn
@@ -968,18 +972,19 @@ def overridearchive(orig, repo, dest, no
for f in ctx:
ff = ctx.flags(f)
getdata = ctx[f].data
- if lfutil.isstandin(f):
+ lfile = lfutil.splitstandin(f)
+ if lfile is not None:
if node is not None:
path = lfutil.findfile(repo, getdata().strip())
if path is None:
raise error.Abort(
_('largefile %s not found in repo store or system
cache')
- % lfutil.splitstandin(f))
+ % lfile)
else:
- path = lfutil.splitstandin(f)
-
- f = lfutil.splitstandin(f)
+ path = lfile
+
+ f = lfile
getdata = lambda: util.readfile(path)
write(f, 'x' in ff and 0o755 or 0o644, 'l' in ff, getdata)
@@ -1018,18 +1023,19 @@ def hgsubrepoarchive(orig, repo, archive
for f in ctx:
ff = ctx.flags(f)
getdata = ctx[f].data
- if lfutil.isstandin(f):
+ lfile = lfutil.splitstandin(f)
+ if lfile is not None:
if ctx.node() is not None:
path = lfutil.findfile(repo._repo, getdata().strip())
if path is None:
raise error.Abort(
_('largefile %s not found in repo store or system
cache')
- % lfutil.splitstandin(f))
+ % lfile)
else:
- path = lfutil.splitstandin(f)
-
- f = lfutil.splitstandin(f)
+ path = lfile
+
+ f = lfile
getdata = lambda: util.readfile(os.path.join(prefix, path))
@@ -1433,7 +1439,11 @@ def mergeupdate(orig, repo, node, branch
def scmutilmarktouched(orig, repo, files, *args, **kwargs):
result = orig(repo, files, *args, **kwargs)
- filelist = [lfutil.splitstandin(f) for f in files if lfutil.isstandin(f)]
+ filelist = []
+ for f in files:
+ lf = lfutil.splitstandin(f)
+ if lf is not None:
+ filelist.append(lf)
if filelist:
lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
printmessage=False, normallookup=True)
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
