##// END OF EJS Templates
bundlerepo: make baserevision return raw text...
Jun Wu -
r31834:433ab46f default
parent child Browse files
Show More
@@ -158,7 +158,7 class bundlerevlog(revlog.revlog):
158 # Revlog subclasses may override 'revision' method to modify format of
158 # Revlog subclasses may override 'revision' method to modify format of
159 # content retrieved from revlog. To use bundlerevlog with such class one
159 # content retrieved from revlog. To use bundlerevlog with such class one
160 # needs to override 'baserevision' and make more specific call here.
160 # needs to override 'baserevision' and make more specific call here.
161 return revlog.revlog.revision(self, nodeorrev)
161 return revlog.revlog.revision(self, nodeorrev, raw=True)
162
162
163 def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):
163 def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):
164 raise NotImplementedError
164 raise NotImplementedError
@@ -186,7 +186,7 class bundlechangelog(bundlerevlog, chan
186 oldfilter = self.filteredrevs
186 oldfilter = self.filteredrevs
187 try:
187 try:
188 self.filteredrevs = ()
188 self.filteredrevs = ()
189 return changelog.changelog.revision(self, nodeorrev)
189 return changelog.changelog.revision(self, nodeorrev, raw=True)
190 finally:
190 finally:
191 self.filteredrevs = oldfilter
191 self.filteredrevs = oldfilter
192
192
@@ -210,7 +210,7 class bundlemanifest(bundlerevlog, manif
210 if node in self.fulltextcache:
210 if node in self.fulltextcache:
211 result = '%s' % self.fulltextcache[node]
211 result = '%s' % self.fulltextcache[node]
212 else:
212 else:
213 result = manifest.manifestrevlog.revision(self, nodeorrev)
213 result = manifest.manifestrevlog.revision(self, nodeorrev, raw=True)
214 return result
214 return result
215
215
216 def dirlog(self, d):
216 def dirlog(self, d):
@@ -228,7 +228,7 class bundlefilelog(bundlerevlog, filelo
228 linkmapper)
228 linkmapper)
229
229
230 def baserevision(self, nodeorrev):
230 def baserevision(self, nodeorrev):
231 return filelog.filelog.revision(self, nodeorrev)
231 return filelog.filelog.revision(self, nodeorrev, raw=True)
232
232
233 class bundlepeer(localrepo.localpeer):
233 class bundlepeer(localrepo.localpeer):
234 def canpush(self):
234 def canpush(self):
@@ -188,11 +188,10
188 4 changesets found
188 4 changesets found
189 $ hg --config extensions.strip= strip -r 2 --no-backup --force -q
189 $ hg --config extensions.strip= strip -r 2 --no-backup --force -q
190 $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )'
190 $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )'
191 Traceback (most recent call last):
191 abort: integrity check failed on data/base64.i:2!
192 mercurial.mpatch.mpatchError: invalid patch
193
192
194 $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*| )'
193 $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*| )'
195 Traceback (most recent call last):
194 Traceback (most recent call last):
196 TypeError: Incorrect padding
195 mercurial.mpatch.mpatchError: invalid patch
197 $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )'
196 $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )'
198 abort: repository bundle-again.hg not found!
197 abort: repository bundle-again.hg not found!
General Comments 0
You need to be logged in to leave comments. Login now