##// END OF EJS Templates
bundlerepo doesn't really have a dirstate, throw AttributeError if requested
Dirkjan Ochtman -
r7435:5e13df32 default
parent child Browse files
Show More
@@ -435,7 +435,7 b' def gincoming(ui, repo, source="default"'
435
435
436 chlist = other.changelog.nodesbetween(incoming, revs)[0]
436 chlist = other.changelog.nodesbetween(incoming, revs)[0]
437 revdag = incoming_revs(other, chlist, opts)
437 revdag = incoming_revs(other, chlist, opts)
438 other_parents = other.dirstate.parents()
438 other_parents = []
439 displayer = show_changeset(ui, other, opts, buffered=True)
439 displayer = show_changeset(ui, other, opts, buffered=True)
440 def graphabledag():
440 def graphabledag():
441 for (ctx, parents) in revdag:
441 for (ctx, parents) in revdag:
@@ -13,7 +13,7 b' of the GNU General Public License, incor'
13 from node import hex, nullid, short
13 from node import hex, nullid, short
14 from i18n import _
14 from i18n import _
15 import changegroup, util, os, struct, bz2, zlib, tempfile, shutil, mdiff
15 import changegroup, util, os, struct, bz2, zlib, tempfile, shutil, mdiff
16 import repo, localrepo, changelog, manifest, filelog, revlog
16 import repo, localrepo, changelog, manifest, filelog, revlog, context
17
17
18 class bundlerevlog(revlog.revlog):
18 class bundlerevlog(revlog.revlog):
19 def __init__(self, opener, indexfile, bundlefile,
19 def __init__(self, opener, indexfile, bundlefile,
@@ -213,19 +213,20 b' class bundlerepository(localrepo.localre'
213 self.changelog = bundlechangelog(self.sopener, self.bundlefile)
213 self.changelog = bundlechangelog(self.sopener, self.bundlefile)
214 self.manstart = self.bundlefile.tell()
214 self.manstart = self.bundlefile.tell()
215 return self.changelog
215 return self.changelog
216 if name == 'manifest':
216 elif name == 'manifest':
217 self.bundlefile.seek(self.manstart)
217 self.bundlefile.seek(self.manstart)
218 self.manifest = bundlemanifest(self.sopener, self.bundlefile,
218 self.manifest = bundlemanifest(self.sopener, self.bundlefile,
219 self.changelog.rev)
219 self.changelog.rev)
220 self.filestart = self.bundlefile.tell()
220 self.filestart = self.bundlefile.tell()
221 return self.manifest
221 return self.manifest
222 if name == 'manstart':
222 elif name == 'manstart':
223 self.changelog
223 self.changelog
224 return self.manstart
224 return self.manstart
225 if name == 'filestart':
225 elif name == 'filestart':
226 self.manifest
226 self.manifest
227 return self.filestart
227 return self.filestart
228 return localrepo.localrepository.__getattr__(self, name)
228 else:
229 raise AttributeError(name)
229
230
230 def url(self):
231 def url(self):
231 return self._url
232 return self._url
@@ -267,6 +268,9 b' class bundlerepository(localrepo.localre'
267 def cancopy(self):
268 def cancopy(self):
268 return False
269 return False
269
270
271 def getcwd(self):
272 return os.getcwd() # always outside the repo
273
270 def instance(ui, path, create):
274 def instance(ui, path, create):
271 if create:
275 if create:
272 raise util.Abort(_('cannot create new bundle repository'))
276 raise util.Abort(_('cannot create new bundle repository'))
@@ -982,7 +982,7 b' class localrepository(repo.repository):'
982 else:
982 else:
983 ctx2 = self[node2]
983 ctx2 = self[node2]
984
984
985 working = ctx2 == self[None]
985 working = ctx2.rev() is None
986 parentworking = working and ctx1 == self['.']
986 parentworking = working and ctx1 == self['.']
987 match = match or match_.always(self.root, self.getcwd())
987 match = match or match_.always(self.root, self.getcwd())
988 listignored, listclean, listunknown = ignored, clean, unknown
988 listignored, listclean, listunknown = ignored, clean, unknown
General Comments 0
You need to be logged in to leave comments. Login now