[PATCH 1 of 6 censor RFC] mdiff: add helper for making deltas which replace the full text of a revision

Martin von Zweigbergk martinvonz at google.com
Fri Jan 23 22:50:52 CST 2015


The new function doesn't seem to get used in patch 2. I think it would be
easier to review if this patch was folded into 3/6, so the reviewer can
easily see how the function is used.

On Fri Jan 23 2015 at 3:57:02 PM Mike Edgar <adgar at google.com> wrote:

> # HG changeset patch
> # User Mike Edgar <adgar at google.com>
> # Date 1421876109 18000
> #      Wed Jan 21 16:35:09 2015 -0500
> # Node ID c918140288f12c3b5fb408da89512baff72ffd17
> # Parent  22a979d1ae569d1cd87f166b5600def0fe93efb3
> mdiff: add helper for making deltas which replace the full text of a
> revision
>
> This helper will be used initially for censor-aware delta generation.
> Deltas
> which replace the full contents of the base revision are guaranteed to
> apply
> correctly regardless of whether the delta recipient has censored the base.
>
> For background and broader design of the censorship feature, see:
> http://mercurial.selenic.com/wiki/CensorPlan
>
> diff -r 22a979d1ae56 -r c918140288f1 mercurial/mdiff.py
> --- a/mercurial/mdiff.py        Mon Jan 12 15:29:36 2015 -0500
> +++ b/mercurial/mdiff.py        Wed Jan 21 16:35:09 2015 -0500
> @@ -367,6 +367,9 @@
>  def trivialdiffheader(length):
>      return struct.pack(">lll", 0, 0, length)
>
> +def replacediffheader(old, new):
> +    return struct.pack(">lll", 0, old, new)
> +
>  patches = mpatch.patches
>  patchedsize = mpatch.patchedsize
>  textdiff = bdiff.bdiff
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150124/549b3882/attachment.html>


More information about the Mercurial-devel mailing list