##// END OF EJS Templates
strip: use context manager for locking in strip()
Martin von Zweigbergk -
r32919:daceeed3 default
parent child Browse files
Show More
@@ -59,10 +59,7 b' def checklocalchanges(repo, force=False,'
59 return s
59 return s
60
60
61 def strip(ui, repo, revs, update=True, backup=True, force=None, bookmarks=None):
61 def strip(ui, repo, revs, update=True, backup=True, force=None, bookmarks=None):
62 wlock = lock = None
62 with repo.wlock(), repo.lock():
63 try:
64 wlock = repo.wlock()
65 lock = repo.lock()
66
63
67 if update:
64 if update:
68 checklocalchanges(repo, force=force)
65 checklocalchanges(repo, force=force)
@@ -86,9 +83,6 b' def strip(ui, repo, revs, update=True, b'
86 repomarks.recordchange(tr)
83 repomarks.recordchange(tr)
87 for bookmark in sorted(bookmarks):
84 for bookmark in sorted(bookmarks):
88 ui.write(_("bookmark '%s' deleted\n") % bookmark)
85 ui.write(_("bookmark '%s' deleted\n") % bookmark)
89 finally:
90 release(lock, wlock)
91
92
86
93 @command("strip",
87 @command("strip",
94 [
88 [
General Comments 0
You need to be logged in to leave comments. Login now