mercurial: comparison mercurial/manifest.py

equal deleted inserted replaced

-:70e822796ac8
+:f0fbd88b21fb
 class treemanifest(object):
 def __init__(self, dir='', text=''):
 self._dir = dir
 self._node = revlog.nullid
+self._dirty = False
 self._dirs = {}
 # Using _lazymanifest here is a little slower than plain old dicts
 self._files = {}
 self._flags = {}
-def readsubtree(subdir, subm):
+if text:
-raise AssertionError('treemanifest constructor only accepts '
+def readsubtree(subdir, subm):
-'flat manifests')
+raise AssertionError('treemanifest constructor only accepts '
-self.parse(text, readsubtree)
+'flat manifests')
+self.parse(text, readsubtree)
+self._dirty = True # Mark flat manifest dirty after parsing
 def _subpath(self, path):
 return self._dir + path
 def __len__(self):
 def _isempty(self):
 return (not self._files and (not self._dirs or
 all(m._isempty() for m in self._dirs.values())))
 def __str__(self):
-return ('<treemanifest dir=%s, node=%s>' %
+return ('<treemanifest dir=%s, node=%s, dirty=%s>' %
-(self._dir, revlog.hex(self._node)))
+(self._dir, revlog.hex(self._node), self._dirty))
 def dir(self):
 '''The directory that this tree manifest represents, including a
 trailing '/'. Empty string for the repo root directory.'''
 return self._dir
 def node(self):
 '''This node of this instance. nullid for unsaved instances. Should
 be updated when the instance is read or written from a revlog.
 '''
+assert not self._dirty
 return self._node
 def setnode(self, node):
 self._node = node
+self._dirty = False
 def iteritems(self):
 for p, n in sorted(self._dirs.items() + self._files.items()):
 if p in self._files:
 yield self._subpath(p), n
 del self._dirs[dir]
 else:
 del self._files[f]
 if f in self._flags:
 del self._flags[f]
+self._dirty = True
 def __setitem__(self, f, n):
 assert n is not None
 dir, subpath = _splittopdir(f)
 if dir:
 if dir not in self._dirs:
 self._dirs[dir] = treemanifest(self._subpath(dir))
 self._dirs[dir].__setitem__(subpath, n)
 else:
 self._files[f] = n[:21] # to match manifestdict's behavior
+self._dirty = True
 def setflag(self, f, flags):
 """Set the flags (symlink, executable) for path f."""
 assert 'd' not in flags
 dir, subpath = _splittopdir(f)
 if dir not in self._dirs:
 self._dirs[dir] = treemanifest(self._subpath(dir))
 self._dirs[dir].setflag(subpath, flags)
 else:
 self._flags[f] = flags
+self._dirty = True
 def copy(self):
 copy = treemanifest(self._dir)
 copy._node = self._node
+copy._dirty = self._dirty
 for d in self._dirs:
 copy._dirs[d] = self._dirs[d].copy()
 copy._files = dict.copy(self._files)
 copy._flags = dict.copy(self._flags)
 return copy
 def filesnotin(self, m2):
 '''Set of files in this manifest that are not in the other'''
 files = set()
 def _filesnotin(t1, t2):
+if t1._node == t2._node and not t1._dirty and not t2._dirty:
+return
 for d, m1 in t1._dirs.iteritems():
 if d in t2._dirs:
 m2 = t2._dirs[d]
 _filesnotin(m1, m2)
 else:
 for dir, subm in self._dirs.iteritems():
 m = subm._matches(match)
 if not m._isempty():
 ret._dirs[dir] = m
+if not ret._isempty():
+ret._dirty = True
 return ret
 def diff(self, m2, clean=False):
 '''Finds changes between the current manifest and m2.
 string.
 '''
 result = {}
 emptytree = treemanifest()
 def _diff(t1, t2):
+if t1._node == t2._node and not t1._dirty and not t2._dirty:
+return
 for d, m1 in t1._dirs.iteritems():
 m2 = t2._dirs.get(d, emptytree)
 _diff(m1, m2)
 for d, m2 in t2._dirs.iteritems():
 def parse(self, text, readsubtree):
 for f, n, fl in _parse(text):
 if fl == 'd':
 f = f + '/'
 self._dirs[f] = readsubtree(self._subpath(f), n)
-else:
+elif '/' in f:
-# Use __setitem__ and setflag rather than assigning directly
+# This is a flat manifest, so use __setitem__ and setflag rather
-# to _files and _flags, thereby letting us parse flat manifests
+# than assigning directly to _files and _flags, so we can
-# as well as tree manifests.
+# assign a path in a subdirectory, and to mark dirty (compared
+# to nullid).
 self[f] = n
 if fl:
 self.setflag(f, fl)
+else:
+# Assigning to _files and _flags avoids marking as dirty,
+# and should be a little faster.
+self._files[f] = n
+if fl:
+self._flags[f] = fl
 def text(self, usemanifestv2=False):
 """Get the full data of this manifest as a bytestring."""
 flags = self.flags
 return _text(((f, self[f], flags(f)) for f in self.keys()),

changeset 25220	f0fbd88b21fb
parent 25188	2773540c3650
child 25221	eafa06e9edde