largefiles: avoid printing messages while rebasing by "_lfstatuswriters"
authorFUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Wed, 05 Nov 2014 23:24:47 +0900
changeset 23190 383ff455cab8
parent 23189 fb139f5553d6
child 23193 14c6aab35a39
largefiles: avoid printing messages while rebasing by "_lfstatuswriters" Putting "lambda *msg, **opts: None" (= avoid printing messages always) into "_lfstatuswriters" while rebasing makes explicit passing "printmessage = False" for "updatelfiles()" useless. This patch also removes setting/unsetting "repo._isrebasing" in "overriderebase", because there is no code path referring it.
hgext/largefiles/overrides.py
--- a/hgext/largefiles/overrides.py	Wed Nov 05 23:24:47 2014 +0900
+++ b/hgext/largefiles/overrides.py	Wed Nov 05 23:24:47 2014 +0900
@@ -792,11 +792,11 @@
 def overriderebase(orig, ui, repo, **opts):
     resuming = opts.get('continue')
     repo._lfcommithooks.append(lfutil.automatedcommithook(resuming))
-    repo._isrebasing = True
+    repo._lfstatuswriters.append(lambda *msg, **opts: None)
     try:
         return orig(ui, repo, **opts)
     finally:
-        repo._isrebasing = False
+        repo._lfstatuswriters.pop()
         repo._lfcommithooks.pop()
 
 def overridearchive(orig, repo, dest, node, kind, decode=True, matchfn=None,
@@ -1280,8 +1280,7 @@
             filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
 
         printmessage = None
-        if (getattr(repo, "_isrebasing", False) or
-            getattr(repo, "_istransplanting", False)):
+        if getattr(repo, "_istransplanting", False):
             # suppress status message while automated committing
             printmessage = False
         lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,