Mercurial > hg
annotate tests/test-convert-cvs.t @ 31196:3af9a9628ecf
revert: always display hunks reversed when reverting to parent
When reverting to the parent of working directory, operation is "discard" so
we want hunks to be presented in the same order as the diff (i.e. "reversed").
So we do not query the experimental.revertalternateinteractivemode option in
this case and always set "reversehunks" to True.
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Mon, 06 Mar 2017 14:11:21 +0100 |
parents | 75e29fcc5a71 |
children | 0823f0983eaa |
rev | line source |
---|---|
22046
7a9cbb315d84
tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents:
20117
diff
changeset
|
1 #require cvs |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
2 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
3 $ cvscall() |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
4 > { |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
5 > cvs -f "$@" |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
6 > } |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
7 $ hgcat() |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
8 > { |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
9 > hg --cwd src-hg cat -r tip "$1" |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
10 > } |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
11 $ echo "[extensions]" >> $HGRCPATH |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
12 $ echo "convert = " >> $HGRCPATH |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
13 $ cat > cvshooks.py <<EOF |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
14 > def cvslog(ui,repo,hooktype,log): |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
15 > print "%s hook: %d entries"%(hooktype,len(log)) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
16 > |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
17 > def cvschangesets(ui,repo,hooktype,changesets): |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
18 > print "%s hook: %d changesets"%(hooktype,len(changesets)) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
19 > EOF |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
20 $ hookpath=`pwd` |
23172
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22046
diff
changeset
|
21 $ cat <<EOF >> $HGRCPATH |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22046
diff
changeset
|
22 > [hooks] |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22046
diff
changeset
|
23 > cvslog = python:$hookpath/cvshooks.py:cvslog |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22046
diff
changeset
|
24 > cvschangesets = python:$hookpath/cvshooks.py:cvschangesets |
e955549cd045
tests: write hgrc of more than two lines by using shell heredoc
Yuya Nishihara <yuya@tcha.org>
parents:
22046
diff
changeset
|
25 > EOF |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
26 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
27 create cvs repository |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
28 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
29 $ mkdir cvsrepo |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
30 $ cd cvsrepo |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
31 $ CVSROOT=`pwd` |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
32 $ export CVSROOT |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
33 $ CVS_OPTIONS=-f |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
34 $ export CVS_OPTIONS |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
35 $ cd .. |
23675
96529f81e2e9
tests: run 'cvs init' only on non-existent directories (issue4482)
Thomas Klausner <tk@giga.or.at>
parents:
23172
diff
changeset
|
36 $ rmdir cvsrepo |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
37 $ cvscall -q -d "$CVSROOT" init |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
38 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
39 create source directory |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
40 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
41 $ mkdir src-temp |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
42 $ cd src-temp |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
43 $ echo a > a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
44 $ mkdir b |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
45 $ cd b |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
46 $ echo c > c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
47 $ cd .. |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
48 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
49 import source directory |
6717
2011bb8ada9a
convert: hg sink commits without working dir
Patrick Mezard <pmezard@gmail.com>
parents:
6690
diff
changeset
|
50 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
51 $ cvscall -q import -m import src INITIAL start |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
52 N src/a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
53 N src/b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
54 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
55 No conflicts created by this import |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
56 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
57 $ cd .. |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
58 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
59 checkout source directory |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
60 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
61 $ cvscall -q checkout src |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
62 U src/a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
63 U src/b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
64 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
65 commit a new revision changing b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
66 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
67 $ cd src |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
68 $ sleep 1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
69 $ echo c >> b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
70 $ cvscall -q commit -mci0 . | grep '<--' |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
71 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
72 $ cd .. |
10095
69ce7a10e593
convert: implement two hooks in builtin cvsps
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
9602
diff
changeset
|
73 |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
74 convert fresh repo and also check localtimezone option |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
75 |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
76 NOTE: This doesn't check all time zones -- it merely determines that |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
77 the configuration option is taking effect. |
10095
69ce7a10e593
convert: implement two hooks in builtin cvsps
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
9602
diff
changeset
|
78 |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
79 An arbitrary (U.S.) time zone is used here. TZ=US/Hawaii is selected |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
80 since it does not use DST (unlike other U.S. time zones) and is always |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
81 a fixed difference from UTC. |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
82 |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
83 $ TZ=US/Hawaii hg convert --config convert.localtimezone=True src src-hg |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
84 initializing destination src-hg repository |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
85 connecting to $TESTTMP/cvsrepo |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
86 scanning source... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
87 collecting CVS rlog |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
88 5 log entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
89 cvslog hook: 5 entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
90 creating changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
91 3 changeset entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
92 cvschangesets hook: 3 changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
93 sorting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
94 converting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
95 2 Initial revision |
18376
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
18262
diff
changeset
|
96 1 ci0 |
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
18262
diff
changeset
|
97 0 import |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
98 updating tags |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
99 $ hgcat a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
100 a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
101 $ hgcat b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
102 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
103 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
104 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
105 convert fresh repo with --filemap |
10095
69ce7a10e593
convert: implement two hooks in builtin cvsps
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
9602
diff
changeset
|
106 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
107 $ echo include b/c > filemap |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
108 $ hg convert --filemap filemap src src-filemap |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
109 initializing destination src-filemap repository |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
110 connecting to $TESTTMP/cvsrepo |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
111 scanning source... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
112 collecting CVS rlog |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
113 5 log entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
114 cvslog hook: 5 entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
115 creating changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
116 3 changeset entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
117 cvschangesets hook: 3 changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
118 sorting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
119 converting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
120 2 Initial revision |
18376
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
18262
diff
changeset
|
121 1 ci0 |
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
18262
diff
changeset
|
122 0 import |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
123 filtering out empty revision |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
24305
diff
changeset
|
124 repository tip rolled back to revision 1 (undo convert) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
125 updating tags |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
126 $ hgcat b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
127 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
128 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
129 $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n' |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
130 2 update tags files: .hgtags |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
131 1 ci0 files: b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
132 0 Initial revision files: b/c |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
133 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
134 convert full repository (issue1649) |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
135 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
136 $ cvscall -q -d "$CVSROOT" checkout -d srcfull "." | grep -v CVSROOT |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
137 U srcfull/src/a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
138 U srcfull/src/b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
139 $ ls srcfull |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
140 CVS |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
141 CVSROOT |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
142 src |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
143 $ hg convert srcfull srcfull-hg \ |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
144 > | grep -v 'log entries' | grep -v 'hook:' \ |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
145 > | grep -v '^[0-3] .*' # filter instable changeset order |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
146 initializing destination srcfull-hg repository |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
147 connecting to $TESTTMP/cvsrepo |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
148 scanning source... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
149 collecting CVS rlog |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
150 creating changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
151 4 changeset entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
152 sorting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
153 converting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
154 updating tags |
17015
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
155 $ hg cat -r tip --cwd srcfull-hg src/a |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
156 a |
17015
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
157 $ hg cat -r tip --cwd srcfull-hg src/b/c |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
158 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
159 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
160 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
161 commit new file revisions |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
162 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
163 $ cd src |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
164 $ echo a >> a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
165 $ echo c >> b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
166 $ cvscall -q commit -mci1 . | grep '<--' |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
167 $TESTTMP/cvsrepo/src/a,v <-- a |
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
168 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
169 $ cd .. |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
170 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
171 convert again |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
172 |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
173 $ TZ=US/Hawaii hg convert --config convert.localtimezone=True src src-hg |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
174 connecting to $TESTTMP/cvsrepo |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
175 scanning source... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
176 collecting CVS rlog |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
177 7 log entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
178 cvslog hook: 7 entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
179 creating changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
180 4 changeset entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
181 cvschangesets hook: 4 changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
182 sorting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
183 converting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
184 0 ci1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
185 $ hgcat a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
186 a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
187 a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
188 $ hgcat b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
189 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
190 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
191 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
192 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
193 convert again with --filemap |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
194 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
195 $ hg convert --filemap filemap src src-filemap |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
196 connecting to $TESTTMP/cvsrepo |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
197 scanning source... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
198 collecting CVS rlog |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
199 7 log entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
200 cvslog hook: 7 entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
201 creating changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
202 4 changeset entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
203 cvschangesets hook: 4 changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
204 sorting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
205 converting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
206 0 ci1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
207 $ hgcat b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
208 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
209 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
210 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
211 $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n' |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
212 3 ci1 files: b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
213 2 update tags files: .hgtags |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
214 1 ci0 files: b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
215 0 Initial revision files: b/c |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
216 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
217 commit branch |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
218 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
219 $ cd src |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
220 $ cvs -q update -r1.1 b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
221 U b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
222 $ cvs -q tag -b branch |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
223 T a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
224 T b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
225 $ cvs -q update -r branch > /dev/null |
26594
75e29fcc5a71
test-convert-cvs: add sleep so cvs notices changes
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
26593
diff
changeset
|
226 $ sleep 1 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
227 $ echo d >> b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
228 $ cvs -q commit -mci2 . | grep '<--' |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
229 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
230 $ cd .. |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
231 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
232 convert again |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
233 |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
234 $ TZ=US/Hawaii hg convert --config convert.localtimezone=True src src-hg |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
235 connecting to $TESTTMP/cvsrepo |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
236 scanning source... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
237 collecting CVS rlog |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
238 8 log entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
239 cvslog hook: 8 entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
240 creating changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
241 5 changeset entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
242 cvschangesets hook: 5 changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
243 sorting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
244 converting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
245 0 ci2 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
246 $ hgcat b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
247 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
248 d |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
249 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
250 convert again with --filemap |
10695
b4b16e90712f
convert: teach cvsps to handle . repository (issue1649)
Mathieu Clabaut <mathieu.clabaut@systerel.fr>
parents:
10276
diff
changeset
|
251 |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
252 $ TZ=US/Hawaii hg convert --config convert.localtimezone=True --filemap filemap src src-filemap |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
253 connecting to $TESTTMP/cvsrepo |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
254 scanning source... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
255 collecting CVS rlog |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
256 8 log entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
257 cvslog hook: 8 entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
258 creating changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
259 5 changeset entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
260 cvschangesets hook: 5 changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
261 sorting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
262 converting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
263 0 ci2 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
264 $ hgcat b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
265 c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
266 d |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
267 $ hg -R src-filemap log --template '{rev} {desc} files: {files}\n' |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
268 4 ci2 files: b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
269 3 ci1 files: b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
270 2 update tags files: .hgtags |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
271 1 ci0 files: b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
272 0 Initial revision files: b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
273 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
274 commit a new revision with funny log message |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
275 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
276 $ cd src |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
277 $ sleep 1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
278 $ echo e >> a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
279 $ cvscall -q commit -m'funny |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
280 > ---------------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
281 > log message' . | grep '<--' |\ |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
282 > sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g' |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
283 checking in src/a,v |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
284 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
285 commit new file revisions with some fuzz |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
286 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
287 $ sleep 1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
288 $ echo f >> a |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
289 $ cvscall -q commit -mfuzzy . | grep '<--' |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
290 $TESTTMP/cvsrepo/src/a,v <-- a |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
291 $ sleep 4 # the two changes will be split if fuzz < 4 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
292 $ echo g >> b/c |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
293 $ cvscall -q commit -mfuzzy . | grep '<--' |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
294 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
295 $ cd .. |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
296 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
297 convert again |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
298 |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
299 $ TZ=US/Hawaii hg convert --config convert.cvsps.fuzz=2 --config convert.localtimezone=True src src-hg |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12519
diff
changeset
|
300 connecting to $TESTTMP/cvsrepo |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
301 scanning source... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
302 collecting CVS rlog |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
303 11 log entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
304 cvslog hook: 11 entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
305 creating changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
306 8 changeset entries |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
307 cvschangesets hook: 8 changesets |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
308 sorting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
309 converting... |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
310 2 funny |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
311 1 fuzzy |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
312 0 fuzzy |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
18376
diff
changeset
|
313 $ hg -R src-hg log -G --template '{rev} ({branches}) {desc} date: {date|date} files: {files}\n' |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
314 o 8 (branch) fuzzy date: * -1000 files: b/c (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
315 | |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
316 o 7 (branch) fuzzy date: * -1000 files: a (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
317 | |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
318 o 6 (branch) funny |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
319 | ---------------------------- |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
320 | log message date: * -1000 files: a (glob) |
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
321 o 5 (branch) ci2 date: * -1000 files: b/c (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
322 |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
323 o 4 () ci1 date: * -1000 files: a b/c (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
324 | |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
325 o 3 () update tags date: * +0000 files: .hgtags (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
326 | |
18376
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
18262
diff
changeset
|
327 | o 2 (INITIAL) import date: * -1000 files: (glob) |
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
18262
diff
changeset
|
328 | | |
13d73bf6be29
convert: make toposort order stable when multiple orderings are possible
Mads Kiilerich <mads@kiilerich.com>
parents:
18262
diff
changeset
|
329 o | 1 () ci0 date: * -1000 files: b/c (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
330 |/ |
17974
337d728e644f
convert: add config option to use the local time zone
Julian Cowley <julian@lava.net>
parents:
17015
diff
changeset
|
331 o 0 () Initial revision date: * -1000 files: a b/c (glob) |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
332 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
333 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
334 testing debugcvsps |
6690
127e8c3466d1
convert: cvs.py - Allow user to use built-in CVS changeset code.
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
diff
changeset
|
335 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
336 $ cd src |
26593
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
337 $ hg debugcvsps --fuzz=2 -x >/dev/null |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
338 |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
339 commit a new revision changing a and removing b/c |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
340 |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
341 $ cvscall -q update -A |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
342 U a |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
343 U b/c |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
344 $ sleep 1 |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
345 $ echo h >> a |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
346 $ cvscall -Q remove -f b/c |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
347 $ cvscall -q commit -mci | grep '<--' |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
348 $TESTTMP/cvsrepo/src/a,v <-- a |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
349 $TESTTMP/cvsrepo/src/b/c,v <-- *c (glob) |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
350 |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
351 update and verify the cvsps cache |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
352 |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
353 $ hg debugcvsps --fuzz=2 -u |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
354 collecting CVS rlog |
26593
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
355 13 log entries |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
356 cvslog hook: 13 entries |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
357 creating changesets |
26593
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
358 11 changeset entries |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
359 cvschangesets hook: 11 changesets |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
360 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
361 PatchSet 1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
362 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
363 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
364 Branch: HEAD |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
365 Tag: (none) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
366 Branchpoints: INITIAL |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
367 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
368 Initial revision |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
369 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
370 Members: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
371 a:INITIAL->1.1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
372 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
373 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
374 PatchSet 2 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
375 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
376 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
377 Branch: HEAD |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
378 Tag: (none) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
379 Branchpoints: INITIAL, branch |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
380 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
381 Initial revision |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
382 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
383 Members: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
384 b/c:INITIAL->1.1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
385 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
386 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
387 PatchSet 3 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
388 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
389 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
390 Branch: INITIAL |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
391 Tag: start |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
392 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
393 import |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
394 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
395 Members: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
396 a:1.1->1.1.1.1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
397 b/c:1.1->1.1.1.1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
398 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
399 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
400 PatchSet 4 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
401 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
402 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
403 Branch: HEAD |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
404 Tag: (none) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
405 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
406 ci0 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
407 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
408 Members: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
409 b/c:1.1->1.2 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
410 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
411 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
412 PatchSet 5 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
413 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
414 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
415 Branch: HEAD |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
416 Tag: (none) |
24305
867c3649be5d
cvsps: use a different tiebreaker to avoid flaky test
Augie Fackler <raf@durin42.com>
parents:
23675
diff
changeset
|
417 Branchpoints: branch |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
418 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
419 ci1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
420 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
421 Members: |
24305
867c3649be5d
cvsps: use a different tiebreaker to avoid flaky test
Augie Fackler <raf@durin42.com>
parents:
23675
diff
changeset
|
422 a:1.1->1.2 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
423 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
424 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
425 PatchSet 6 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
426 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
427 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
428 Branch: HEAD |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
429 Tag: (none) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
430 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
431 ci1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
432 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
433 Members: |
24305
867c3649be5d
cvsps: use a different tiebreaker to avoid flaky test
Augie Fackler <raf@durin42.com>
parents:
23675
diff
changeset
|
434 b/c:1.2->1.3 |
12519
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
435 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
436 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
437 PatchSet 7 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
438 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
439 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
440 Branch: branch |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
441 Tag: (none) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
442 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
443 ci2 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
444 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
445 Members: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
446 b/c:1.1->1.1.2.1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
447 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
448 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
449 PatchSet 8 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
450 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
451 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
452 Branch: branch |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
453 Tag: (none) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
454 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
455 funny |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
456 ---------------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
457 log message |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
458 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
459 Members: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
460 a:1.2->1.2.2.1 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
461 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
462 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
463 PatchSet 9 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
464 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
465 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
466 Branch: branch |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
467 Tag: (none) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
468 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
469 fuzzy |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
470 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
471 Members: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
472 a:1.2.2.1->1.2.2.2 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
473 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
474 --------------------- |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
475 PatchSet 10 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
476 Date: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
477 Author: * (glob) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
478 Branch: branch |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
479 Tag: (none) |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
480 Log: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
481 fuzzy |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
482 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
483 Members: |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
484 b/c:1.1.2.1->1.1.2.2 |
99232aa664d6
tests: unify test-convert-cvs
Matt Mackall <mpm@selenic.com>
parents:
12153
diff
changeset
|
485 |
26593
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
486 --------------------- |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
487 PatchSet 11 |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
488 Date: * (glob) |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
489 Author: * (glob) |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
490 Branch: HEAD |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
491 Tag: (none) |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
492 Log: |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
493 ci |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
494 |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
495 Members: |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
496 a:1.2->1.3 |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
497 b/c:1.3->1.4(DEAD) |
c60dfcc0abf2
cvsps: fix computation of parent revisions when log caching is on
Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
parents:
25571
diff
changeset
|
498 |
7594
a204547790bc
test: added testcase for cvsps log message lookahead
Frank Kingswood <frank@kingswood-consulting.co.uk>
parents:
7503
diff
changeset
|
499 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15131
diff
changeset
|
500 $ cd .. |