diff options
Diffstat (limited to 'mercurial/manifest.py')
| -rw-r--r-- | mercurial/manifest.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mercurial/manifest.py b/mercurial/manifest.py index 07f0b6d..7c3781c 100644 --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -6,7 +6,7 @@ # GNU General Public License version 2 or any later version. from i18n import _ -import mdiff, parsers, error, revlog, util +import mdiff, parsers, error, revlog import array, struct class manifestdict(dict): @@ -19,8 +19,6 @@ class manifestdict(dict): self._flags = flags def flags(self, f): return self._flags.get(f, "") - def withflags(self): - return set(self._flags.keys()) def set(self, f, flags): self._flags[f] = flags def copy(self): @@ -126,8 +124,8 @@ class manifest(revlog.revlog): addlist[start:end] = array.array('c', content) else: del addlist[start:end] - return "".join(struct.pack(">lll", start, end, len(content)) - + content for start, end, content in x) + return "".join(struct.pack(">lll", start, end, len(content)) + content + for start, end, content in x) def checkforbidden(l): for f in l: @@ -166,7 +164,7 @@ class manifest(revlog.revlog): dline = [""] start = 0 # zero copy representation of addlist as a buffer - addbuf = util.buffer(addlist) + addbuf = buffer(addlist) # start with a readonly loop that finds the offset of # each line and creates the deltas @@ -198,7 +196,7 @@ class manifest(revlog.revlog): # apply the delta to the addlist, and get a delta for addrevision cachedelta = (self.rev(p1), addlistdelta(addlist, delta)) arraytext = addlist - text = util.buffer(arraytext) + text = buffer(arraytext) n = self.addrevision(text, transaction, link, p1, p2, cachedelta) self._mancache = (n, map, arraytext) |