[PATCH 3 of 3] shelve: copy bookmarks and restore them after a commit

Durham Goode durham at fb.com
Thu Oct 3 12:31:51 CDT 2013


On 10/3/13 7:47 AM, "David Soria Parra" <dsp at experimentalworks.net> wrote:

>         ui.status(_('shelved as %s\n') % name)
>         hg.update(repo, parent.node())
>     finally:
>+        if bms:
>+            # restore old bookmarks
>+            bms.write()

Do you need to restore the in-memory repo._bookmarks as well?  Just in
case the shelve function is ever called from another extension.  A quick
test seems to show me that editing .hg/bookmarks doesn't automatically
cause repo._bookmarks to refresh.

It'd also be nice if bookmarks were treated as part of the normal
transaction.  But that's probably out of the scope of this change.



More information about the Mercurial-devel mailing list