Mercurial > hg
comparison hgext/mq.py @ 6650:2c9565971abc
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 06 Jun 2008 18:31:57 +0200 |
| parents | 37eedb1a1848 2519976a998b |
| children | 034f444902d9 |
comparison
equal
deleted
inserted
replaced
| 6647:602f7c1ab954 | 6650:2c9565971abc |
|---|---|
| 2036 util.rename(q.join(patch), absdest) | 2036 util.rename(q.join(patch), absdest) |
| 2037 r = q.qrepo() | 2037 r = q.qrepo() |
| 2038 if r: | 2038 if r: |
| 2039 wlock = r.wlock() | 2039 wlock = r.wlock() |
| 2040 try: | 2040 try: |
| 2041 if r.dirstate[name] == 'r': | 2041 if r.dirstate[patch] == 'a': |
| 2042 r.undelete([name]) | 2042 r.dirstate.forget(patch) |
| 2043 r.copy(patch, name) | 2043 r.dirstate.add(name) |
| 2044 r.remove([patch], False) | 2044 else: |
| 2045 if r.dirstate[name] == 'r': | |
| 2046 r.undelete([name]) | |
| 2047 r.copy(patch, name) | |
| 2048 r.remove([patch], False) | |
| 2045 finally: | 2049 finally: |
| 2046 del wlock | 2050 del wlock |
| 2047 | 2051 |
| 2048 q.save_dirty() | 2052 q.save_dirty() |
| 2049 | 2053 |