##// END OF EJS Templates
bookmarks: Rename --move to --rename...
Joel Rosdahl -
r7255:69e431ea default
parent child Browse files
Show More
@@ -59,7 +59,7 b' def write(repo, refs):'
59 file.write("%s %s\n" % (hex(node), refspec))
59 file.write("%s %s\n" % (hex(node), refspec))
60 file.close()
60 file.close()
61
61
62 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, move=None):
62 def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, rename=None):
63 '''mercurial bookmarks
63 '''mercurial bookmarks
64
64
65 Bookmarks are pointers to certain commits that move when
65 Bookmarks are pointers to certain commits that move when
@@ -76,15 +76,15 b' def bookmark(ui, repo, mark=None, rev=No'
76 marks = parse(repo)
76 marks = parse(repo)
77 cur = repo.changectx('.').node()
77 cur = repo.changectx('.').node()
78
78
79 if move:
79 if rename:
80 if move not in marks:
80 if rename not in marks:
81 raise util.Abort(_("a bookmark of this name does not exist"))
81 raise util.Abort(_("a bookmark of this name does not exist"))
82 if mark in marks and not force:
82 if mark in marks and not force:
83 raise util.Abort(_("a bookmark of the same name already exists"))
83 raise util.Abort(_("a bookmark of the same name already exists"))
84 if mark is None:
84 if mark is None:
85 raise util.Abort(_("new bookmark name required"))
85 raise util.Abort(_("new bookmark name required"))
86 marks[mark] = marks[move]
86 marks[mark] = marks[rename]
87 del marks[move]
87 del marks[rename]
88 write(repo, marks)
88 write(repo, marks)
89 return
89 return
90
90
@@ -222,6 +222,6 b' cmdtable = {'
222 [('f', 'force', False, _('force')),
222 [('f', 'force', False, _('force')),
223 ('r', 'rev', '', _('revision')),
223 ('r', 'rev', '', _('revision')),
224 ('d', 'delete', False, _('delete a given bookmark')),
224 ('d', 'delete', False, _('delete a given bookmark')),
225 ('m', 'move', '', _('move a given bookmark'))],
225 ('m', 'rename', '', _('rename a given bookmark'))],
226 _('hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]')),
226 _('hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]')),
227 }
227 }
General Comments 0
You need to be logged in to leave comments. Login now