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: look at unfiltered().lfstatus to allow status() to be filtered
authorMatt Harbison <matt_harbison@yahoo.com>
Sun, 07 Dec 2014 01:32:30 -0500
changeset 23659 67d63ec85eb7
parent 23658 55c92618fdd4
child 23660 1ec6dbb9b216
largefiles: look at unfiltered().lfstatus to allow status() to be filtered The comment about status being buggy with a repo proxy seems to be that status wasn't being redirected to testing the largefiles themselves- lfstatus was always False, and so the original status method was being called instead of doing the largefiles processing. This is because when the various largefile command overrides call 'repo.lfstatus = True', __setattr__() in repoview is in turn setting the value on the unfiltered repo, and the value in the filtered repo remains False. Explicitly looking at the attribute on the unfiltered repo keeps all views in sync.
hgext/largefiles/reposetup.py file | annotate | diff | comparison | revisions 
--- a/hgext/largefiles/reposetup.py	Fri Nov 28 14:21:02 2014 -0500
+++ b/hgext/largefiles/reposetup.py	Sun Dec 07 01:32:30 2014 -0500
@@ -34,7 +34,7 @@
         # their actual contents.
         def __getitem__(self, changeid):
             ctx = super(lfilesrepo, self).__getitem__(changeid)
-            if self.lfstatus:
+            if self.unfiltered().lfstatus:
                 class lfilesmanifestdict(manifest.manifestdict):
                     def __contains__(self, filename):
                         orig = super(lfilesmanifestdict, self).__contains__
@@ -72,19 +72,20 @@
         # appropriate list in the result. Also removes standin files
         # from the listing. Revert to the original status if
         # self.lfstatus is False.
-        # XXX large file status is buggy when used on repo proxy.
-        # XXX this needs to be investigated.
-        @localrepo.unfilteredmethod
         def status(self, node1='.', node2=None, match=None, ignored=False,
                 clean=False, unknown=False, listsubrepos=False):
             listignored, listclean, listunknown = ignored, clean, unknown
             orig = super(lfilesrepo, self).status
-            if not self.lfstatus:
+
+            # When various overrides set repo.lfstatus, the change is redirected
+            # to the unfiltered repo, and self.lfstatus is always false when
+            # this repo is filtered.
+            if not self.unfiltered().lfstatus:
                 return orig(node1, node2, match, listignored, listclean,
                             listunknown, listsubrepos)
 
             # some calls in this function rely on the old version of status
-            self.lfstatus = False
+            self.unfiltered().lfstatus = False
             ctx1 = self[node1]
             ctx2 = self[node2]
             working = ctx2.rev() is None
@@ -240,7 +241,7 @@
                 if wlock:
                     wlock.release()
 
-            self.lfstatus = True
+            self.unfiltered().lfstatus = True
             return scmutil.status(*result)
 
         def commitctx(self, ctx, *args, **kwargs):
mercurial