Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 33005:9343fce87789

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: factor out delete logic from commands We keep the lock in the caller so that future devs are aware of the locking implications.
author Sean Farley <sean@farley.io>
date Mon, 12 Jun 2017 23:02:48 -0700
parents 4f0a7f604449
children e0a8dd6c87c7
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Jun 23 15:30:27 2017 -0400
+++ b/mercurial/commands.py	Mon Jun 12 23:02:48 2017 -0700
@@ -975,14 +975,7 @@
             marks = repo._bookmarks
             if delete:
                 tr = repo.transaction('bookmark')
-                for mark in names:
-                    if mark not in marks:
-                        raise error.Abort(_("bookmark '%s' does not exist") %
-                                         mark)
-                    if mark == repo._activebookmark:
-                        bookmarks.deactivate(repo)
-                    del marks[mark]
-
+                bookmarks.delete(repo, tr, names)
             elif rename:
                 tr = repo.transaction('bookmark')
                 if not names: