Kiln » largefiles » largefiles-mercurial-truncated changes working towards inclusion in Mercurial
Clone URL:  

Rename _are_rebasing to _isrebasing.

Changeset e949ef6b138b

Parent 3e7321738bec

by David Golub

Changes to one file · Browse files at e949ef6b138b Showing diff from parent 3e7321738bec Diff from another changeset...

 
197
198
199
200
 
201
202
203
 
867
868
869
870
 
871
872
873
 
895
896
897
898
 
899
900
901
902
903
904
 
905
906
907
908
 
909
910
911
 
197
198
199
 
200
201
202
203
 
867
868
869
 
870
871
872
873
 
895
896
897
 
898
899
900
901
902
903
 
904
905
906
907
 
908
909
910
911
@@ -197,7 +197,7 @@
    wlock = repo.wlock()   try: - if getattr(repo, "_are_rebasing", False): + if getattr(repo, "_isrebasing", False):   # We have to take the time to pull down the new bfiles now. Otherwise   # if we are rebasing, any bfiles that were modified in the changesets we   # are rebasing on top of get overwritten either by the rebase or in the @@ -867,7 +867,7 @@
 # in the working copy  def override_pull(orig, ui, repo, source="default", **opts):   if opts.get('rebase', False): - repo._are_rebasing = True + repo._isrebasing = True   try:   if opts.get('update'):   del opts['update'] @@ -895,17 +895,17 @@
  branch = repo[None].branch()   dest = repo[branch].rev()   finally: - repo._are_rebasing = False + repo._isrebasing = False   else:   result = orig(ui, repo, source, **opts)   return result    def override_rebase(orig, ui, repo, **opts): - repo._are_rebasing = True + repo._isrebasing = True   try:   orig(ui, repo, **opts)   finally: - repo._are_rebasing = False + repo._isrebasing = False    def override_archive(orig, repo, dest, node, kind, decode=True, matchfn=None,   prefix=None, mtime=None, subrepos=None):