Show More
@@ -138,7 +138,7 b' class monotone_source(converter_source, ' | |||
|
138 | 138 | return (commandnbr, stream, length, read) |
|
139 | 139 | |
|
140 | 140 | def mtnstdioreadcommandoutput(self, command): |
|
141 |
retval = |
|
|
141 | retval = [] | |
|
142 | 142 | while True: |
|
143 | 143 | commandnbr, stream, length, output = self.mtnstdioreadpacket() |
|
144 | 144 | self.ui.debug('mtn: read packet %s:%s:%s\n' % |
@@ -159,9 +159,9 b' class monotone_source(converter_source, ' | |||
|
159 | 159 | self.ui.debug('mtn: ' + output) |
|
160 | 160 | elif stream == 'm': |
|
161 | 161 | # Main stream - command output |
|
162 |
retval |
|
|
162 | retval.append(output) | |
|
163 | 163 | |
|
164 | return retval | |
|
164 | return ''.join(retval) | |
|
165 | 165 | |
|
166 | 166 | def mtnloadmanifest(self, rev): |
|
167 | 167 | if self.manifest_rev == rev: |
@@ -208,9 +208,20 b' test diverging directory moves' | |||
|
208 | 208 | mtn: beginning commit on branch 'com.selenic.test' |
|
209 | 209 | mtn: committed revision 4a736634505795f17786fffdf2c9cbf5b11df6f6 |
|
210 | 210 | |
|
211 | test large file support (> 32kB) | |
|
212 | ||
|
213 | $ python -c 'for x in range(10000): print x' > large-file | |
|
214 | $ $TESTDIR/md5sum.py large-file | |
|
215 | 5d6de8a95c3b6bf9e0ffb808ba5299c1 large-file | |
|
216 | $ mtn add large-file | |
|
217 | mtn: adding large-file to workspace manifest | |
|
218 | $ mtn ci -m largefile | |
|
219 | mtn: beginning commit on branch 'com.selenic.test' | |
|
220 | mtn: committed revision f0a20fecd10dc4392d18fe69a03f1f4919d3387b | |
|
221 | ||
|
211 | 222 | test suspending (closing a branch) |
|
212 | 223 | |
|
213 | $ mtn suspend 4a736634505795f17786fffdf2c9cbf5b11df6f6 2> /dev/null | |
|
224 | $ mtn suspend f0a20fecd10dc4392d18fe69a03f1f4919d3387b 2> /dev/null | |
|
214 | 225 | $ cd .. |
|
215 | 226 | |
|
216 | 227 | convert incrementally |
@@ -220,27 +231,30 b' convert incrementally' | |||
|
220 | 231 | scanning source... |
|
221 | 232 | sorting... |
|
222 | 233 | converting... |
|
223 |
1 |
|
|
224 |
1 |
|
|
225 |
|
|
|
226 |
|
|
|
227 |
|
|
|
228 |
|
|
|
229 |
|
|
|
230 |
|
|
|
231 |
|
|
|
232 |
|
|
|
233 |
|
|
|
234 |
|
|
|
234 | 12 update2 "with" quotes | |
|
235 | 11 createdir1 | |
|
236 | 10 movedir1 | |
|
237 | 9 movedir | |
|
238 | 8 emptydir | |
|
239 | 7 dropdirectory | |
|
240 | 6 dirfilemove | |
|
241 | 5 dirfilemove2 | |
|
242 | 4 dirdirmove | |
|
243 | 3 dirdirmove2 | |
|
244 | 2 divergentdirmove | |
|
245 | 1 divergentdirmove2 | |
|
246 | 0 largefile | |
|
235 | 247 | $ glog() |
|
236 | 248 | > { |
|
237 | 249 | > hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |
|
238 | 250 | > } |
|
239 | 251 | $ cd repo.mtn-hg |
|
240 | 252 | $ hg up -C |
|
241 |
1 |
|
|
253 | 12 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
242 | 254 | $ glog |
|
243 | @ 13 "divergentdirmove2" files: dir7-2/c dir7/c dir7/dir9/b dir7/dir9/dir8/a dir8-2/a dir9-2/b | |
|
255 | @ 14 "largefile" files: large-file | |
|
256 | | | |
|
257 | o 13 "divergentdirmove2" files: dir7-2/c dir7/c dir7/dir9/b dir7/dir9/dir8/a dir8-2/a dir9-2/b | |
|
244 | 258 | | |
|
245 | 259 | o 12 "divergentdirmove" files: dir7/c dir7/dir9/b dir7/dir9/dir8/a |
|
246 | 260 | | |
@@ -283,6 +297,7 b' manifest' | |||
|
283 | 297 | dir8-2/a |
|
284 | 298 | dir9-2/b |
|
285 | 299 | e |
|
300 | large-file | |
|
286 | 301 | |
|
287 | 302 | contents |
|
288 | 303 | |
@@ -360,9 +375,14 b' check divergent directory moves' | |||
|
360 | 375 | dir9-2/b |
|
361 | 376 | e |
|
362 | 377 | |
|
378 | test large file support (> 32kB) | |
|
379 | ||
|
380 | $ $TESTDIR/md5sum.py large-file | |
|
381 | 5d6de8a95c3b6bf9e0ffb808ba5299c1 large-file | |
|
382 | ||
|
363 | 383 | check branch closing |
|
364 | 384 | |
|
365 | 385 | $ hg branches -a |
|
366 | 386 | $ hg branches -c |
|
367 |
com.selenic.test 1 |
|
|
387 | com.selenic.test 14:* (closed) (glob) | |
|
368 | 388 |
General Comments 0
You need to be logged in to leave comments.
Login now