commands.bookmarks: move cur initialization to inside wlock
authorSiddharth Agarwal <sid0@fb.com>
Tue, 19 Nov 2013 12:42:17 -0800
changeset 20234 8a133190da89
parent 20233 410193f11422
child 20235 a602d2aca8bf
commands.bookmarks: move cur initialization to inside wlock This is more correct because we now fetch '.' while nothing else can interfere with it.
mercurial/commands.py
--- a/mercurial/commands.py	Thu Nov 21 17:11:04 2013 -0800
+++ b/mercurial/commands.py	Tue Nov 19 12:42:17 2013 -0800
@@ -808,7 +808,6 @@
     inactive = opts.get('inactive')
 
     hexfn = ui.debugflag and hex or short
-    cur   = repo.changectx('.').node()
 
     def checkformat(mark):
         mark = mark.strip()
@@ -864,6 +863,7 @@
     if delete or rename or names or inactive:
         wlock = repo.wlock()
         try:
+            cur = repo.changectx('.').node()
             marks = repo._bookmarks
             if delete:
                 for mark in names: