Show More
@@ -792,11 +792,11 b' def hgclone(orig, ui, opts, *args, **kwa' | |||
|
792 | 792 | def overriderebase(orig, ui, repo, **opts): |
|
793 | 793 | resuming = opts.get('continue') |
|
794 | 794 | repo._lfcommithooks.append(lfutil.automatedcommithook(resuming)) |
|
795 | repo._isrebasing = True | |
|
795 | repo._lfstatuswriters.append(lambda *msg, **opts: None) | |
|
796 | 796 | try: |
|
797 | 797 | return orig(ui, repo, **opts) |
|
798 | 798 | finally: |
|
799 | repo._isrebasing = False | |
|
799 | repo._lfstatuswriters.pop() | |
|
800 | 800 | repo._lfcommithooks.pop() |
|
801 | 801 | |
|
802 | 802 | def overridearchive(orig, repo, dest, node, kind, decode=True, matchfn=None, |
@@ -1280,8 +1280,7 b' def mergeupdate(orig, repo, node, branch' | |||
|
1280 | 1280 | filelist = lfutil.getlfilestoupdate(oldstandins, newstandins) |
|
1281 | 1281 | |
|
1282 | 1282 | printmessage = None |
|
1283 |
if |
|
|
1284 | getattr(repo, "_istransplanting", False)): | |
|
1283 | if getattr(repo, "_istransplanting", False): | |
|
1285 | 1284 | # suppress status message while automated committing |
|
1286 | 1285 | printmessage = False |
|
1287 | 1286 | lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, |
General Comments 0
You need to be logged in to leave comments.
Login now