Patchwork [2,of,2,v3] manifest: disallow setting the node id of an entry to None

login
register
mail settings
Submitter Augie Fackler
Date Dec. 15, 2014, 7:14 p.m.
Message ID <361325071ce7e638db0e.1418670866@arthedain.pit.corp.google.com>
Download mbox | patch
Permalink /patch/7119/
State Superseded
Delegated to: Pierre-Yves David
Headers show

Comments

Augie Fackler - Dec. 15, 2014, 7:14 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1418409644 18000
#      Fri Dec 12 13:40:44 2014 -0500
# Node ID 361325071ce7e638db0e81e1e6ca9e8929bcf90a
# Parent  b7772da447df306ddfad854d7acd6b72bb5d5534
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.

Patch

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):