##// END OF EJS Templates
with: use context manager for wlock in overriderevert
Bryan O'Sullivan -
r27823:37552634 default
parent child Browse files
Show More
@@ -717,8 +717,7 b' def overriderevert(orig, ui, repo, ctx, '
717 # Because we put the standins in a bad state (by updating them)
717 # Because we put the standins in a bad state (by updating them)
718 # and then return them to a correct state we need to lock to
718 # and then return them to a correct state we need to lock to
719 # prevent others from changing them in their incorrect state.
719 # prevent others from changing them in their incorrect state.
720 wlock = repo.wlock()
720 with repo.wlock():
721 try:
722 lfdirstate = lfutil.openlfdirstate(ui, repo)
721 lfdirstate = lfutil.openlfdirstate(ui, repo)
723 s = lfutil.lfdirstatestatus(lfdirstate, repo)
722 s = lfutil.lfdirstatestatus(lfdirstate, repo)
724 lfdirstate.write()
723 lfdirstate.write()
@@ -778,9 +777,6 b' def overriderevert(orig, ui, repo, ctx, '
778 lfcommands.updatelfiles(ui, repo, filelist, printmessage=False,
777 lfcommands.updatelfiles(ui, repo, filelist, printmessage=False,
779 normallookup=True)
778 normallookup=True)
780
779
781 finally:
782 wlock.release()
783
784 # after pulling changesets, we need to take some extra care to get
780 # after pulling changesets, we need to take some extra care to get
785 # largefiles updated remotely
781 # largefiles updated remotely
786 def overridepull(orig, ui, repo, source=None, **opts):
782 def overridepull(orig, ui, repo, source=None, **opts):
General Comments 0
You need to be logged in to leave comments. Login now