Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cmdutil.py @ 40366:b14fdf1fb615
update: clarify update() call sites by specifying argument names
merge.update() takes a lot of parameters and I get confused all the
time which is which.
Differential Revision: https://phab.mercurial-scm.org/D5153
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 09 Feb 2017 09:17:40 -0800 |
| parents | 943248e47864 |
| children | 824b687ff6af |
comparison
equal
deleted
inserted
replaced
| 40365:4f37af86d5d5 | 40366:b14fdf1fb615 |
|---|---|
| 363 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] | 363 [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] |
| 364 # 3a. apply filtered patch to clean repo (clean) | 364 # 3a. apply filtered patch to clean repo (clean) |
| 365 if backups: | 365 if backups: |
| 366 # Equivalent to hg.revert | 366 # Equivalent to hg.revert |
| 367 m = scmutil.matchfiles(repo, backups.keys()) | 367 m = scmutil.matchfiles(repo, backups.keys()) |
| 368 mergemod.update(repo, repo.dirstate.p1(), | 368 mergemod.update(repo, repo.dirstate.p1(), branchmerge=False, |
| 369 False, True, matcher=m) | 369 force=True, matcher=m) |
| 370 | 370 |
| 371 # 3b. (apply) | 371 # 3b. (apply) |
| 372 if dopatch: | 372 if dopatch: |
| 373 try: | 373 try: |
| 374 ui.debug('applying patch\n') | 374 ui.debug('applying patch\n') |