Mercurial > hg
comparison mercurial/merge.py @ 5704:5049bbf988e1
merge: use util.set_flags
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 27 Dec 2007 22:27:48 -0600 |
| parents | 9cedc3fbbebb |
| children | f6bf89722e29 |
comparison
equal
deleted
inserted
replaced
| 5703:14789f30ac11 | 5704:5049bbf988e1 |
|---|---|
| 508 else: | 508 else: |
| 509 if r is None: | 509 if r is None: |
| 510 updated += 1 | 510 updated += 1 |
| 511 else: | 511 else: |
| 512 merged += 1 | 512 merged += 1 |
| 513 util.set_exec(repo.wjoin(fd), "x" in flags) | 513 util.set_flags(repo.wjoin(fd), flags) |
| 514 if f != fd and move and util.lexists(repo.wjoin(f)): | 514 if f != fd and move and util.lexists(repo.wjoin(f)): |
| 515 repo.ui.debug(_("removing %s\n") % f) | 515 repo.ui.debug(_("removing %s\n") % f) |
| 516 os.unlink(repo.wjoin(f)) | 516 os.unlink(repo.wjoin(f)) |
| 517 elif m == "g": # get | 517 elif m == "g": # get |
| 518 flags = a[2] | 518 flags = a[2] |
| 537 repo.ui.warn("warning: detected divergent renames of %s to:\n" % f) | 537 repo.ui.warn("warning: detected divergent renames of %s to:\n" % f) |
| 538 for nf in fl: | 538 for nf in fl: |
| 539 repo.ui.warn(" %s\n" % nf) | 539 repo.ui.warn(" %s\n" % nf) |
| 540 elif m == "e": # exec | 540 elif m == "e": # exec |
| 541 flags = a[2] | 541 flags = a[2] |
| 542 util.set_exec(repo.wjoin(f), flags) | 542 util.set_flags(repo.wjoin(f), flags) |
| 543 | 543 |
| 544 return updated, merged, removed, unresolved | 544 return updated, merged, removed, unresolved |
| 545 | 545 |
| 546 def recordupdates(repo, action, branchmerge): | 546 def recordupdates(repo, action, branchmerge): |
| 547 "record merge actions to the dirstate" | 547 "record merge actions to the dirstate" |