Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: remove confusing rev parameter for lfdirstatestatus
authorMads Kiilerich <madski@unity3d.com>
Fri, 03 Oct 2014 00:42:40 +0200
changeset 23039 1350b9170089
parent 23038 3f581bfbb268
child 23040 46c5983ce48f
largefiles: remove confusing rev parameter for lfdirstatestatus Dirstate only works on the repo wctx.
hgext/largefiles/lfutil.py file | annotate | diff | comparison | revisions
hgext/largefiles/overrides.py file | annotate | diff | comparison | revisions 
--- a/hgext/largefiles/lfutil.py	Fri Oct 03 00:42:40 2014 +0200
+++ b/hgext/largefiles/lfutil.py	Fri Oct 03 00:42:40 2014 +0200
@@ -134,13 +134,14 @@
             lfdirstate.normallookup(lfile)
     return lfdirstate
 
-def lfdirstatestatus(lfdirstate, repo, rev):
+def lfdirstatestatus(lfdirstate, repo):
+    wctx = repo['.']
     match = match_.always(repo.root, repo.getcwd())
     unsure, s = lfdirstate.status(match, [], False, False, False)
     modified, clean = s.modified, s.clean
     for lfile in unsure:
         try:
-            fctx = repo[rev][standin(lfile)]
+            fctx = wctx[standin(lfile)]
         except LookupError:
             fctx = None
         if not fctx or fctx.data().strip() != hashfile(repo.wjoin(lfile)):
--- a/hgext/largefiles/overrides.py	Fri Oct 03 00:42:40 2014 +0200
+++ b/hgext/largefiles/overrides.py	Fri Oct 03 00:42:40 2014 +0200
@@ -660,7 +660,7 @@
     wlock = repo.wlock()
     try:
         lfdirstate = lfutil.openlfdirstate(ui, repo)
-        s = lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev())
+        s = lfutil.lfdirstatestatus(lfdirstate, repo)
         lfdirstate.write()
         for lfile in s.modified:
             lfutil.updatestandin(repo, lfutil.standin(lfile))
Mercurial