Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hg.py @ 2826:3aeab7bb5adc
Refactor update locking slightly
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 08 Aug 2006 09:19:20 -0500 |
| parents | 1ea086bc2086 |
| children | 4870f795f681 |
comparison
equal
deleted
inserted
replaced
| 2825:1ea086bc2086 | 2826:3aeab7bb5adc |
|---|---|
| 218 def merge(repo, node, force=None, remind=True, wlock=None): | 218 def merge(repo, node, force=None, remind=True, wlock=None): |
| 219 """branch merge with node, resolving changes""" | 219 """branch merge with node, resolving changes""" |
| 220 return _merge.update(repo, node, branchmerge=True, forcemerge=force, | 220 return _merge.update(repo, node, branchmerge=True, forcemerge=force, |
| 221 remind=remind, wlock=wlock) | 221 remind=remind, wlock=wlock) |
| 222 | 222 |
| 223 def revert(repo, node, choose): | 223 def revert(repo, node, choose, wlock): |
| 224 """revert changes to revision in node without updating dirstate""" | 224 """revert changes to revision in node without updating dirstate""" |
| 225 return _merge.update(repo, node, force=True, partial=choose, | 225 return _merge.update(repo, node, force=True, partial=choose, |
| 226 show_stats=False) | 226 show_stats=False, wlock=wlock) |
| 227 | 227 |
| 228 def verify(repo): | 228 def verify(repo): |
| 229 """verify the consistency of a repository""" | 229 """verify the consistency of a repository""" |
| 230 return _verify.verify(repo) | 230 return _verify.verify(repo) |