##// END OF EJS Templates
rawdata: update callers in sqlitestore...
marmoute -
r43017:ac9fed51 default draft
parent child Browse files
Show More
@@ -657,8 +657,7 b' class sqlitefilestore(object):'
657 # patch operation.
657 # patch operation.
658 if baserev != nullrev and self.iscensored(baserev):
658 if baserev != nullrev and self.iscensored(baserev):
659 hlen = struct.calcsize('>lll')
659 hlen = struct.calcsize('>lll')
660 oldlen = len(self.revision(deltabase, raw=True,
660 oldlen = len(self.rawdata(deltabase, _verifyhash=False))
661 _verifyhash=False))
662 newlen = len(delta) - hlen
661 newlen = len(delta) - hlen
663
662
664 if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen):
663 if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen):
@@ -667,7 +666,7 b' class sqlitefilestore(object):'
667
666
668 if (not (storeflags & FLAG_CENSORED)
667 if (not (storeflags & FLAG_CENSORED)
669 and storageutil.deltaiscensored(
668 and storageutil.deltaiscensored(
670 delta, baserev, lambda x: len(self.revision(x, raw=True)))):
669 delta, baserev, lambda x: len(self.rawdata(x)))):
671 storeflags |= FLAG_CENSORED
670 storeflags |= FLAG_CENSORED
672
671
673 linkrev = linkmapper(linknode)
672 linkrev = linkmapper(linknode)
@@ -720,7 +719,7 b' class sqlitefilestore(object):'
720
719
721 # This restriction is cargo culted from revlogs and makes no sense for
720 # This restriction is cargo culted from revlogs and makes no sense for
722 # SQLite, since columns can be resized at will.
721 # SQLite, since columns can be resized at will.
723 if len(tombstone) > len(self.revision(censornode, raw=True)):
722 if len(tombstone) > len(self.rawdata(censornode)):
724 raise error.Abort(_('censor tombstone must be no longer than '
723 raise error.Abort(_('censor tombstone must be no longer than '
725 'censored data'))
724 'censored data'))
726
725
General Comments 0
You need to be logged in to leave comments. Login now