[PATCH 08 of 14] bookmarks: Rename --move to --rename

Joel Rosdahl joel at rosdahl.net
Sat Oct 25 10:18:41 CDT 2008


# HG changeset patch
# User Joel Rosdahl <joel at rosdahl.net>
# Date 1224947620 -7200
# Node ID a8e0f150fa16636d0c5ea39118e826cef94230d6
# Parent  639040d85548b81c5c83ccd07c43402e4c8f0c72
bookmarks: Rename --move to --rename

To me, --move sounds like "make an existing bookmark refer to another
revision", but --move currently means "rename an existing bookmark".
This patch renames the switch to --rename to make it easier to
understand.

diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py
--- a/hgext/bookmarks.py
+++ b/hgext/bookmarks.py
@@ -59,7 +59,7 @@
         file.write("%s %s\n" % (hex(node), refspec))
     file.close()
 
-def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, move=None):
+def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None):
     '''mercurial bookmarks
 
     Bookmarks are pointers to certain commits that move when
@@ -76,15 +76,15 @@
     marks = parse(repo)
     cur   = repo.changectx('.').node()
 
-    if move:
-        if move not in marks:
+    if rename:
+        if rename not in marks:
             raise util.Abort(_("a bookmark of this name does not exist"))
         if mark in marks and not force:
             raise util.Abort(_("a bookmark of the same name already exists"))
         if mark is None:
             raise util.Abort(_("new bookmark name required"))
-        marks[mark] = marks[move]
-        del marks[move]
+        marks[mark] = marks[rename]
+        del marks[rename]
         write(repo, marks)
         return
 
@@ -222,6 +222,6 @@
          [('f', 'force', False, _('force')),
           ('r', 'rev', '', _('revision')),
           ('d', 'delete', False, _('delete a given bookmark')),
-          ('m', 'move', '', _('move a given bookmark'))],
+          ('m', 'rename', '', _('rename a given bookmark'))],
          _('hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]')),
 }


More information about the Mercurial-devel mailing list