Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/manifest.py @ 11934:cf858e76e992
manifest: correct readdelta() according to parentdeltas
author | Pradeepkumar Gayam <in3xes@gmail.com> |
---|---|
date | Tue, 10 Aug 2010 22:28:52 +0530 |
parents | 69e0bcf36961 |
children | 5f7ee3db3dd8 |
comparison
equal
deleted
inserted
replaced
11933:293afcfb66a8 | 11934:cf858e76e992 |
---|---|
34 parsers.parse_manifest(mfdict, mfdict._flags, lines) | 34 parsers.parse_manifest(mfdict, mfdict._flags, lines) |
35 return mfdict | 35 return mfdict |
36 | 36 |
37 def readdelta(self, node): | 37 def readdelta(self, node): |
38 r = self.rev(node) | 38 r = self.rev(node) |
39 if self._parentdelta: | |
40 return self.parse(mdiff.patchtext(self.revdiff(self.deltaparent(r), r))) | |
39 return self.parse(mdiff.patchtext(self.revdiff(r - 1, r))) | 41 return self.parse(mdiff.patchtext(self.revdiff(r - 1, r))) |
40 | 42 |
41 def read(self, node): | 43 def read(self, node): |
42 if node == revlog.nullid: | 44 if node == revlog.nullid: |
43 return manifestdict() # don't upset local cache | 45 return manifestdict() # don't upset local cache |