Mercurial > hg

comparison tests/test-convert-cvs.t @ 12640:6cc4b14fb76b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 08 Oct 2010 22:36:10 -0500
parents 99232aa664d6
children 1e497df514e2
comparison
equal deleted inserted replaced
12639:236058a65cb4 12640:6cc4b14fb76b
64 64
65 $ cd src 65 $ cd src
66 $ sleep 1 66 $ sleep 1
67 $ echo c >> b/c 67 $ echo c >> b/c
68 $ cvscall -q commit -mci0 . | grep '<--' 68 $ cvscall -q commit -mci0 . | grep '<--'
69 */cvsrepo/src/b/c,v <-- *c (glob) 69 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
70 $ cd .. 70 $ cd ..
71 71
72 convert fresh repo 72 convert fresh repo
73 73
74 $ hg convert src src-hg 74 $ hg convert src src-hg
75 initializing destination src-hg repository 75 initializing destination src-hg repository
76 connecting to */cvsrepo (glob) 76 connecting to $TESTTMP/cvsrepo
77 scanning source... 77 scanning source...
78 collecting CVS rlog 78 collecting CVS rlog
79 5 log entries 79 5 log entries
80 cvslog hook: 5 entries 80 cvslog hook: 5 entries
81 creating changesets 81 creating changesets
96 convert fresh repo with --filemap 96 convert fresh repo with --filemap
97 97
98 $ echo include b/c > filemap 98 $ echo include b/c > filemap
99 $ hg convert --filemap filemap src src-filemap 99 $ hg convert --filemap filemap src src-filemap
100 initializing destination src-filemap repository 100 initializing destination src-filemap repository
101 connecting to */cvsrepo (glob) 101 connecting to $TESTTMP/cvsrepo
102 scanning source... 102 scanning source...
103 collecting CVS rlog 103 collecting CVS rlog
104 5 log entries 104 5 log entries
105 cvslog hook: 5 entries 105 cvslog hook: 5 entries
106 creating changesets 106 creating changesets
133 src 133 src
134 $ hg convert srcfull srcfull-hg \ 134 $ hg convert srcfull srcfull-hg \
135 > | grep -v 'log entries' | grep -v 'hook:' \ 135 > | grep -v 'log entries' | grep -v 'hook:' \
136 > | grep -v '^[0-3] .*' # filter instable changeset order 136 > | grep -v '^[0-3] .*' # filter instable changeset order
137 initializing destination srcfull-hg repository 137 initializing destination srcfull-hg repository
138 connecting to */cvsrepo (glob) 138 connecting to $TESTTMP/cvsrepo
139 scanning source... 139 scanning source...
140 collecting CVS rlog 140 collecting CVS rlog
141 creating changesets 141 creating changesets
142 4 changeset entries 142 4 changeset entries
143 sorting... 143 sorting...
153 153
154 $ cd src 154 $ cd src
155 $ echo a >> a 155 $ echo a >> a
156 $ echo c >> b/c 156 $ echo c >> b/c
157 $ cvscall -q commit -mci1 . | grep '<--' 157 $ cvscall -q commit -mci1 . | grep '<--'
158 */cvsrepo/src/a,v <-- a (glob) 158 $TESTTMP/cvsrepo/src/a,v <-- a
159 */cvsrepo/src/b/c,v <-- *c (glob) 159 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
160 $ cd .. 160 $ cd ..
161 161
162 convert again 162 convert again
163 163
164 $ hg convert src src-hg 164 $ hg convert src src-hg
165 connecting to */cvsrepo (glob) 165 connecting to $TESTTMP/cvsrepo
166 scanning source... 166 scanning source...
167 collecting CVS rlog 167 collecting CVS rlog
168 7 log entries 168 7 log entries
169 cvslog hook: 7 entries 169 cvslog hook: 7 entries
170 creating changesets 170 creating changesets
182 c 182 c
183 183
184 convert again with --filemap 184 convert again with --filemap
185 185
186 $ hg convert --filemap filemap src src-filemap 186 $ hg convert --filemap filemap src src-filemap
187 connecting to */cvsrepo (glob) 187 connecting to $TESTTMP/cvsrepo
188 scanning source... 188 scanning source...
189 collecting CVS rlog 189 collecting CVS rlog
190 7 log entries 190 7 log entries
191 cvslog hook: 7 entries 191 cvslog hook: 7 entries
192 creating changesets 192 creating changesets
214 T a 214 T a
215 T b/c 215 T b/c
216 $ cvs -q update -r branch > /dev/null 216 $ cvs -q update -r branch > /dev/null
217 $ echo d >> b/c 217 $ echo d >> b/c
218 $ cvs -q commit -mci2 . | grep '<--' 218 $ cvs -q commit -mci2 . | grep '<--'
219 */cvsrepo/src/b/c,v <-- *c (glob) 219 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
220 $ cd .. 220 $ cd ..
221 221
222 convert again 222 convert again
223 223
224 $ hg convert src src-hg 224 $ hg convert src src-hg
225 connecting to */cvsrepo (glob) 225 connecting to $TESTTMP/cvsrepo
226 scanning source... 226 scanning source...
227 collecting CVS rlog 227 collecting CVS rlog
228 8 log entries 228 8 log entries
229 cvslog hook: 8 entries 229 cvslog hook: 8 entries
230 creating changesets 230 creating changesets
238 d 238 d
239 239
240 convert again with --filemap 240 convert again with --filemap
241 241
242 $ hg convert --filemap filemap src src-filemap 242 $ hg convert --filemap filemap src src-filemap
243 connecting to */cvsrepo (glob) 243 connecting to $TESTTMP/cvsrepo
244 scanning source... 244 scanning source...
245 collecting CVS rlog 245 collecting CVS rlog
246 8 log entries 246 8 log entries
247 cvslog hook: 8 entries 247 cvslog hook: 8 entries
248 creating changesets 248 creating changesets
275 commit new file revisions with some fuzz 275 commit new file revisions with some fuzz
276 276
277 $ sleep 1 277 $ sleep 1
278 $ echo f >> a 278 $ echo f >> a
279 $ cvscall -q commit -mfuzzy . | grep '<--' 279 $ cvscall -q commit -mfuzzy . | grep '<--'
280 */cvsrepo/src/a,v <-- a (glob) 280 $TESTTMP/cvsrepo/src/a,v <-- a
281 $ sleep 4 # the two changes will be split if fuzz < 4 281 $ sleep 4 # the two changes will be split if fuzz < 4
282 $ echo g >> b/c 282 $ echo g >> b/c
283 $ cvscall -q commit -mfuzzy . | grep '<--' 283 $ cvscall -q commit -mfuzzy . | grep '<--'
284 */cvsrepo/src/b/c,v <-- *c (glob) 284 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob)
285 $ cd .. 285 $ cd ..
286 286
287 convert again 287 convert again
288 288
289 $ hg convert --config convert.cvsps.fuzz=2 src src-hg 289 $ hg convert --config convert.cvsps.fuzz=2 src src-hg
290 connecting to */cvsrepo (glob) 290 connecting to $TESTTMP/cvsrepo
291 scanning source... 291 scanning source...
292 collecting CVS rlog 292 collecting CVS rlog
293 11 log entries 293 11 log entries
294 cvslog hook: 11 entries 294 cvslog hook: 11 entries
295 creating changesets 295 creating changesets