equal
deleted
inserted
replaced
1570 p1 = chunkdata['p1'] |
1570 p1 = chunkdata['p1'] |
1571 p2 = chunkdata['p2'] |
1571 p2 = chunkdata['p2'] |
1572 cs = chunkdata['cs'] |
1572 cs = chunkdata['cs'] |
1573 deltabase = chunkdata['deltabase'] |
1573 deltabase = chunkdata['deltabase'] |
1574 delta = chunkdata['delta'] |
1574 delta = chunkdata['delta'] |
|
1575 flags = chunkdata['flags'] or REVIDX_DEFAULT_FLAGS |
1575 |
1576 |
1576 content.append(node) |
1577 content.append(node) |
1577 |
1578 |
1578 link = linkmapper(cs) |
1579 link = linkmapper(cs) |
1579 if node in self.nodemap: |
1580 if node in self.nodemap: |
1600 newlen = len(delta) - hlen |
1601 newlen = len(delta) - hlen |
1601 if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen): |
1602 if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen): |
1602 raise error.CensoredBaseError(self.indexfile, |
1603 raise error.CensoredBaseError(self.indexfile, |
1603 self.node(baserev)) |
1604 self.node(baserev)) |
1604 |
1605 |
1605 flags = REVIDX_DEFAULT_FLAGS |
1606 if not flags and self._peek_iscensored(baserev, delta, flush): |
1606 if self._peek_iscensored(baserev, delta, flush): |
|
1607 flags |= REVIDX_ISCENSORED |
1607 flags |= REVIDX_ISCENSORED |
1608 |
1608 |
1609 # We assume consumers of addrevisioncb will want to retrieve |
1609 # We assume consumers of addrevisioncb will want to retrieve |
1610 # the added revision, which will require a call to |
1610 # the added revision, which will require a call to |
1611 # revision(). revision() will fast path if there is a cache |
1611 # revision(). revision() will fast path if there is a cache |