Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/mq.py @ 4949:fc61495ea9cf
dirstate: make wjoin function private
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 21 Jul 2007 16:02:09 -0500 |
| parents | 6fd953d5faea |
| children | 30847b8af7ca |
comparison
equal
deleted
inserted
replaced
| 4948:6fd953d5faea | 4949:fc61495ea9cf |
|---|---|
| 495 if merge and files: | 495 if merge and files: |
| 496 # Mark as removed/merged and update dirstate parent info | 496 # Mark as removed/merged and update dirstate parent info |
| 497 removed = [] | 497 removed = [] |
| 498 merged = [] | 498 merged = [] |
| 499 for f in files: | 499 for f in files: |
| 500 if os.path.exists(repo.dirstate.wjoin(f)): | 500 if os.path.exists(repo.wjoin(f)): |
| 501 merged.append(f) | 501 merged.append(f) |
| 502 else: | 502 else: |
| 503 removed.append(f) | 503 removed.append(f) |
| 504 for f in removed: | 504 for f in removed: |
| 505 repo.dirstate.remove(f) | 505 repo.dirstate.remove(f) |