Mercurial > hg-stable
comparison mercurial/merge.py @ 38379:ef692614e601
progress: hide update(None) in a new complete() method
update(None) seemed a bit cryptic.
Differential Revision: https://phab.mercurial-scm.org/D3774
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Sun, 17 Jun 2018 22:13:41 -0700 |
| parents | bec1212eceaa |
| children | 00368bc0a614 |
comparison
equal
deleted
inserted
replaced
| 38378:f4f1fb1cbfb4 | 38379:ef692614e601 |
|---|---|
| 1783 mfiles.difference_update(a[0] for a in acts) | 1783 mfiles.difference_update(a[0] for a in acts) |
| 1784 | 1784 |
| 1785 actions[ACTION_MERGE] = [a for a in actions[ACTION_MERGE] | 1785 actions[ACTION_MERGE] = [a for a in actions[ACTION_MERGE] |
| 1786 if a[0] in mfiles] | 1786 if a[0] in mfiles] |
| 1787 | 1787 |
| 1788 progress.update(None) | 1788 progress.complete() |
| 1789 return updateresult(updated, merged, removed, unresolved) | 1789 return updateresult(updated, merged, removed, unresolved) |
| 1790 | 1790 |
| 1791 def recordupdates(repo, actions, branchmerge): | 1791 def recordupdates(repo, actions, branchmerge): |
| 1792 "record merge actions to the dirstate" | 1792 "record merge actions to the dirstate" |
| 1793 # remove (must come first) | 1793 # remove (must come first) |