Show More
@@ -402,12 +402,14 b' class localrepository(object):' | |||||
402 | if inst.errno != errno.ENOENT: |
|
402 | if inst.errno != errno.ENOENT: | |
403 | raise |
|
403 | raise | |
404 |
|
404 | |||
|
405 | cachepath = self.vfs.join('cache') | |||
405 | self.sharedpath = self.path |
|
406 | self.sharedpath = self.path | |
406 | try: |
|
407 | try: | |
407 | sharedpath = self.vfs.read("sharedpath").rstrip('\n') |
|
408 | sharedpath = self.vfs.read("sharedpath").rstrip('\n') | |
408 | if 'relshared' in self.requirements: |
|
409 | if 'relshared' in self.requirements: | |
409 | sharedpath = self.vfs.join(sharedpath) |
|
410 | sharedpath = self.vfs.join(sharedpath) | |
410 | vfs = vfsmod.vfs(sharedpath, realpath=True) |
|
411 | vfs = vfsmod.vfs(sharedpath, realpath=True) | |
|
412 | cachepath = vfs.join('cache') | |||
411 | s = vfs.base |
|
413 | s = vfs.base | |
412 | if not vfs.exists(): |
|
414 | if not vfs.exists(): | |
413 | raise error.RepoError( |
|
415 | raise error.RepoError( | |
@@ -423,7 +425,7 b' class localrepository(object):' | |||||
423 | self.svfs = self.store.vfs |
|
425 | self.svfs = self.store.vfs | |
424 | self.sjoin = self.store.join |
|
426 | self.sjoin = self.store.join | |
425 | self.vfs.createmode = self.store.createmode |
|
427 | self.vfs.createmode = self.store.createmode | |
426 |
self.cachevfs = vfsmod.vfs( |
|
428 | self.cachevfs = vfsmod.vfs(cachepath) | |
427 | self.cachevfs.createmode = self.store.createmode |
|
429 | self.cachevfs.createmode = self.store.createmode | |
428 | if (self.ui.configbool('devel', 'all-warnings') or |
|
430 | if (self.ui.configbool('devel', 'all-warnings') or | |
429 | self.ui.configbool('devel', 'check-locks')): |
|
431 | self.ui.configbool('devel', 'check-locks')): |
@@ -24,6 +24,20 b" share shouldn't have a store dir" | |||||
24 | $ test -d .hg/store |
|
24 | $ test -d .hg/store | |
25 | [1] |
|
25 | [1] | |
26 |
|
26 | |||
|
27 | share shouldn't have a cache dir, original repo should | |||
|
28 | ||||
|
29 | $ hg branches | |||
|
30 | default 0:d3873e73d99e | |||
|
31 | $ hg tags | |||
|
32 | tip 0:d3873e73d99e | |||
|
33 | $ test -d .hg/cache | |||
|
34 | [1] | |||
|
35 | $ ls -1 ../repo1/.hg/cache | |||
|
36 | branch2-served | |||
|
37 | rbc-names-v1 | |||
|
38 | rbc-revs-v1 | |||
|
39 | tags2-visible | |||
|
40 | ||||
27 |
Some sed versions appends newline |
|
41 | Some sed versions appends newline, some don't, and some just fails | |
28 |
|
42 | |||
29 | $ cat .hg/sharedpath; echo |
|
43 | $ cat .hg/sharedpath; echo |
General Comments 0
You need to be logged in to leave comments.
Login now