Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 14257:d035ede73434
mq: explicitly updatedir() even if patch() fails
It already works that way in practice, and we intend to merge updatedir() into
patch().
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 08 May 2011 17:48:29 +0200 |
| parents | f4766e1bb0b3 |
| children | df9ccd39828c |
comparison
equal
deleted
inserted
replaced
| 14256:d04ba50e104d | 14257:d035ede73434 |
|---|---|
| 333 wlock.release() | 333 wlock.release() |
| 334 | 334 |
| 335 def updatedir(ui, repo, patches, similarity=0): | 335 def updatedir(ui, repo, patches, similarity=0): |
| 336 '''Update dirstate after patch application according to metadata''' | 336 '''Update dirstate after patch application according to metadata''' |
| 337 if not patches: | 337 if not patches: |
| 338 return | 338 return [] |
| 339 copies = [] | 339 copies = [] |
| 340 removes = set() | 340 removes = set() |
| 341 cfiles = patches.keys() | 341 cfiles = patches.keys() |
| 342 cwd = repo.getcwd() | 342 cwd = repo.getcwd() |
| 343 if cwd: | 343 if cwd: |