Changeset 69f5fafe0837…
Parent dd074b5dbfaf…
by
Changes to one file · Browse files at 69f5fafe0837 Showing diff from parent dd074b5dbfaf Diff from another changeset...
@@ -867,7 +867,7 @@ # in the working copy
def override_pull(orig, ui, repo, source="default", **opts):
if opts.get('rebase', False):
- setattr(repo, "_are_rebasing", True)
+ repo._are_rebasing = True
try:
if opts.get('update'):
del opts['update']
@@ -895,17 +895,17 @@ branch = repo[None].branch()
dest = repo[branch].rev()
finally:
- setattr(repo, "_are_rebasing", False)
+ repo._are_rebasing = False
else:
result = orig(ui, repo, source, **opts)
return result
def override_rebase(orig, ui, repo, **opts):
- setattr(repo, "_are_rebasing", True)
+ repo._are_rebasing = True
try:
orig(ui, repo, **opts)
finally:
- setattr(repo, "_are_rebasing", False)
+ repo._are_rebasing = False
def override_archive(orig, repo, dest, node, kind, decode=True, matchfn=None,
prefix=None, mtime=None, subrepos=None):
|
Loading...