[PATCH v2] bookmarks: pull new bookmarks from remote by default

[Martin Geisler]

Pierre-Yves David <pierre-yves.david at logilab.fr> writes:

> On Wed, May 16, 2012 at 12:13:08PM +0200, Martin Geisler wrote:
>> Pierre-Yves David <pierre-yves.david at logilab.fr> writes:
>> 
>> > On Wed, May 16, 2012 at 06:58:20AM +0200, Angel Ezquerra wrote:
>> >> On May 15, 2012 2:05 PM, "Pierre-Yves David" <pierre-yves.david at logilab.fr>
>> >> wrote:
>> >> >
>> >> > On Mon, May 14, 2012 at 11:38:45PM +0200, Angel Ezquerra wrote:
>> >> > > Maybe there could be a configuration key to disable this new behavior?
>> >> > > Also, or optionally, perhaps there could be some sort of "local"
>> >> > > bookmark namespace, kind of like there is a local tag namespace?
>> >> >
>> >> > I think that explicite "secret" bookmark is the most sensible
>> >> > approach here. All other bookmark could be exchanged.
>> >> >
>> >> >
>> >> > --
>> >> > Pierre-Yves David
>> >> >
>> >> 
>> >> Pierre-Yves, what do you mean by "explicit secret bookmark"?
>> >> 
>> >> I am not aware that you can create secret bookmarks...
>> >
>> > They do not exist yet, The suggestion is to have 
>> >
>> > local-bookmark: only exists in your repository and not exchanged.
>> >
>> > public-bookmark: are always exchanged on pull//push//clone (as non
>> > secret-changeset are)
>> >
>> > Note that "public" bookmark on secret changeset are not
>> > visible/exchanged either
>> 
>> That's great -- I think users should use this mechanism to make a
>> bookmark "secret". It is best if we can avoid introducing too many new
>> concepts, so the phase machinery should be used where it makes sense.
>> 
>> In other words, Kevin should mark changesets secret before running 'hg
>> serve' if he doesn't want people to get when when they pull/clone.
>> Bookmarks on such secret changesets will then also stay in place. That
>> seems consistent and not too inconvenient to me.
>
> Does not solve the case where I have a <private> bookmark in a the
> middle of my draft history.

I haven't used bookmarks much, but I would be okay with saying that this
just isn't possible -- maybe the draft history above should really be
secret? Why would you share the history without sharing the bookmarks?
If the bookmarks are pointing to heads (as they should), then they will
be useful in other repositories as well. If they don't point to heads,
could you have used a local tag instead?

Making a simple rule feels important to me: the above rule is that
exposing a changeset also exposes the bookmarks that point to it.


-- 
Martin Geisler

aragost Trifork
Commercial Mercurial support
http://aragost.com/mercurial/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120516/d9a4d9e3/attachment.pgp>