##// END OF EJS Templates
check-exec: write file in 'wcache' instead of 'cache'...
Boris Feld -
r40823:47e3f554 default
parent child Browse files
Show More
@@ -182,7 +182,7 b' def checkexec(path):'
182 182 try:
183 183 EXECFLAGS = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
184 184 basedir = os.path.join(path, '.hg')
185 cachedir = os.path.join(basedir, 'cache')
185 cachedir = os.path.join(basedir, 'wcache')
186 186 storedir = os.path.join(basedir, 'store')
187 187 if not os.path.exists(cachedir):
188 188 try:
@@ -255,7 +255,7 b' def checklink(path):'
255 255 # mktemp is not racy because symlink creation will fail if the
256 256 # file already exists
257 257 while True:
258 cachedir = os.path.join(path, '.hg', 'cache')
258 cachedir = os.path.join(path, '.hg', 'wcache')
259 259 checklink = os.path.join(cachedir, 'checklink')
260 260 # try fast path, read only
261 261 if os.path.islink(checklink):
@@ -43,10 +43,6 b' Trigger branchcache creation:'
43 43 default 10:a7949464abda
44 44 $ ls .hg/cache
45 45 branch2-served
46 checkisexec (execbit !)
47 checklink (symlink !)
48 checklink-target (symlink !)
49 checknoexec (execbit !)
50 46 manifestfulltextcache (reporevlogstore !)
51 47 rbc-names-v1
52 48 rbc-revs-v1
@@ -62,9 +58,6 b' Ensure branchcache got copied over:'
62 58
63 59 $ ls .hg/cache
64 60 branch2-served
65 checkisexec (execbit !)
66 checklink (symlink !)
67 checklink-target (symlink !)
68 61 rbc-names-v1
69 62 rbc-revs-v1
70 63
@@ -88,9 +88,6 b' Non store repo:'
88 88 .hg/00manifest.i
89 89 .hg/cache
90 90 .hg/cache/branch2-served
91 .hg/cache/checkisexec (execbit !)
92 .hg/cache/checklink (symlink !)
93 .hg/cache/checklink-target (symlink !)
94 91 .hg/cache/manifestfulltextcache (reporevlogstore !)
95 92 .hg/cache/rbc-names-v1
96 93 .hg/cache/rbc-revs-v1
@@ -110,6 +107,10 b' Non store repo:'
110 107 .hg/undo.desc
111 108 .hg/undo.dirstate
112 109 .hg/undo.phaseroots
110 .hg/wcache
111 .hg/wcache/checkisexec
112 .hg/wcache/checklink
113 .hg/wcache/checklink-target
113 114 $ cd ..
114 115
115 116 Non fncache repo:
@@ -125,9 +126,6 b' Non fncache repo:'
125 126 .hg/00changelog.i
126 127 .hg/cache
127 128 .hg/cache/branch2-served
128 .hg/cache/checkisexec (execbit !)
129 .hg/cache/checklink (symlink !)
130 .hg/cache/checklink-target (symlink !)
131 129 .hg/cache/manifestfulltextcache (reporevlogstore !)
132 130 .hg/cache/rbc-names-v1
133 131 .hg/cache/rbc-revs-v1
@@ -150,6 +148,10 b' Non fncache repo:'
150 148 .hg/undo.branch
151 149 .hg/undo.desc
152 150 .hg/undo.dirstate
151 .hg/wcache
152 .hg/wcache/checkisexec
153 .hg/wcache/checklink
154 .hg/wcache/checklink-target
153 155 $ cd ..
154 156
155 157 Encoding of reserved / long paths in the store
@@ -239,9 +239,6 b' r4 has hardlinks in the working dir (not'
239 239 2 r4/.hg/branch
240 240 2 r4/.hg/cache/branch2-base
241 241 2 r4/.hg/cache/branch2-served
242 2 r4/.hg/cache/checkisexec (execbit !)
243 ? r4/.hg/cache/checklink-target (glob) (symlink !)
244 2 r4/.hg/cache/checknoexec (execbit !)
245 242 2 r4/.hg/cache/manifestfulltextcache (reporevlogstore !)
246 243 2 r4/.hg/cache/rbc-names-v1
247 244 2 r4/.hg/cache/rbc-revs-v1
@@ -268,6 +265,9 b' r4 has hardlinks in the working dir (not'
268 265 2 r4/.hg/undo.branch
269 266 2 r4/.hg/undo.desc
270 267 [24] r4/\.hg/undo\.dirstate (re)
268 2 r4/.hg/wcache/checkisexec
269 2 r4/.hg/wcache/checklink-target
270 2 r4/.hg/wcache/checknoexec
271 271 2 r4/d1/data1
272 272 2 r4/d1/f2
273 273 2 r4/f1
@@ -290,9 +290,6 b' Update back to revision 12 in r4 should '
290 290 1 r4/.hg/branch
291 291 2 r4/.hg/cache/branch2-base
292 292 2 r4/.hg/cache/branch2-served
293 2 r4/.hg/cache/checkisexec (execbit !)
294 2 r4/.hg/cache/checklink-target (symlink !)
295 2 r4/.hg/cache/checknoexec (execbit !)
296 293 2 r4/.hg/cache/manifestfulltextcache (reporevlogstore !)
297 294 2 r4/.hg/cache/rbc-names-v1
298 295 2 r4/.hg/cache/rbc-revs-v1
@@ -319,6 +316,9 b' Update back to revision 12 in r4 should '
319 316 2 r4/.hg/undo.branch
320 317 2 r4/.hg/undo.desc
321 318 [24] r4/\.hg/undo\.dirstate (re)
319 2 r4/.hg/wcache/checkisexec
320 2 r4/.hg/wcache/checklink-target
321 2 r4/.hg/wcache/checknoexec
322 322 2 r4/d1/data1
323 323 2 r4/d1/f2
324 324 1 r4/f1
@@ -69,9 +69,6 b' new directories are setgid'
69 69 00600 ./.hg/00changelog.i
70 70 00770 ./.hg/cache/
71 71 00660 ./.hg/cache/branch2-served
72 00711 ./.hg/cache/checkisexec
73 00777 ./.hg/cache/checklink
74 00600 ./.hg/cache/checklink-target
75 72 00660 ./.hg/cache/manifestfulltextcache (reporevlogstore !)
76 73 00660 ./.hg/cache/rbc-names-v1
77 74 00660 ./.hg/cache/rbc-revs-v1
@@ -102,6 +99,10 b' new directories are setgid'
102 99 00660 ./.hg/undo.branch
103 100 00660 ./.hg/undo.desc
104 101 00660 ./.hg/undo.dirstate
102 00770 ./.hg/wcache/
103 00711 ./.hg/wcache/checkisexec
104 00777 ./.hg/wcache/checklink
105 00600 ./.hg/wcache/checklink-target
105 106 00700 ./dir/
106 107 00600 ./dir/bar
107 108 00600 ./foo
@@ -28,16 +28,15 b" share shouldn't have a full cache dir, o"
28 28 default 0:d3873e73d99e
29 29 $ hg tags
30 30 tip 0:d3873e73d99e
31 $ ls -1 .hg/cache || true
32 ls: .hg/cache: $ENOENT$ (no-execbit no-symlink !)
31 $ test -d .hg/cache
32 [1]
33 $ ls -1 .hg/wcache || true
34 ls: .hg/wcache: $ENOENT$ (no-execbit no-symlink !)
33 35 checkisexec (execbit !)
34 36 checklink (symlink !)
35 37 checklink-target (symlink !)
36 38 $ ls -1 ../repo1/.hg/cache
37 39 branch2-served
38 checkisexec (execbit !)
39 checklink (symlink !)
40 checklink-target (symlink !)
41 40 manifestfulltextcache (reporevlogstore !)
42 41 rbc-names-v1
43 42 rbc-revs-v1
@@ -1246,15 +1246,16 b' Check that share works with subrepo'
1246 1246 ../shared/subrepo-2/.hg
1247 1247 ../shared/subrepo-2/.hg/branch
1248 1248 ../shared/subrepo-2/.hg/cache
1249 ../shared/subrepo-2/.hg/cache/checkisexec (execbit !)
1250 ../shared/subrepo-2/.hg/cache/checklink (symlink !)
1251 ../shared/subrepo-2/.hg/cache/checklink-target (symlink !)
1252 1249 ../shared/subrepo-2/.hg/cache/storehash
1253 1250 ../shared/subrepo-2/.hg/cache/storehash/* (glob)
1254 1251 ../shared/subrepo-2/.hg/dirstate
1255 1252 ../shared/subrepo-2/.hg/hgrc
1256 1253 ../shared/subrepo-2/.hg/requires
1257 1254 ../shared/subrepo-2/.hg/sharedpath
1255 ../shared/subrepo-2/.hg/wcache
1256 ../shared/subrepo-2/.hg/wcache/checkisexec
1257 ../shared/subrepo-2/.hg/wcache/checklink
1258 ../shared/subrepo-2/.hg/wcache/checklink-target
1258 1259 ../shared/subrepo-2/file
1259 1260 $ hg -R ../shared in
1260 1261 abort: repository default not found!
@@ -698,9 +698,6 b' Missing tags2* files means the cache was'
698 698
699 699 $ ls tagsclient/.hg/cache
700 700 branch2-base
701 checkisexec (execbit !)
702 checklink (symlink !)
703 checklink-target (symlink !)
704 701 hgtagsfnodes1
705 702 rbc-names-v1
706 703 rbc-revs-v1
@@ -725,9 +722,6 b' Running hg tags should produce tags2* fi'
725 722
726 723 $ ls tagsclient/.hg/cache
727 724 branch2-base
728 checkisexec (execbit !)
729 checklink (symlink !)
730 checklink-target (symlink !)
731 725 hgtagsfnodes1
732 726 rbc-names-v1
733 727 rbc-revs-v1
General Comments 0
You need to be logged in to leave comments. Login now