Show More
@@ -112,14 +112,10 b' class unionrevlog(revlog.revlog):' | |||||
112 | def rawdata(self, nodeorrev, _df=None): |
|
112 | def rawdata(self, nodeorrev, _df=None): | |
113 | return self.revision(nodeorrev, _df=_df, raw=True) |
|
113 | return self.revision(nodeorrev, _df=_df, raw=True) | |
114 |
|
114 | |||
115 |
def baserev |
|
115 | def baserevdiff(self, rev1, rev2): | |
116 |
# Revlog subclasses may override 'rev |
|
116 | # Revlog subclasses may override 'revdiff' method to modify format of | |
117 | # content retrieved from revlog. To use unionrevlog with such class one |
|
117 | # content retrieved from revlog. To use unionrevlog with such class one | |
118 |
# needs to override 'baserev |
|
118 | # needs to override 'baserevdiff' and make more specific call here. | |
119 | return revlog.revlog.revision(self, nodeorrev) |
|
|||
120 |
|
||||
121 | def baserevdiff(self, rev1, rev2): |
|
|||
122 | # Exists for the same purpose as baserevision. |
|
|||
123 | return revlog.revlog.revdiff(self, rev1, rev2) |
|
119 | return revlog.revlog.revdiff(self, rev1, rev2) | |
124 |
|
120 | |||
125 | def addrevision(self, text, transaction, link, p1=None, p2=None, d=None): |
|
121 | def addrevision(self, text, transaction, link, p1=None, p2=None, d=None): | |
@@ -140,13 +136,10 b' class unionchangelog(unionrevlog, change' | |||||
140 | unionrevlog.__init__(self, opener, self.indexfile, changelog2, |
|
136 | unionrevlog.__init__(self, opener, self.indexfile, changelog2, | |
141 | linkmapper) |
|
137 | linkmapper) | |
142 |
|
138 | |||
143 |
def baserev |
|
139 | def baserevdiff(self, rev1, rev2): | |
144 |
# Although changelog doesn't override 'rev |
|
140 | # Although changelog doesn't override 'revdiff' method, some extensions | |
145 | # may replace this class with another that does. Same story with |
|
141 | # may replace this class with another that does. Same story with | |
146 | # manifest and filelog classes. |
|
142 | # manifest and filelog classes. | |
147 | return changelog.changelog.revision(self, nodeorrev) |
|
|||
148 |
|
||||
149 | def baserevdiff(self, rev1, rev2): |
|
|||
150 | return changelog.changelog.revdiff(self, rev1, rev2) |
|
143 | return changelog.changelog.revdiff(self, rev1, rev2) | |
151 |
|
144 | |||
152 | class unionmanifest(unionrevlog, manifest.manifestrevlog): |
|
145 | class unionmanifest(unionrevlog, manifest.manifestrevlog): | |
@@ -156,9 +149,6 b' class unionmanifest(unionrevlog, manifes' | |||||
156 | unionrevlog.__init__(self, opener, self.indexfile, manifest2, |
|
149 | unionrevlog.__init__(self, opener, self.indexfile, manifest2, | |
157 | linkmapper) |
|
150 | linkmapper) | |
158 |
|
151 | |||
159 | def baserevision(self, nodeorrev): |
|
|||
160 | return manifest.manifestrevlog.revision(self, nodeorrev) |
|
|||
161 |
|
||||
162 | def baserevdiff(self, rev1, rev2): |
|
152 | def baserevdiff(self, rev1, rev2): | |
163 | return manifest.manifestrevlog.revdiff(self, rev1, rev2) |
|
153 | return manifest.manifestrevlog.revdiff(self, rev1, rev2) | |
164 |
|
154 | |||
@@ -172,9 +162,6 b' class unionfilelog(filelog.filelog):' | |||||
172 | self.repotiprev = self._revlog.repotiprev |
|
162 | self.repotiprev = self._revlog.repotiprev | |
173 | self.revlog2 = self._revlog.revlog2 |
|
163 | self.revlog2 = self._revlog.revlog2 | |
174 |
|
164 | |||
175 | def baserevision(self, nodeorrev): |
|
|||
176 | return filelog.filelog.revision(self, nodeorrev) |
|
|||
177 |
|
||||
178 | def baserevdiff(self, rev1, rev2): |
|
165 | def baserevdiff(self, rev1, rev2): | |
179 | return filelog.filelog.revdiff(self, rev1, rev2) |
|
166 | return filelog.filelog.revdiff(self, rev1, rev2) | |
180 |
|
167 |
General Comments 0
You need to be logged in to leave comments.
Login now