equal
deleted
inserted
replaced
6930 raise error.Abort(_("please specify just one revision")) |
6930 raise error.Abort(_("please specify just one revision")) |
6931 |
6931 |
6932 if rev is None or rev == '': |
6932 if rev is None or rev == '': |
6933 rev = node |
6933 rev = node |
6934 |
6934 |
6935 wlock = repo.wlock() |
6935 with repo.wlock(): |
6936 try: |
|
6937 cmdutil.clearunfinished(repo) |
6936 cmdutil.clearunfinished(repo) |
6938 |
6937 |
6939 if date: |
6938 if date: |
6940 if rev is not None: |
6939 if rev is not None: |
6941 raise error.Abort(_("you can't specify a revision and a date")) |
6940 raise error.Abort(_("you can't specify a revision and a date")) |
6978 elif brev: |
6977 elif brev: |
6979 if repo._activebookmark: |
6978 if repo._activebookmark: |
6980 ui.status(_("(leaving bookmark %s)\n") % |
6979 ui.status(_("(leaving bookmark %s)\n") % |
6981 repo._activebookmark) |
6980 repo._activebookmark) |
6982 bookmarks.deactivate(repo) |
6981 bookmarks.deactivate(repo) |
6983 finally: |
|
6984 wlock.release() |
|
6985 |
6982 |
6986 return ret |
6983 return ret |
6987 |
6984 |
6988 @command('verify', []) |
6985 @command('verify', []) |
6989 def verify(ui, repo): |
6986 def verify(ui, repo): |