Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: add lfile argument to updatestandin() for efficiency (API)
authorFUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Mon, 27 Mar 2017 09:44:36 +0900
changeset 31659 0eec36112e58
parent 31658 f1cf6a745264
child 31660 c2dbd818e884
largefiles: add lfile argument to updatestandin() for efficiency (API) Before this patch, updatestandin() takes "standin" argument, and applies splitstandin() on it to pick out a path to largefile (aka "lfile" or so) from standin. But in fact, all callers already knows "lfile". In addition to it, many callers knows both "standin" and "lfile". Therefore, making updatestandin() take only one of "standin" or "lfile" is inefficient.
hgext/largefiles/lfutil.py file | annotate | diff | comparison | revisions
hgext/largefiles/overrides.py file | annotate | diff | comparison | revisions 
--- a/hgext/largefiles/lfutil.py	Mon Mar 27 09:44:36 2017 +0900
+++ b/hgext/largefiles/lfutil.py	Mon Mar 27 09:44:36 2017 +0900
@@ -342,8 +342,11 @@
     else:
         return None
 
-def updatestandin(repo, standin):
-    lfile = splitstandin(standin)
+def updatestandin(repo, lfile, standin):
+    """Re-calculate hash value of lfile and write it into standin
+
+    This assumes that "lfutil.standin(lfile) == standin", for efficiency.
+    """
     file = repo.wjoin(lfile)
     if repo.wvfs.exists(lfile):
         hash = hashfile(file)
@@ -560,7 +563,7 @@
                     # performed and the working copy is not updated
                     # yet.
                     if repo.wvfs.exists(lfile):
-                        updatestandin(repo, fstandin)
+                        updatestandin(repo, lfile, fstandin)
 
         return match
 
@@ -586,7 +589,7 @@
     for fstandin in standins:
         lfile = splitstandin(fstandin)
         if lfdirstate[lfile] != 'r':
-            updatestandin(repo, fstandin)
+            updatestandin(repo, lfile, fstandin)
 
     # Cook up a new matcher that only matches regular files or
     # standins corresponding to the big files requested by the
--- a/hgext/largefiles/overrides.py	Mon Mar 27 09:44:36 2017 +0900
+++ b/hgext/largefiles/overrides.py	Mon Mar 27 09:44:36 2017 +0900
@@ -736,7 +736,7 @@
         s = lfutil.lfdirstatestatus(lfdirstate, repo)
         lfdirstate.write()
         for lfile in s.modified:
-            lfutil.updatestandin(repo, lfutil.standin(lfile))
+            lfutil.updatestandin(repo, lfile, lfutil.standin(lfile))
         for lfile in s.deleted:
             fstandin = lfutil.standin(lfile)
             if (repo.wvfs.exists(fstandin)):
@@ -1417,7 +1417,7 @@
                 # in this case, content of standin file is meaningless
                 # (in dctx, lfile is unknown, or normal file)
                 continue
-            lfutil.updatestandin(repo, fstandin)
+            lfutil.updatestandin(repo, lfile, fstandin)
         # mark all clean largefiles as dirty, just in case the update gets
         # interrupted before largefiles and lfdirstate are synchronized
         for lfile in oldclean:
mercurial