Patchwork [8,of,8,V7] help: add documentation about bookmark part

login
register
mail settings
Submitter Stanislau Hlebik
Date Nov. 2, 2016, 2:06 p.m.
Message ID <5ed1eda9bf3e92dd6037.1478095610@dev1918.lla1.facebook.com>
Download mbox | patch
Permalink /patch/17283/
State Superseded
Headers show

Comments

Stanislau Hlebik - Nov. 2, 2016, 2:06 p.m.
# HG changeset patch
# User Stanislau Hlebik <stash@fb.com>
# Date 1478095405 25200
#      Wed Nov 02 07:03:25 2016 -0700
# Branch stable
# Node ID 5ed1eda9bf3e92dd6037028a0202690dc845efa2
# Parent  c2a9f675fac55522bb954ea81c29fa0158106214
help: add documentation about bookmark part
Augie Fackler - Nov. 9, 2016, 5:27 p.m.
On Wed, Nov 02, 2016 at 07:06:50AM -0700, Stanislau Hlebik wrote:
> # HG changeset patch
> # User Stanislau Hlebik <stash@fb.com>
> # Date 1478095405 25200
> #      Wed Nov 02 07:03:25 2016 -0700
> # Branch stable
> # Node ID 5ed1eda9bf3e92dd6037028a0202690dc845efa2
> # Parent  c2a9f675fac55522bb954ea81c29fa0158106214
> help: add documentation about bookmark part

Overall, I like where this has gone. I've got a question earlier in
the series, but this looks very close to done. Thanks!

Can I interest you in checking
https://hg.durin42.com/hg-wip/rev/5dc4e70f2807 to see if it fixes a
long-standing bug around exchange of long bookmark names?

>
> diff --git a/mercurial/help/internals/bundles.txt b/mercurial/help/internals/bundles.txt
> --- a/mercurial/help/internals/bundles.txt
> +++ b/mercurial/help/internals/bundles.txt
> @@ -92,3 +92,32 @@
>  ``HGS1UN`` support was added as an experimental feature in version 3.6
>  (released November 2015) as part of the initial offering of the *clone
>  bundles* feature.
> +
> +Bundle2 parts
> +=============
> +
> +Bundle2 may contain many different pieces of information. These pieces are
> +called parts.
> +
> +Bookmarks part
> +--------------
> +
> +This part contains information about bookmarks. Part consists of many entries.
> +Each entry describes one bookmark. Entry format:
> +
> +4 bytes
> +  bookmark size
> +1 byte
> +  boolean. True if node is empty, False otherwise
> +20 bytes (optional)
> +  node. Present only if previous field is True
> +
> +Modes:
> +
> +1. 'ignore' - do not apply any changes to the repo, just decode the passed
> +bookmarks. Will be used to list bookmarks in remote repo.
> +2. 'diverge' - apply bookmark changes to the repo. Create divergent bookmarks if
> +there is a non-fastforward move. Will be used during pull.
> +3. 'apply' - apply bookmark changes to the repo. Overwrite current bookmark node
> +if there is a non-fastforward move. Will be used during push.
> +
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Stanislau Hlebik - Nov. 10, 2016, 9:15 a.m.
No, it doesn’t fix it yet, because this series only uses bookmarks part only for pull.
I’ll add support for bookmarks part for push in the next patches and it will fix the issue.

On 11/9/16, 5:27 PM, "Augie Fackler" <raf@durin42.com> wrote:

    On Wed, Nov 02, 2016 at 07:06:50AM -0700, Stanislau Hlebik wrote:
    > # HG changeset patch

    > # User Stanislau Hlebik <stash@fb.com>

    > # Date 1478095405 25200

    > #      Wed Nov 02 07:03:25 2016 -0700

    > # Branch stable

    > # Node ID 5ed1eda9bf3e92dd6037028a0202690dc845efa2

    > # Parent  c2a9f675fac55522bb954ea81c29fa0158106214

    > help: add documentation about bookmark part

    
    Overall, I like where this has gone. I've got a question earlier in
    the series, but this looks very close to done. Thanks!
    
    Can I interest you in checking
    https://urldefense.proofpoint.com/v2/url?u=https-3A__hg.durin42.com_hg-2Dwip_rev_5dc4e70f2807&d=DQIBAg&c=5VD0RTtNlTh3ycd41b3MUw&r=1EQ58Dmb5uX1qHujcsT1Mg&m=Gxpj-1Zv83d4eD2d-m1AIHJdewxh_0UB6udkd5Z39R4&s=cJJveAtT-wtKgQzoYyhdGbKEbIEUqxpQ9p_LUrQhw2g&e=  to see if it fixes a
    long-standing bug around exchange of long bookmark names?
    
    >

    > diff --git a/mercurial/help/internals/bundles.txt b/mercurial/help/internals/bundles.txt

    > --- a/mercurial/help/internals/bundles.txt

    > +++ b/mercurial/help/internals/bundles.txt

    > @@ -92,3 +92,32 @@

    >  ``HGS1UN`` support was added as an experimental feature in version 3.6

    >  (released November 2015) as part of the initial offering of the *clone

    >  bundles* feature.

    > +

    > +Bundle2 parts

    > +=============

    > +

    > +Bundle2 may contain many different pieces of information. These pieces are

    > +called parts.

    > +

    > +Bookmarks part

    > +--------------

    > +

    > +This part contains information about bookmarks. Part consists of many entries.

    > +Each entry describes one bookmark. Entry format:

    > +

    > +4 bytes

    > +  bookmark size

    > +1 byte

    > +  boolean. True if node is empty, False otherwise

    > +20 bytes (optional)

    > +  node. Present only if previous field is True

    > +

    > +Modes:

    > +

    > +1. 'ignore' - do not apply any changes to the repo, just decode the passed

    > +bookmarks. Will be used to list bookmarks in remote repo.

    > +2. 'diverge' - apply bookmark changes to the repo. Create divergent bookmarks if

    > +there is a non-fastforward move. Will be used during pull.

    > +3. 'apply' - apply bookmark changes to the repo. Overwrite current bookmark node

    > +if there is a non-fastforward move. Will be used during push.

    > +

    > _______________________________________________

    > Mercurial-devel mailing list

    > Mercurial-devel@mercurial-scm.org

    > https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=DQIBAg&c=5VD0RTtNlTh3ycd41b3MUw&r=1EQ58Dmb5uX1qHujcsT1Mg&m=Gxpj-1Zv83d4eD2d-m1AIHJdewxh_0UB6udkd5Z39R4&s=ON8rcjQ6bpGyVMtgJG4pD8JkizxtLHZX3eD2QZx8iOo&e=

Patch

diff --git a/mercurial/help/internals/bundles.txt b/mercurial/help/internals/bundles.txt
--- a/mercurial/help/internals/bundles.txt
+++ b/mercurial/help/internals/bundles.txt
@@ -92,3 +92,32 @@ 
 ``HGS1UN`` support was added as an experimental feature in version 3.6
 (released November 2015) as part of the initial offering of the *clone
 bundles* feature.
+
+Bundle2 parts
+=============
+
+Bundle2 may contain many different pieces of information. These pieces are
+called parts.
+
+Bookmarks part
+--------------
+
+This part contains information about bookmarks. Part consists of many entries.
+Each entry describes one bookmark. Entry format:
+
+4 bytes
+  bookmark size
+1 byte
+  boolean. True if node is empty, False otherwise
+20 bytes (optional)
+  node. Present only if previous field is True
+
+Modes:
+
+1. 'ignore' - do not apply any changes to the repo, just decode the passed
+bookmarks. Will be used to list bookmarks in remote repo.
+2. 'diverge' - apply bookmark changes to the repo. Create divergent bookmarks if
+there is a non-fastforward move. Will be used during pull.
+3. 'apply' - apply bookmark changes to the repo. Overwrite current bookmark node
+if there is a non-fastforward move. Will be used during push.
+