Mercurial > hg
changeset 20234:8a133190da89
commands.bookmarks: move cur initialization to inside wlock
This is more correct because we now fetch '.' while nothing else can interfere
with it.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 19 Nov 2013 12:42:17 -0800 |
parents | 410193f11422 |
children | a602d2aca8bf |
files | mercurial/commands.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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: