Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 19475:e24531a23ae4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: clear any clearable unfinished operations (issue3955) Unclearable operations will cause an abort.
author Matt Mackall <mpm@selenic.com>
date Wed, 24 Jul 2013 23:30:24 -0500
parents bf6bc4681383
children 4fed15d4c5aa
comparison
equal deleted inserted replaced
19474:894fd1a7c533 19475:e24531a23ae4
5818 raise util.Abort(_("please specify just one revision")) 5818 raise util.Abort(_("please specify just one revision"))
5819 5819
5820 if rev is None or rev == '': 5820 if rev is None or rev == '':
5821 rev = node 5821 rev = node
5822 5822
5823 cmdutil.clearunfinished(repo)
5824
5823 # with no argument, we also move the current bookmark, if any 5825 # with no argument, we also move the current bookmark, if any
5824 movemarkfrom = None 5826 movemarkfrom = None
5825 if rev is None: 5827 if rev is None:
5826 curmark = repo._bookmarkcurrent 5828 curmark = repo._bookmarkcurrent
5827 if bookmarks.iscurrent(repo): 5829 if bookmarks.iscurrent(repo):