Mercurial > hg
diff hgext/bookmarks.py @ 11994:31dde4c3bb83 stable
bookmarks: Check if the bookmark to delete exists on the remote
author | David Soria Parra <dsp@php.net> |
---|---|
date | Thu, 19 Aug 2010 15:04:21 -0400 |
parents | 18c47562d331 |
children | 4b1197f15313 1938954354ec |
line wrap: on
line diff
--- a/hgext/bookmarks.py Thu Aug 19 22:51:09 2010 +0200 +++ b/hgext/bookmarks.py Thu Aug 19 15:04:21 2010 -0400 @@ -442,9 +442,12 @@ if b in repo._bookmarks: ui.status(_("exporting bookmark %s\n") % b) new = repo[b].hex() - else: + elif b in rb: ui.status(_("deleting remote bookmark %s\n") % b) new = '' # delete + else: + ui.warn(_('bookmark %s does not exist on the local or remote repository!\n') % b) + return 2 old = rb.get(b, '') r = other.pushkey('bookmarks', b, old, new) if not r: