480 node = revlog.node(rev) |
480 node = revlog.node(rev) |
481 p1, p2 = revlog.parentrevs(rev) |
481 p1, p2 = revlog.parentrevs(rev) |
482 base = self.deltaparent(revlog, rev, p1, p2, prev) |
482 base = self.deltaparent(revlog, rev, p1, p2, prev) |
483 |
483 |
484 prefix = '' |
484 prefix = '' |
485 if base == nullrev: |
485 if revlog.iscensored(base) or revlog.iscensored(rev): |
|
486 try: |
|
487 delta = revlog.revision(node) |
|
488 except error.CensoredNodeError, e: |
|
489 delta = e.tombstone |
|
490 if base == nullrev: |
|
491 prefix = mdiff.trivialdiffheader(len(delta)) |
|
492 else: |
|
493 baselen = revlog.rawsize(base) |
|
494 prefix = mdiff.replacediffheader(baselen, len(delta)) |
|
495 elif base == nullrev: |
486 delta = revlog.revision(node) |
496 delta = revlog.revision(node) |
487 prefix = mdiff.trivialdiffheader(len(delta)) |
497 prefix = mdiff.trivialdiffheader(len(delta)) |
488 else: |
498 else: |
489 delta = revlog.revdiff(base, rev) |
499 delta = revlog.revdiff(base, rev) |
490 p1n, p2n = revlog.parents(node) |
500 p1n, p2n = revlog.parents(node) |