Patchwork D3996: amend: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2)

login
register
mail settings
Submitter phabricator
Date Aug. 1, 2018, 5:09 p.m.
Message ID <40e54d0edb99a6e9da5b6cd2867a6b5a@localhost.localdomain>
Download mbox | patch
Permalink /patch/33024/
State Not Applicable
Headers show

Comments

phabricator - Aug. 1, 2018, 5:09 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe252f136b948: amend: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2) (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3996?vs=9687&id=9707

REVISION DETAIL
  https://phab.mercurial-scm.org/D3996

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -2428,7 +2428,7 @@ 
         if len(old.parents()) > 1:
             # ctx.files() isn't reliable for merges, so fall back to the
             # slower repo.status() method
-            files = set([fn for st in repo.status(base, old)[:3]
+            files = set([fn for st in base.status(old)[:3]
                          for fn in st])
         else:
             files = set(old.files())