##// END OF EJS Templates
largefiles: avoid printing messages while transplanting by "_lfstatuswriters"...
FUJIWARA Katsunori -
r23275:fae708cb default
parent child Browse files
Show More
@@ -1170,11 +1170,11 b' def overriderollback(orig, ui, repo, **o'
1170 def overridetransplant(orig, ui, repo, *revs, **opts):
1170 def overridetransplant(orig, ui, repo, *revs, **opts):
1171 resuming = opts.get('continue')
1171 resuming = opts.get('continue')
1172 repo._lfcommithooks.append(lfutil.automatedcommithook(resuming))
1172 repo._lfcommithooks.append(lfutil.automatedcommithook(resuming))
1173 repo._lfstatuswriters.append(lambda *msg, **opts: None)
1173 try:
1174 try:
1174 repo._istransplanting = True
1175 result = orig(ui, repo, *revs, **opts)
1175 result = orig(ui, repo, *revs, **opts)
1176 finally:
1176 finally:
1177 repo._istransplanting = False
1177 repo._lfstatuswriters.pop()
1178 repo._lfcommithooks.pop()
1178 repo._lfcommithooks.pop()
1179 return result
1179 return result
1180
1180
@@ -1277,12 +1277,7 b' def mergeupdate(orig, repo, node, branch'
1277 newstandins = lfutil.getstandinsstate(repo)
1277 newstandins = lfutil.getstandinsstate(repo)
1278 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
1278 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
1279
1279
1280 printmessage = None
1281 if getattr(repo, "_istransplanting", False):
1282 # suppress status message while automated committing
1283 printmessage = False
1284 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
1280 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
1285 printmessage=printmessage,
1286 normallookup=partial)
1281 normallookup=partial)
1287
1282
1288 return result
1283 return result
General Comments 0
You need to be logged in to leave comments. Login now