[PATCH 1 of 2 RFC] unbundle: don't forward the current bookmark

Idan K idankk86 at gmail.com
Tue Apr 19 07:44:30 CDT 2011


On Tue, Apr 19, 2011 at 3:34 PM, Idan Kamara <idankk86 at gmail.com> wrote:

> # HG changeset patch
> # User Idan Kamara <idankk86 at gmail.com>
> # Date 1303216397 -10800
> # Node ID 25d517cc7b5652925bf7d7188c9e93d6866931e7
> # Parent  f36d358e04aa7f9822f45f5226c7d01f253a57a9
> unbundle: don't forward the current bookmark
>
> it's unintuitive for unbundle to move the current
> bookmark, this is now done by 'hg update'.
>
> diff -r f36d358e04aa -r 25d517cc7b56 mercurial/commands.py
> --- a/mercurial/commands.py     Tue Apr 19 15:26:44 2011 +0300
> +++ b/mercurial/commands.py     Tue Apr 19 15:33:17 2011 +0300
> @@ -4125,14 +4125,12 @@
>     fnames = (fname1,) + fnames
>
>     lock = repo.lock()
> -    wc = repo['.']
>     try:
>         for fname in fnames:
>             f = url.open(ui, fname)
>             gen = changegroup.readbundle(f, fname)
>             modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' +
> fname,
>                                            lock=lock)
> -        bookmarks.updatecurrentbookmark(repo, wc.node(), wc.branch())
>     finally:
>         lock.release()
>     return postincoming(ui, repo, modheads, opts.get('update'), None)
>

Hm, for some reason this was sent as #1, but it should be swapped with #2.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20110419/28efd648/attachment.htm>


More information about the Mercurial-devel mailing list