Mercurial > public > mercurial-scm > hg

diff 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
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Feb 16 01:28:42 2011 +0100
+++ b/mercurial/commands.py	Wed Feb 16 01:29:26 2011 +0100
@@ -532,17 +532,11 @@
             ui.status(_("no bookmarks set\n"))
         else:
             for bmark, n in sorted(marks.iteritems()):
-                if ui.configbool('bookmarks', 'track.current'):
-                    current = repo._bookmarkcurrent
-                    if bmark == current and n == cur:
-                        prefix, label = '*', 'bookmarks.current'
-                    else:
-                        prefix, label = ' ', ''
+                current = repo._bookmarkcurrent
+                if bmark == current and n == cur:
+                    prefix, label = '*', 'bookmarks.current'
                 else:
-                    if n == cur:
-                        prefix, label = '*', 'bookmarks.current'
-                    else:
-                        prefix, label = ' ', ''
+                    prefix, label = ' ', ''
 
                 if ui.quiet:
                     ui.write("%s\n" % bmark, label=label)
@@ -4059,7 +4053,7 @@
     else:
         ret = hg.update(repo, rev)
 
-    if repo.ui.configbool('bookmarks', 'track.current'):
+    if brev in repo._bookmarks:
         bookmarks.setcurrent(repo, brev)
 
     return ret