Show More
@@ -1,302 +1,304 b'' | |||||
1 | # Create server |
|
1 | # Create server | |
2 | $ hg init server |
|
2 | $ hg init server | |
3 | $ cd server |
|
3 | $ cd server | |
4 | $ cat >> .hg/hgrc << EOF |
|
4 | $ cat >> .hg/hgrc << EOF | |
5 | > [extensions] |
|
5 | > [extensions] | |
6 | > extension=$TESTDIR/flagprocessorext.py |
|
6 | > extension=$TESTDIR/flagprocessorext.py | |
7 | > EOF |
|
7 | > EOF | |
8 | $ cd ../ |
|
8 | $ cd ../ | |
9 |
|
9 | |||
10 | # Clone server and enable extensions |
|
10 | # Clone server and enable extensions | |
11 | $ hg clone -q server client |
|
11 | $ hg clone -q server client | |
12 | $ cd client |
|
12 | $ cd client | |
13 | $ cat >> .hg/hgrc << EOF |
|
13 | $ cat >> .hg/hgrc << EOF | |
14 | > [extensions] |
|
14 | > [extensions] | |
15 | > extension=$TESTDIR/flagprocessorext.py |
|
15 | > extension=$TESTDIR/flagprocessorext.py | |
16 | > EOF |
|
16 | > EOF | |
17 |
|
17 | |||
18 | # Commit file that will trigger the noop extension |
|
18 | # Commit file that will trigger the noop extension | |
19 | $ echo '[NOOP]' > noop |
|
19 | $ echo '[NOOP]' > noop | |
20 | $ hg commit -Aqm "noop" |
|
20 | $ hg commit -Aqm "noop" | |
21 |
|
21 | |||
22 | # Commit file that will trigger the base64 extension |
|
22 | # Commit file that will trigger the base64 extension | |
23 | $ echo '[BASE64]' > base64 |
|
23 | $ echo '[BASE64]' > base64 | |
24 | $ hg commit -Aqm 'base64' |
|
24 | $ hg commit -Aqm 'base64' | |
25 |
|
25 | |||
26 | # Commit file that will trigger the gzip extension |
|
26 | # Commit file that will trigger the gzip extension | |
27 | $ echo '[GZIP]' > gzip |
|
27 | $ echo '[GZIP]' > gzip | |
28 | $ hg commit -Aqm 'gzip' |
|
28 | $ hg commit -Aqm 'gzip' | |
29 |
|
29 | |||
30 | # Commit file that will trigger noop and base64 |
|
30 | # Commit file that will trigger noop and base64 | |
31 | $ echo '[NOOP][BASE64]' > noop-base64 |
|
31 | $ echo '[NOOP][BASE64]' > noop-base64 | |
32 | $ hg commit -Aqm 'noop+base64' |
|
32 | $ hg commit -Aqm 'noop+base64' | |
33 |
|
33 | |||
34 | # Commit file that will trigger noop and gzip |
|
34 | # Commit file that will trigger noop and gzip | |
35 | $ echo '[NOOP][GZIP]' > noop-gzip |
|
35 | $ echo '[NOOP][GZIP]' > noop-gzip | |
36 | $ hg commit -Aqm 'noop+gzip' |
|
36 | $ hg commit -Aqm 'noop+gzip' | |
37 |
|
37 | |||
38 | # Commit file that will trigger base64 and gzip |
|
38 | # Commit file that will trigger base64 and gzip | |
39 | $ echo '[BASE64][GZIP]' > base64-gzip |
|
39 | $ echo '[BASE64][GZIP]' > base64-gzip | |
40 | $ hg commit -Aqm 'base64+gzip' |
|
40 | $ hg commit -Aqm 'base64+gzip' | |
41 |
|
41 | |||
42 | # Commit file that will trigger base64, gzip and noop |
|
42 | # Commit file that will trigger base64, gzip and noop | |
43 | $ echo '[BASE64][GZIP][NOOP]' > base64-gzip-noop |
|
43 | $ echo '[BASE64][GZIP][NOOP]' > base64-gzip-noop | |
44 | $ hg commit -Aqm 'base64+gzip+noop' |
|
44 | $ hg commit -Aqm 'base64+gzip+noop' | |
45 |
|
45 | |||
46 | # TEST: ensure the revision data is consistent |
|
46 | # TEST: ensure the revision data is consistent | |
47 | $ hg cat noop |
|
47 | $ hg cat noop | |
48 | [NOOP] |
|
48 | [NOOP] | |
49 | $ hg debugdata noop 0 |
|
49 | $ hg debugdata noop 0 | |
50 | [NOOP] |
|
50 | [NOOP] | |
51 |
|
51 | |||
52 | $ hg cat -r . base64 |
|
52 | $ hg cat -r . base64 | |
53 | [BASE64] |
|
53 | [BASE64] | |
54 | $ hg debugdata base64 0 |
|
54 | $ hg debugdata base64 0 | |
55 | W0JBU0U2NF0K (no-eol) |
|
55 | W0JBU0U2NF0K (no-eol) | |
56 |
|
56 | |||
57 | $ hg cat -r . gzip |
|
57 | $ hg cat -r . gzip | |
58 | [GZIP] |
|
58 | [GZIP] | |
59 | $ hg debugdata gzip 0 |
|
59 | $ hg debugdata gzip 0 | |
60 | x\x9c\x8bv\x8f\xf2\x0c\x88\xe5\x02\x00\x08\xc8\x01\xfd (no-eol) (esc) |
|
60 | x\x9c\x8bv\x8f\xf2\x0c\x88\xe5\x02\x00\x08\xc8\x01\xfd (no-eol) (esc) | |
61 |
|
61 | |||
62 | $ hg cat -r . noop-base64 |
|
62 | $ hg cat -r . noop-base64 | |
63 | [NOOP][BASE64] |
|
63 | [NOOP][BASE64] | |
64 | $ hg debugdata noop-base64 0 |
|
64 | $ hg debugdata noop-base64 0 | |
65 | W05PT1BdW0JBU0U2NF0K (no-eol) |
|
65 | W05PT1BdW0JBU0U2NF0K (no-eol) | |
66 |
|
66 | |||
67 | $ hg cat -r . noop-gzip |
|
67 | $ hg cat -r . noop-gzip | |
68 | [NOOP][GZIP] |
|
68 | [NOOP][GZIP] | |
69 | $ hg debugdata noop-gzip 0 |
|
69 | $ hg debugdata noop-gzip 0 | |
70 | x\x9c\x8b\xf6\xf3\xf7\x0f\x88\x8dv\x8f\xf2\x0c\x88\xe5\x02\x00\x1dH\x03\xf1 (no-eol) (esc) |
|
70 | x\x9c\x8b\xf6\xf3\xf7\x0f\x88\x8dv\x8f\xf2\x0c\x88\xe5\x02\x00\x1dH\x03\xf1 (no-eol) (esc) | |
71 |
|
71 | |||
72 | $ hg cat -r . base64-gzip |
|
72 | $ hg cat -r . base64-gzip | |
73 | [BASE64][GZIP] |
|
73 | [BASE64][GZIP] | |
74 | $ hg debugdata base64-gzip 0 |
|
74 | $ hg debugdata base64-gzip 0 | |
75 | eJyLdnIMdjUziY12j/IMiOUCACLBBDo= (no-eol) |
|
75 | eJyLdnIMdjUziY12j/IMiOUCACLBBDo= (no-eol) | |
76 |
|
76 | |||
77 | $ hg cat -r . base64-gzip-noop |
|
77 | $ hg cat -r . base64-gzip-noop | |
78 | [BASE64][GZIP][NOOP] |
|
78 | [BASE64][GZIP][NOOP] | |
79 | $ hg debugdata base64-gzip-noop 0 |
|
79 | $ hg debugdata base64-gzip-noop 0 | |
80 | eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol) |
|
80 | eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol) | |
81 |
|
81 | |||
82 | # Push to the server |
|
82 | # Push to the server | |
83 | $ hg push |
|
83 | $ hg push | |
84 | pushing to $TESTTMP/server |
|
84 | pushing to $TESTTMP/server | |
85 | searching for changes |
|
85 | searching for changes | |
86 | adding changesets |
|
86 | adding changesets | |
87 | adding manifests |
|
87 | adding manifests | |
88 | adding file changes |
|
88 | adding file changes | |
89 | added 7 changesets with 7 changes to 7 files |
|
89 | added 7 changesets with 7 changes to 7 files | |
90 |
|
90 | |||
91 | Ensure the data got to the server OK |
|
91 | Ensure the data got to the server OK | |
92 |
|
92 | |||
93 | $ cd ../server |
|
93 | $ cd ../server | |
94 | $ hg cat -r 6e48f4215d24 noop |
|
94 | $ hg cat -r 6e48f4215d24 noop | |
95 | [NOOP] |
|
95 | [NOOP] | |
96 | $ hg debugdata noop 0 |
|
96 | $ hg debugdata noop 0 | |
97 | [NOOP] |
|
97 | [NOOP] | |
98 |
|
98 | |||
99 | $ hg cat -r 6e48f4215d24 base64 |
|
99 | $ hg cat -r 6e48f4215d24 base64 | |
100 | [BASE64] |
|
100 | [BASE64] | |
101 | $ hg debugdata base64 0 |
|
101 | $ hg debugdata base64 0 | |
102 | W0JBU0U2NF0K (no-eol) |
|
102 | W0JBU0U2NF0K (no-eol) | |
103 |
|
103 | |||
104 | $ hg cat -r 6e48f4215d24 gzip |
|
104 | $ hg cat -r 6e48f4215d24 gzip | |
105 | [GZIP] |
|
105 | [GZIP] | |
106 | $ hg debugdata gzip 0 |
|
106 | $ hg debugdata gzip 0 | |
107 | x\x9c\x8bv\x8f\xf2\x0c\x88\xe5\x02\x00\x08\xc8\x01\xfd (no-eol) (esc) |
|
107 | x\x9c\x8bv\x8f\xf2\x0c\x88\xe5\x02\x00\x08\xc8\x01\xfd (no-eol) (esc) | |
108 |
|
108 | |||
109 | $ hg cat -r 6e48f4215d24 noop-base64 |
|
109 | $ hg cat -r 6e48f4215d24 noop-base64 | |
110 | [NOOP][BASE64] |
|
110 | [NOOP][BASE64] | |
111 | $ hg debugdata noop-base64 0 |
|
111 | $ hg debugdata noop-base64 0 | |
112 | W05PT1BdW0JBU0U2NF0K (no-eol) |
|
112 | W05PT1BdW0JBU0U2NF0K (no-eol) | |
113 |
|
113 | |||
114 | $ hg cat -r 6e48f4215d24 noop-gzip |
|
114 | $ hg cat -r 6e48f4215d24 noop-gzip | |
115 | [NOOP][GZIP] |
|
115 | [NOOP][GZIP] | |
116 | $ hg debugdata noop-gzip 0 |
|
116 | $ hg debugdata noop-gzip 0 | |
117 | x\x9c\x8b\xf6\xf3\xf7\x0f\x88\x8dv\x8f\xf2\x0c\x88\xe5\x02\x00\x1dH\x03\xf1 (no-eol) (esc) |
|
117 | x\x9c\x8b\xf6\xf3\xf7\x0f\x88\x8dv\x8f\xf2\x0c\x88\xe5\x02\x00\x1dH\x03\xf1 (no-eol) (esc) | |
118 |
|
118 | |||
119 | $ hg cat -r 6e48f4215d24 base64-gzip |
|
119 | $ hg cat -r 6e48f4215d24 base64-gzip | |
120 | [BASE64][GZIP] |
|
120 | [BASE64][GZIP] | |
121 | $ hg debugdata base64-gzip 0 |
|
121 | $ hg debugdata base64-gzip 0 | |
122 | eJyLdnIMdjUziY12j/IMiOUCACLBBDo= (no-eol) |
|
122 | eJyLdnIMdjUziY12j/IMiOUCACLBBDo= (no-eol) | |
123 |
|
123 | |||
124 | $ hg cat -r 6e48f4215d24 base64-gzip-noop |
|
124 | $ hg cat -r 6e48f4215d24 base64-gzip-noop | |
125 | [BASE64][GZIP][NOOP] |
|
125 | [BASE64][GZIP][NOOP] | |
126 | $ hg debugdata base64-gzip-noop 0 |
|
126 | $ hg debugdata base64-gzip-noop 0 | |
127 | eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol) |
|
127 | eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol) | |
128 |
|
128 | |||
129 | # Initialize new client (not cloning) and setup extension |
|
129 | # Initialize new client (not cloning) and setup extension | |
130 | $ cd .. |
|
130 | $ cd .. | |
131 | $ hg init client2 |
|
131 | $ hg init client2 | |
132 | $ cd client2 |
|
132 | $ cd client2 | |
133 | $ cat >> .hg/hgrc << EOF |
|
133 | $ cat >> .hg/hgrc << EOF | |
134 | > [paths] |
|
134 | > [paths] | |
135 | > default = $TESTTMP/server |
|
135 | > default = $TESTTMP/server | |
136 | > [extensions] |
|
136 | > [extensions] | |
137 | > extension=$TESTDIR/flagprocessorext.py |
|
137 | > extension=$TESTDIR/flagprocessorext.py | |
138 | > EOF |
|
138 | > EOF | |
139 |
|
139 | |||
140 | # Pull from server and update to latest revision |
|
140 | # Pull from server and update to latest revision | |
141 | $ hg pull default |
|
141 | $ hg pull default | |
142 | pulling from $TESTTMP/server |
|
142 | pulling from $TESTTMP/server | |
143 | requesting all changes |
|
143 | requesting all changes | |
144 | adding changesets |
|
144 | adding changesets | |
145 | adding manifests |
|
145 | adding manifests | |
146 | adding file changes |
|
146 | adding file changes | |
147 | added 7 changesets with 7 changes to 7 files |
|
147 | added 7 changesets with 7 changes to 7 files | |
148 | new changesets 07b1b9442c5b:6e48f4215d24 |
|
148 | new changesets 07b1b9442c5b:6e48f4215d24 | |
149 | (run 'hg update' to get a working copy) |
|
149 | (run 'hg update' to get a working copy) | |
150 | $ hg update |
|
150 | $ hg update | |
151 | 7 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
151 | 7 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
152 |
|
152 | |||
153 | # TEST: ensure the revision data is consistent |
|
153 | # TEST: ensure the revision data is consistent | |
154 | $ hg cat noop |
|
154 | $ hg cat noop | |
155 | [NOOP] |
|
155 | [NOOP] | |
156 | $ hg debugdata noop 0 |
|
156 | $ hg debugdata noop 0 | |
157 | [NOOP] |
|
157 | [NOOP] | |
158 |
|
158 | |||
159 | $ hg cat -r . base64 |
|
159 | $ hg cat -r . base64 | |
160 | [BASE64] |
|
160 | [BASE64] | |
161 | $ hg debugdata base64 0 |
|
161 | $ hg debugdata base64 0 | |
162 | W0JBU0U2NF0K (no-eol) |
|
162 | W0JBU0U2NF0K (no-eol) | |
163 |
|
163 | |||
164 | $ hg cat -r . gzip |
|
164 | $ hg cat -r . gzip | |
165 | [GZIP] |
|
165 | [GZIP] | |
166 | $ hg debugdata gzip 0 |
|
166 | $ hg debugdata gzip 0 | |
167 | x\x9c\x8bv\x8f\xf2\x0c\x88\xe5\x02\x00\x08\xc8\x01\xfd (no-eol) (esc) |
|
167 | x\x9c\x8bv\x8f\xf2\x0c\x88\xe5\x02\x00\x08\xc8\x01\xfd (no-eol) (esc) | |
168 |
|
168 | |||
169 | $ hg cat -r . noop-base64 |
|
169 | $ hg cat -r . noop-base64 | |
170 | [NOOP][BASE64] |
|
170 | [NOOP][BASE64] | |
171 | $ hg debugdata noop-base64 0 |
|
171 | $ hg debugdata noop-base64 0 | |
172 | W05PT1BdW0JBU0U2NF0K (no-eol) |
|
172 | W05PT1BdW0JBU0U2NF0K (no-eol) | |
173 |
|
173 | |||
174 | $ hg cat -r . noop-gzip |
|
174 | $ hg cat -r . noop-gzip | |
175 | [NOOP][GZIP] |
|
175 | [NOOP][GZIP] | |
176 | $ hg debugdata noop-gzip 0 |
|
176 | $ hg debugdata noop-gzip 0 | |
177 | x\x9c\x8b\xf6\xf3\xf7\x0f\x88\x8dv\x8f\xf2\x0c\x88\xe5\x02\x00\x1dH\x03\xf1 (no-eol) (esc) |
|
177 | x\x9c\x8b\xf6\xf3\xf7\x0f\x88\x8dv\x8f\xf2\x0c\x88\xe5\x02\x00\x1dH\x03\xf1 (no-eol) (esc) | |
178 |
|
178 | |||
179 | $ hg cat -r . base64-gzip |
|
179 | $ hg cat -r . base64-gzip | |
180 | [BASE64][GZIP] |
|
180 | [BASE64][GZIP] | |
181 | $ hg debugdata base64-gzip 0 |
|
181 | $ hg debugdata base64-gzip 0 | |
182 | eJyLdnIMdjUziY12j/IMiOUCACLBBDo= (no-eol) |
|
182 | eJyLdnIMdjUziY12j/IMiOUCACLBBDo= (no-eol) | |
183 |
|
183 | |||
184 | $ hg cat -r . base64-gzip-noop |
|
184 | $ hg cat -r . base64-gzip-noop | |
185 | [BASE64][GZIP][NOOP] |
|
185 | [BASE64][GZIP][NOOP] | |
186 | $ hg debugdata base64-gzip-noop 0 |
|
186 | $ hg debugdata base64-gzip-noop 0 | |
187 | eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol) |
|
187 | eJyLdnIMdjUziY12j/IMiI328/cPiOUCAESjBi4= (no-eol) | |
188 |
|
188 | |||
189 | # TEST: ensure a missing processor is handled |
|
189 | # TEST: ensure a missing processor is handled | |
190 | $ echo '[FAIL][BASE64][GZIP][NOOP]' > fail-base64-gzip-noop |
|
190 | $ echo '[FAIL][BASE64][GZIP][NOOP]' > fail-base64-gzip-noop | |
191 | $ hg commit -Aqm 'fail+base64+gzip+noop' |
|
191 | $ hg commit -Aqm 'fail+base64+gzip+noop' | |
192 | abort: missing processor for flag '0x1'! |
|
192 | abort: missing processor for flag '0x1'! | |
193 | [255] |
|
193 | [255] | |
194 | $ rm fail-base64-gzip-noop |
|
194 | $ rm fail-base64-gzip-noop | |
195 |
|
195 | |||
196 | # TEST: ensure we cannot register several flag processors on the same flag |
|
196 | # TEST: ensure we cannot register several flag processors on the same flag | |
197 | $ cat >> .hg/hgrc << EOF |
|
197 | $ cat >> .hg/hgrc << EOF | |
198 | > [extensions] |
|
198 | > [extensions] | |
199 | > extension=$TESTDIR/flagprocessorext.py |
|
199 | > extension=$TESTDIR/flagprocessorext.py | |
200 | > duplicate=$TESTDIR/flagprocessorext.py |
|
200 | > duplicate=$TESTDIR/flagprocessorext.py | |
201 | > EOF |
|
201 | > EOF | |
202 | $ hg debugrebuilddirstate |
|
202 | $ hg debugrebuilddirstate | |
203 | Traceback (most recent call last): |
|
203 | Traceback (most recent call last): | |
204 | File "*/mercurial/extensions.py", line *, in _runextsetup (glob) |
|
204 | File "*/mercurial/extensions.py", line *, in _runextsetup (glob) | |
205 | extsetup(ui) |
|
205 | extsetup(ui) | |
206 | File "*/tests/flagprocessorext.py", line *, in extsetup (glob) |
|
206 | File "*/tests/flagprocessorext.py", line *, in extsetup (glob) | |
207 | validatehash, |
|
207 | validatehash, | |
208 | File "*/mercurial/revlog.py", line *, in addflagprocessor (glob) |
|
208 | File "*/mercurial/revlog.py", line *, in addflagprocessor (glob) | |
209 | _insertflagprocessor(flag, processor, _flagprocessors) |
|
209 | _insertflagprocessor(flag, processor, _flagprocessors) | |
210 | File "*/mercurial/revlog.py", line *, in _insertflagprocessor (glob) |
|
210 | File "*/mercurial/revlog.py", line *, in _insertflagprocessor (glob) | |
211 | raise error.Abort(msg) |
|
211 | raise error.Abort(msg) | |
212 |
Abort: cannot |
|
212 | mercurial.error.Abort: b"cannot register multiple processors on flag '0x8'." (py3 !) | |
|
213 | Abort: cannot register multiple processors on flag '0x8'. (no-py3 !) | |||
213 | *** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'. |
|
214 | *** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'. | |
214 |
$ |
|
215 | $ hg st 2>&1 | egrep 'cannot register multiple processors|flagprocessorext' | |
215 | File "*/tests/flagprocessorext.py", line *, in extsetup (glob) |
|
216 | File "*/tests/flagprocessorext.py", line *, in extsetup (glob) | |
216 |
Abort: cannot |
|
217 | mercurial.error.Abort: b"cannot register multiple processors on flag '0x8'." (py3 !) | |
|
218 | Abort: cannot register multiple processors on flag '0x8'. (no-py3 !) | |||
217 | *** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'. |
|
219 | *** failed to set up extension duplicate: cannot register multiple processors on flag '0x8'. | |
218 | File "*/tests/flagprocessorext.py", line *, in b64decode (glob) |
|
220 | File "*/tests/flagprocessorext.py", line *, in b64decode (glob) | |
219 |
|
221 | |||
220 | $ cd .. |
|
222 | $ cd .. | |
221 |
|
223 | |||
222 | # TEST: bundle repo |
|
224 | # TEST: bundle repo | |
223 | $ hg init bundletest |
|
225 | $ hg init bundletest | |
224 | $ cd bundletest |
|
226 | $ cd bundletest | |
225 |
|
227 | |||
226 | $ cat >> .hg/hgrc << EOF |
|
228 | $ cat >> .hg/hgrc << EOF | |
227 | > [extensions] |
|
229 | > [extensions] | |
228 | > flagprocessor=$TESTDIR/flagprocessorext.py |
|
230 | > flagprocessor=$TESTDIR/flagprocessorext.py | |
229 | > EOF |
|
231 | > EOF | |
230 |
|
232 | |||
231 | $ for i in 0 single two three 4; do |
|
233 | $ for i in 0 single two three 4; do | |
232 | > echo '[BASE64]a-bit-longer-'$i > base64 |
|
234 | > echo '[BASE64]a-bit-longer-'$i > base64 | |
233 | > hg commit -m base64-$i -A base64 |
|
235 | > hg commit -m base64-$i -A base64 | |
234 | > done |
|
236 | > done | |
235 |
|
237 | |||
236 | $ hg update 2 -q |
|
238 | $ hg update 2 -q | |
237 | $ echo '[BASE64]a-bit-longer-branching' > base64 |
|
239 | $ echo '[BASE64]a-bit-longer-branching' > base64 | |
238 | $ hg commit -q -m branching |
|
240 | $ hg commit -q -m branching | |
239 |
|
241 | |||
240 | #if repobundlerepo |
|
242 | #if repobundlerepo | |
241 | $ hg bundle --base 1 bundle.hg |
|
243 | $ hg bundle --base 1 bundle.hg | |
242 | 4 changesets found |
|
244 | 4 changesets found | |
243 | $ hg --config extensions.strip= strip -r 2 --no-backup --force -q |
|
245 | $ hg --config extensions.strip= strip -r 2 --no-backup --force -q | |
244 | $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 |
|
246 | $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 | |
245 | 5 branching |
|
247 | 5 branching | |
246 | base64 | 2 +- |
|
248 | base64 | 2 +- | |
247 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
249 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
248 |
|
250 | |||
249 | 4 base64-4 |
|
251 | 4 base64-4 | |
250 | base64 | 2 +- |
|
252 | base64 | 2 +- | |
251 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
253 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
252 |
|
254 | |||
253 | 3 base64-three |
|
255 | 3 base64-three | |
254 | base64 | 2 +- |
|
256 | base64 | 2 +- | |
255 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
257 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
256 |
|
258 | |||
257 | 2 base64-two |
|
259 | 2 base64-two | |
258 | base64 | 2 +- |
|
260 | base64 | 2 +- | |
259 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
261 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
260 |
|
262 | |||
261 | 1 base64-single |
|
263 | 1 base64-single | |
262 | base64 | 2 +- |
|
264 | base64 | 2 +- | |
263 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
265 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
264 |
|
266 | |||
265 | 0 base64-0 |
|
267 | 0 base64-0 | |
266 | base64 | 1 + |
|
268 | base64 | 1 + | |
267 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
269 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
268 |
|
270 | |||
269 |
|
271 | |||
270 | $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q |
|
272 | $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q | |
271 | $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 |
|
273 | $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 | |
272 | 5 branching |
|
274 | 5 branching | |
273 | base64 | 2 +- |
|
275 | base64 | 2 +- | |
274 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
276 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
275 |
|
277 | |||
276 | 4 base64-4 |
|
278 | 4 base64-4 | |
277 | base64 | 2 +- |
|
279 | base64 | 2 +- | |
278 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
280 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
279 |
|
281 | |||
280 | 3 base64-three |
|
282 | 3 base64-three | |
281 | base64 | 2 +- |
|
283 | base64 | 2 +- | |
282 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
284 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
283 |
|
285 | |||
284 | 2 base64-two |
|
286 | 2 base64-two | |
285 | base64 | 2 +- |
|
287 | base64 | 2 +- | |
286 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
288 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
287 |
|
289 | |||
288 | 1 base64-single |
|
290 | 1 base64-single | |
289 | base64 | 2 +- |
|
291 | base64 | 2 +- | |
290 | 1 files changed, 1 insertions(+), 1 deletions(-) |
|
292 | 1 files changed, 1 insertions(+), 1 deletions(-) | |
291 |
|
293 | |||
292 | 0 base64-0 |
|
294 | 0 base64-0 | |
293 | base64 | 1 + |
|
295 | base64 | 1 + | |
294 | 1 files changed, 1 insertions(+), 0 deletions(-) |
|
296 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
295 |
|
297 | |||
296 | $ rm bundle.hg bundle-again.hg |
|
298 | $ rm bundle.hg bundle-again.hg | |
297 | #endif |
|
299 | #endif | |
298 |
|
300 | |||
299 | # TEST: hg status |
|
301 | # TEST: hg status | |
300 |
|
302 | |||
301 | $ hg status |
|
303 | $ hg status | |
302 | $ hg diff |
|
304 | $ hg diff |
General Comments 0
You need to be logged in to leave comments.
Login now