Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 18133:7f5a0eba3768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Kevin Bullock <kbullock@ringworld.org>
date Wed, 26 Dec 2012 11:16:18 -0600
parents 2c1fc483efa4 730b769fb634
children 242d2f4ec01c
comparison
equal deleted inserted replaced
18132:db25bf1dc828 18133:7f5a0eba3768
4358 if node: 4358 if node:
4359 node = scmutil.revsingle(repo, node).node() 4359 node = scmutil.revsingle(repo, node).node()
4360 4360
4361 if not node and repo._bookmarkcurrent: 4361 if not node and repo._bookmarkcurrent:
4362 bmheads = repo.bookmarkheads(repo._bookmarkcurrent) 4362 bmheads = repo.bookmarkheads(repo._bookmarkcurrent)
4363 curhead = repo[repo._bookmarkcurrent] 4363 curhead = repo[repo._bookmarkcurrent].node()
4364 if len(bmheads) == 2: 4364 if len(bmheads) == 2:
4365 if curhead == bmheads[0]: 4365 if curhead == bmheads[0]:
4366 node = bmheads[1] 4366 node = bmheads[1]
4367 else: 4367 else:
4368 node = bmheads[0] 4368 node = bmheads[0]