[PATCH 2 of 2] help: fix layout of pre-formatted text

Augie Fackler raf at durin42.com
Thu Mar 9 20:32:08 EST 2017


On Thu, Mar 09, 2017 at 02:15:24PM +0900, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1489031748 -32400
> #      Thu Mar 09 12:55:48 2017 +0900
> # Node ID eed5ea2fb8416e6bd3a2ece99afa40519a01c828
> # Parent  a6d5c145a6ffcaf1e9e28174a050be1457ed4362
> help: fix layout of pre-formatted text

Queued these, thanks.

>
> diff --git a/mercurial/help/internals/changegroups.txt b/mercurial/help/internals/changegroups.txt
> --- a/mercurial/help/internals/changegroups.txt
> +++ b/mercurial/help/internals/changegroups.txt
> @@ -108,7 +108,7 @@ The *delta data* consists of ``chunklen
>  series of *delta*s, densely packed (no separators). These deltas describe a diff
>  from an existing entry (either that the recipient already has, or previously
>  specified in the bundle/changegroup). The format is described more fully in
> -``hg help internals.bdiff``, but briefly:
> +``hg help internals.bdiff``, but briefly::
>
>     +---------------------------------------------------------------+
>     |              |            |            |                      |
> diff --git a/tests/test-help.t b/tests/test-help.t
> --- a/tests/test-help.t
> +++ b/tests/test-help.t
> @@ -1063,12 +1063,12 @@ sub-topics can be accessed
>        has, or previously specified in the bundle/changegroup). The format is
>        described more fully in "hg help internals.bdiff", but briefly:
>
> -         +---------------------------------------------------------------+ |
> -         |            |            |                      | | start offset | end
> -         offset | new length |        content       | |  (4 bytes)   |  (4
> -         bytes) |  (4 bytes) | (<new length> bytes) | |              |
> -         |            |                      |
> -         +---------------------------------------------------------------+
> +        +---------------------------------------------------------------+
> +        |              |            |            |                      |
> +        | start offset | end offset | new length |        content       |
> +        |  (4 bytes)   |  (4 bytes) |  (4 bytes) | (<new length> bytes) |
> +        |              |            |            |                      |
> +        +---------------------------------------------------------------+
>
>        Please note that the length field in the delta data does *not* include
>        itself.
> @@ -3199,14 +3199,14 @@ Sub-topic topics rendered properly
>    specified in the bundle/changegroup). The format is described more fully in
>    "hg help internals.bdiff", but briefly:
>    </p>
> -  <p>
> +  <pre>
>    +---------------------------------------------------------------+
>    |              |            |            |                      |
>    | start offset | end offset | new length |        content       |
>    |  (4 bytes)   |  (4 bytes) |  (4 bytes) | (<new length> bytes) |
>    |              |            |            |                      |
>    +---------------------------------------------------------------+
> -  </p>
> +  </pre>
>    <p>
>    Please note that the length field in the delta data does *not* include itself.
>    </p>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list