Show More
@@ -15,7 +15,7 b' setupcommon() {' | |||||
15 | [extensions] |
|
15 | [extensions] | |
16 | infinitepush= |
|
16 | infinitepush= | |
17 | [ui] |
|
17 | [ui] | |
18 |
ssh = |
|
18 | ssh = $PYTHON "$TESTDIR/dummyssh" | |
19 | [infinitepush] |
|
19 | [infinitepush] | |
20 | branchpattern=re:scratch/.* |
|
20 | branchpattern=re:scratch/.* | |
21 | EOF |
|
21 | EOF |
@@ -8,7 +8,7 b' remotefilelog=' | |||||
8 | rebase= |
|
8 | rebase= | |
9 | strip= |
|
9 | strip= | |
10 | [ui] |
|
10 | [ui] | |
11 |
ssh= |
|
11 | ssh=$PYTHON "$TESTDIR/dummyssh" | |
12 | [server] |
|
12 | [server] | |
13 | preferuncompressed=True |
|
13 | preferuncompressed=True | |
14 | [experimental] |
|
14 | [experimental] |
@@ -14,7 +14,7 b' ispy3 = sys.version_info[0] >= 3' | |||||
14 |
|
14 | |||
15 | # Only run if demandimport is allowed |
|
15 | # Only run if demandimport is allowed | |
16 | if subprocess.call( |
|
16 | if subprocess.call( | |
17 |
[' |
|
17 | [os.environ['PYTHON'], '%s/hghave' % os.environ['TESTDIR'], 'demandimport'] | |
18 | ): |
|
18 | ): | |
19 | sys.exit(80) |
|
19 | sys.exit(80) | |
20 |
|
20 |
@@ -10,7 +10,7 b' Setup' | |||||
10 | $ . "$TESTDIR/library-infinitepush.sh" |
|
10 | $ . "$TESTDIR/library-infinitepush.sh" | |
11 | $ cat >> $HGRCPATH <<EOF |
|
11 | $ cat >> $HGRCPATH <<EOF | |
12 | > [ui] |
|
12 | > [ui] | |
13 |
> ssh = |
|
13 | > ssh = $PYTHON "$TESTDIR/dummyssh" | |
14 | > [alias] |
|
14 | > [alias] | |
15 | > glog = log -GT "{rev}:{node|short} {desc}\n{phase}" |
|
15 | > glog = log -GT "{rev}:{node|short} {desc}\n{phase}" | |
16 | > EOF |
|
16 | > EOF |
@@ -59,7 +59,7 b' Set up repository' | |||||
59 | > EOF |
|
59 | > EOF | |
60 |
|
60 | |||
61 | Test ctrl-c |
|
61 | Test ctrl-c | |
62 |
$ |
|
62 | $ $PYTHON $TESTTMP/timeout.py -s INT 1 hg sleep 2 | |
63 | interrupted! |
|
63 | interrupted! | |
64 | [124] |
|
64 | [124] | |
65 |
|
65 | |||
@@ -68,7 +68,7 b' Test ctrl-c' | |||||
68 | > nointerrupt = yes |
|
68 | > nointerrupt = yes | |
69 | > EOF |
|
69 | > EOF | |
70 |
|
70 | |||
71 |
$ |
|
71 | $ $PYTHON $TESTTMP/timeout.py -s INT 1 hg sleep 2 | |
72 | interrupted! |
|
72 | interrupted! | |
73 | [124] |
|
73 | [124] | |
74 |
|
74 | |||
@@ -77,7 +77,7 b' Test ctrl-c' | |||||
77 | > nointerrupt-interactiveonly = False |
|
77 | > nointerrupt-interactiveonly = False | |
78 | > EOF |
|
78 | > EOF | |
79 |
|
79 | |||
80 |
$ |
|
80 | $ $PYTHON $TESTTMP/timeout.py -s INT 1 hg sleep 2 | |
81 | shutting down cleanly |
|
81 | shutting down cleanly | |
82 | press ^C again to terminate immediately (dangerous) |
|
82 | press ^C again to terminate immediately (dangerous) | |
83 | end of unsafe operation |
|
83 | end of unsafe operation |
@@ -66,7 +66,7 b'' | |||||
66 |
|
66 | |||
67 | $ cat >> $HGRCPATH <<EOF |
|
67 | $ cat >> $HGRCPATH <<EOF | |
68 | > [remotefilelog] |
|
68 | > [remotefilelog] | |
69 |
> cacheprocess = |
|
69 | > cacheprocess = $PYTHON $TESTTMP/cacheprocess-logger.py | |
70 | > EOF |
|
70 | > EOF | |
71 |
|
71 | |||
72 | Test cache keys and cache misses. |
|
72 | Test cache keys and cache misses. |
@@ -54,7 +54,7 b' Check behavior without update.atomic-fil' | |||||
54 | $ hg update -r 1 --config extensions.showwrites=.hg/showwrites.py 2>&1 | grep "a1'.*wb" |
|
54 | $ hg update -r 1 --config extensions.showwrites=.hg/showwrites.py 2>&1 | grep "a1'.*wb" | |
55 | ('vfs open', ('a1', 'wb'), [('atomictemp', False), ('backgroundclose', True)]) |
|
55 | ('vfs open', ('a1', 'wb'), [('atomictemp', False), ('backgroundclose', True)]) | |
56 |
|
56 | |||
57 |
$ |
|
57 | $ $PYTHON $TESTTMP/show_mode.py * | |
58 | a1:0644 |
|
58 | a1:0644 | |
59 | a2:0755 |
|
59 | a2:0755 | |
60 | b1:0644 |
|
60 | b1:0644 | |
@@ -76,7 +76,7 b' Check behavior without update.atomic-fil' | |||||
76 | $ hg update -r 1 |
|
76 | $ hg update -r 1 | |
77 | 6 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
77 | 6 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
78 |
|
78 | |||
79 |
$ |
|
79 | $ $PYTHON $TESTTMP/show_mode.py * | |
80 | a1:0644 |
|
80 | a1:0644 | |
81 | a2:0755 |
|
81 | a2:0755 | |
82 | b1:0644 |
|
82 | b1:0644 | |
@@ -88,7 +88,7 b' Manually reset the mode of the read-only' | |||||
88 |
|
88 | |||
89 | $ chmod a-w ro |
|
89 | $ chmod a-w ro | |
90 |
|
90 | |||
91 |
$ |
|
91 | $ $PYTHON $TESTTMP/show_mode.py ro | |
92 | ro:0444 |
|
92 | ro:0444 | |
93 |
|
93 | |||
94 | Now the file is present, try to update and check the permissions of the file |
|
94 | Now the file is present, try to update and check the permissions of the file | |
@@ -96,7 +96,7 b' Now the file is present, try to update a' | |||||
96 | $ hg up -r 2 |
|
96 | $ hg up -r 2 | |
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
97 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
98 |
|
98 | |||
99 |
$ |
|
99 | $ $PYTHON $TESTTMP/show_mode.py ro | |
100 | ro:0644 |
|
100 | ro:0644 | |
101 |
|
101 | |||
102 | # The file which was read-only is now writable in the default behavior |
|
102 | # The file which was read-only is now writable in the default behavior | |
@@ -121,7 +121,7 b' Check behavior with update.atomic-files' | |||||
121 | C ro |
|
121 | C ro | |
122 |
|
122 | |||
123 | Check the file permission after update |
|
123 | Check the file permission after update | |
124 |
$ |
|
124 | $ $PYTHON $TESTTMP/show_mode.py * | |
125 | a1:0644 |
|
125 | a1:0644 | |
126 | a2:0755 |
|
126 | a2:0755 | |
127 | b1:0644 |
|
127 | b1:0644 | |
@@ -133,7 +133,7 b' Manually reset the mode of the read-only' | |||||
133 |
|
133 | |||
134 | $ chmod a-w ro |
|
134 | $ chmod a-w ro | |
135 |
|
135 | |||
136 |
$ |
|
136 | $ $PYTHON $TESTTMP/show_mode.py ro | |
137 | ro:0444 |
|
137 | ro:0444 | |
138 |
|
138 | |||
139 | Now the file is present, try to update and check the permissions of the file |
|
139 | Now the file is present, try to update and check the permissions of the file | |
@@ -141,7 +141,7 b' Now the file is present, try to update a' | |||||
141 | $ hg update -r 2 --traceback |
|
141 | $ hg update -r 2 --traceback | |
142 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
142 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
143 |
|
143 | |||
144 |
$ |
|
144 | $ $PYTHON $TESTTMP/show_mode.py ro | |
145 | ro:0644 |
|
145 | ro:0644 | |
146 |
|
146 | |||
147 | # The behavior is the same as without atomic update |
|
147 | # The behavior is the same as without atomic update |
@@ -11,7 +11,9 b' import subprocess' | |||||
11 | import sys |
|
11 | import sys | |
12 |
|
12 | |||
13 | # Only run if slow tests are allowed |
|
13 | # Only run if slow tests are allowed | |
14 | if subprocess.call(['python', '%s/hghave' % os.environ['TESTDIR'], 'slow']): |
|
14 | if subprocess.call( | |
|
15 | [os.environ['PYTHON'], '%s/hghave' % os.environ['TESTDIR'], 'slow'] | |||
|
16 | ): | |||
15 | sys.exit(80) |
|
17 | sys.exit(80) | |
16 |
|
18 | |||
17 | # These tests require Hypothesis and pytz to be installed. |
|
19 | # These tests require Hypothesis and pytz to be installed. | |
@@ -352,7 +354,7 b' class verifyingstatemachine(RuleBasedSta' | |||||
352 | o.write(content) |
|
354 | o.write(content) | |
353 | self.log.append( |
|
355 | self.log.append( | |
354 | ( |
|
356 | ( | |
355 |
"$ |
|
357 | "$ $PYTHON -c 'import binascii; " | |
356 | "print(binascii.unhexlify(\"%s\"))' > %s" |
|
358 | "print(binascii.unhexlify(\"%s\"))' > %s" | |
357 | ) |
|
359 | ) | |
358 | % ( |
|
360 | % ( |
General Comments 0
You need to be logged in to leave comments.
Login now