Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 13416:5431b3f3e52e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: make track.current=True default behaviour and remove option (BC)
author David Soria Parra <dsp@php.net>
date Wed, 16 Feb 2011 01:29:26 +0100
parents 25b5694b9337
children 97b69883e929
comparison
equal deleted inserted replaced
13415:25b5694b9337 13416:5431b3f3e52e
530 raise util.Abort(_("bookmark name required")) 530 raise util.Abort(_("bookmark name required"))
531 if len(marks) == 0: 531 if len(marks) == 0:
532 ui.status(_("no bookmarks set\n")) 532 ui.status(_("no bookmarks set\n"))
533 else: 533 else:
534 for bmark, n in sorted(marks.iteritems()): 534 for bmark, n in sorted(marks.iteritems()):
535 if ui.configbool('bookmarks', 'track.current'): 535 current = repo._bookmarkcurrent
536 current = repo._bookmarkcurrent 536 if bmark == current and n == cur:
537 if bmark == current and n == cur: 537 prefix, label = '*', 'bookmarks.current'
538 prefix, label = '*', 'bookmarks.current'
539 else:
540 prefix, label = ' ', ''
541 else: 538 else:
542 if n == cur: 539 prefix, label = ' ', ''
543 prefix, label = '*', 'bookmarks.current'
544 else:
545 prefix, label = ' ', ''
546 540
547 if ui.quiet: 541 if ui.quiet:
548 ui.write("%s\n" % bmark, label=label) 542 ui.write("%s\n" % bmark, label=label)
549 else: 543 else:
550 ui.write(" %s %-25s %d:%s\n" % ( 544 ui.write(" %s %-25s %d:%s\n" % (
4057 if clean or check: 4051 if clean or check:
4058 ret = hg.clean(repo, rev) 4052 ret = hg.clean(repo, rev)
4059 else: 4053 else:
4060 ret = hg.update(repo, rev) 4054 ret = hg.update(repo, rev)
4061 4055
4062 if repo.ui.configbool('bookmarks', 'track.current'): 4056 if brev in repo._bookmarks:
4063 bookmarks.setcurrent(repo, brev) 4057 bookmarks.setcurrent(repo, brev)
4064 4058
4065 return ret 4059 return ret
4066 4060
4067 def verify(ui, repo): 4061 def verify(ui, repo):