facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

largefiles: avoid printing messages while transplanting by "_lfstatuswriters"

Browse Source 
Putting "lambda *msg, **opts: None" (= avoid printing messages always)
into "_lfstatuswriters" while transplanting makes explicit passing
"printmessage = False" for "updatelfiles()" useless.

This patch also removes setting/unsetting "repo._istransplanting" in
"overridetransplant", because there is no code path referring it.
This commit is contained in:
FUJIWARA Katsunori 2014-11-08 00:48:41 +09:00
parent ba0a7a0792
commit 9e83bdcdeb
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hgext/largefiles/overrides.py
View File

@ -1170,11 +1170,11 @@ def overriderollback(orig, ui, repo, **opts):
def overridetransplant(orig, ui, repo, *revs, **opts):
resuming = opts.get('continue')
repo._lfcommithooks.append(lfutil.automatedcommithook(resuming))
repo._lfstatuswriters.append(lambda *msg, **opts: None)
try:
repo._istransplanting = True
result = orig(ui, repo, *revs, **opts)
finally:
repo._istransplanting = False
repo._lfstatuswriters.pop()
repo._lfcommithooks.pop()
return result
@ -1277,12 +1277,7 @@ def mergeupdate(orig, repo, node, branchmerge, force, partial,
newstandins = lfutil.getstandinsstate(repo)
filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
printmessage = None
if getattr(repo, "_istransplanting", False):
# suppress status message while automated committing
printmessage = False
lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
printmessage=printmessage,
normallookup=partial)
return result