[PATCH 1 of 4] imported patch flags
Pradeepkumar Gayam
in3xes at gmail.com
Tue Jun 22 02:31:02 CDT 2010
# HG changeset patch
# User Pradeepkumar Gayam <in3xes at gmail.com>
# Date 1277183801 -19800
# Node ID 466d7fb61dca5cb1e54e4e38fb941fba1a5d0909
# Parent 7a6ac83a15b08324c45aa43b27e8f83c51479e51
imported patch flags
diff -r 7a6ac83a15b0 -r 466d7fb61dca mercurial/revlog.py
--- a/mercurial/revlog.py Tue Jun 08 17:56:57 2010 +0200
+++ b/mercurial/revlog.py Tue Jun 22 10:46:41 2010 +0530
@@ -30,6 +30,7 @@
REVLOG_DEFAULT_FLAGS = REVLOGNGINLINEDATA
REVLOG_DEFAULT_FORMAT = REVLOGNG
REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS
+REVLOG_PARENTDELTA_FLAGS = 1
# amount of data read unconditionally, should be >= 4
# when not inline: threshold for using lazy index
@@ -1004,6 +1005,9 @@
return mdiff.textdiff(self.revision(self.node(rev1)),
self.revision(self.node(rev2)))
+ def flags(self, rev):
+ return gettype(self.index[rev][0])
+
def revision(self, node):
"""return an uncompressed revision of a given node"""
if node == nullid:
@@ -1017,9 +1021,9 @@
base = self.base(rev)
# check rev flags
- if self.index[rev][0] & 0xFFFF:
+ if self.flags(rev) & ~1:
raise RevlogError(_('incompatible revision flag %x') %
- (self.index[rev][0] & 0xFFFF))
+ (self.flags(rev)))
# do we have useful data cached?
if self._cache and self._cache[1] >= base and self._cache[1] < rev:
@@ -1109,6 +1113,7 @@
prev = curr - 1
base = self.base(prev)
offset = self.end(prev)
+ flags = 0
if curr:
if not d:
@@ -1125,7 +1130,7 @@
l = len(data[1]) + len(data[0])
base = curr
- e = (offset_type(offset, 0), l, len(text),
+ e = (offset_type(offset, flags), l, len(text),
base, link, self.rev(p1), self.rev(p2), node)
self.index.insert(-1, e)
self.nodemap[node] = curr
More information about the Mercurial-devel
mailing list