[PATCH 2 of 2 v2] manifest: disallow setting the node id of an entry to None
Augie Fackler
raf at durin42.com
Mon Dec 15 13:03:30 CST 2014
It's not my day at the comparison operator store. I just found a bug
in this series, a v3 to follow.
On Mon, Dec 15, 2014 at 12:59 PM, Augie Fackler <raf at durin42.com> wrote:
> # HG changeset patch
> # User Augie Fackler <augie at google.com>
> # Date 1418409644 18000
> # Fri Dec 12 13:40:44 2014 -0500
> # Node ID f8ad4740ed42aae9112d5f2ed2f5df128c5d2257
> # Parent 85f3187042f6fe3db123b17b87f4f0b290a47c02
> manifest: disallow setting the node id of an entry to None
>
> manifest.diff() uses None as a special value to denote the absence of
> a file, so setting a file node to None means you then can't trust
> manifest.diff().
>
> This should also make future manifest work slightly easier.
>
> diff --git a/mercurial/manifest.py b/mercurial/manifest.py
> --- a/mercurial/manifest.py
> +++ b/mercurial/manifest.py
> @@ -17,6 +17,9 @@ class manifestdict(dict):
> flags = {}
> dict.__init__(self, mapping)
> self._flags = flags
> + def __setitem__(self, k, v):
> + assert v is not None
> + dict.__setitem__(self, k, v)
> def flags(self, f):
> return self._flags.get(f, "")
> def withflags(self):
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list