Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 38769:e252f136b948
amend: use ctx1.status(ctx2) instead of repo.status(ctx1, ctx2)
Differential Revision: https://phab.mercurial-scm.org/D3996
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 27 Jul 2018 14:49:45 -0700 |
| parents | 6b5ca1d0aa1e |
| children | e7aa113b14f7 |
comparison
equal
deleted
inserted
replaced
| 38768:afc4ad706f9c | 38769:e252f136b948 |
|---|---|
| 2426 date = dateutil.parsedate(date) | 2426 date = dateutil.parsedate(date) |
| 2427 | 2427 |
| 2428 if len(old.parents()) > 1: | 2428 if len(old.parents()) > 1: |
| 2429 # ctx.files() isn't reliable for merges, so fall back to the | 2429 # ctx.files() isn't reliable for merges, so fall back to the |
| 2430 # slower repo.status() method | 2430 # slower repo.status() method |
| 2431 files = set([fn for st in repo.status(base, old)[:3] | 2431 files = set([fn for st in base.status(old)[:3] |
| 2432 for fn in st]) | 2432 for fn in st]) |
| 2433 else: | 2433 else: |
| 2434 files = set(old.files()) | 2434 files = set(old.files()) |
| 2435 | 2435 |
| 2436 # add/remove the files to the working copy if the "addremove" option | 2436 # add/remove the files to the working copy if the "addremove" option |