equal
deleted
inserted
replaced
558 of another revision. |
558 of another revision. |
559 |
559 |
560 Returns 0 on success, 1 if nothing to backout or there are unresolved |
560 Returns 0 on success, 1 if nothing to backout or there are unresolved |
561 files. |
561 files. |
562 ''' |
562 ''' |
563 wlock = lock = None |
563 with repo.wlock(), repo.lock(): |
564 try: |
|
565 wlock = repo.wlock() |
|
566 lock = repo.lock() |
|
567 return _dobackout(ui, repo, node, rev, **opts) |
564 return _dobackout(ui, repo, node, rev, **opts) |
568 finally: |
|
569 release(lock, wlock) |
|
570 |
565 |
571 def _dobackout(ui, repo, node=None, rev=None, **opts): |
566 def _dobackout(ui, repo, node=None, rev=None, **opts): |
572 opts = pycompat.byteskwargs(opts) |
567 opts = pycompat.byteskwargs(opts) |
573 if opts.get('commit') and opts.get('no_commit'): |
568 if opts.get('commit') and opts.get('no_commit'): |
574 raise error.Abort(_("cannot use --commit with --no-commit")) |
569 raise error.Abort(_("cannot use --commit with --no-commit")) |