# HG changeset patch # User Dmitriy Taychenachev # Date 1225012128 -28800 # Node ID 3cbadcf28a4c194dc9605ddddff227489ec82a2b # Parent 4ba89b6d0e05636604b79cda159042a1030b1c5c bookmarks: do nothing if commit was not successful. diff -r 4ba89b6d0e05 -r 3cbadcf28a4c hgext/bookmarks.py --- a/hgext/bookmarks.py Sat Oct 25 19:05:52 2008 +0200 +++ b/hgext/bookmarks.py Sun Oct 26 17:08:48 2008 +0800 @@ -184,6 +184,8 @@ """Add a revision to the repository and move the bookmark""" node = super(bookmark_repo, self).commit(*k, **kw) + if node == None: + return None parents = repo.changelog.parents(node) if parents[1] == nullid: parents = (parents[0],)