##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

test-convert-cvs*: mute output from "cvs up"...
Mads Kiilerich -
r7812:18048153 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,103 +1,103 b''
1 1 #!/bin/sh
2 2
3 3 "$TESTDIR/hghave" cvs cvsps || exit 80
4 4
5 5 cvscall()
6 6 {
7 7 cvs -f $@
8 8 }
9 9
10 10 hgcat()
11 11 {
12 12 hg --cwd src-hg cat -r tip "$1"
13 13 }
14 14
15 15 # Test legacy configuration with external cvsps
16 16 echo "[extensions]" >> $HGRCPATH
17 17 echo "convert = " >> $HGRCPATH
18 18 echo "graphlog = " >> $HGRCPATH
19 19 echo "[convert]" >> $HGRCPATH
20 20 echo "cvsps=cvsps -A -u --cvs-direct -q" >> $HGRCPATH
21 21
22 22 echo % create cvs repository
23 23 mkdir cvsrepo
24 24 cd cvsrepo
25 25 export CVSROOT=`pwd`
26 26 export CVS_OPTIONS=-f
27 27 cd ..
28 28
29 29 cvscall -q -d "$CVSROOT" init
30 30
31 31 echo % create source directory
32 32 mkdir src-temp
33 33 cd src-temp
34 34 echo a > a
35 35 mkdir b
36 36 cd b
37 37 echo c > c
38 38 cd ..
39 39
40 40 echo % import source directory
41 41 cvscall -q import -m import src INITIAL start
42 42 cd ..
43 43
44 44 echo % checkout source directory
45 45 cvscall -q checkout src
46 46
47 47 echo % commit a new revision changing b/c
48 48 cd src
49 49 sleep 1
50 50 echo c >> b/c
51 51 cvscall -q commit -mci0 . | grep '<--' |\
52 52 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
53 53 cd ..
54 54
55 55 echo % convert fresh repo
56 56 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
57 57 hgcat a
58 58 hgcat b/c
59 59
60 60 echo % convert fresh repo with --filemap
61 61 echo include b/c > filemap
62 62 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
63 63 hgcat b/c
64 64 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
65 65
66 66 echo % commit new file revisions
67 67 cd src
68 68 echo a >> a
69 69 echo c >> b/c
70 70 cvscall -q commit -mci1 . | grep '<--' |\
71 71 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
72 72 cd ..
73 73
74 74 echo % convert again
75 75 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
76 76 hgcat a
77 77 hgcat b/c
78 78
79 79 echo % convert again with --filemap
80 80 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
81 81 hgcat b/c
82 82 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
83 83
84 84 echo % commit branch
85 85 cd src
86 86 cvs -q update -r1.1 b/c
87 87 cvs -q tag -b branch
88 cvs -q update -r branch
88 cvs -q update -r branch > /dev/null
89 89 echo d >> b/c
90 90 cvs -q commit -mci2 . | grep '<--' |\
91 91 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
92 92 cd ..
93 93
94 94 echo % convert again
95 95 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
96 96 hgcat a
97 97 hgcat b/c
98 98
99 99 echo % convert again with --filemap
100 100 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
101 101 hgcat b/c
102 102 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
103 103 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'
Show file before | Show file after | Hide comments
@@ -1,61 +1,61 b''
1 1 #!/bin/sh
2 2
3 3 # This is http://www.selenic.com/mercurial/bts/issue1148
4 4
5 5 "$TESTDIR/hghave" cvs || exit 80
6 6
7 7 cvscall()
8 8 {
9 9 cvs -f "$@"
10 10 }
11 11
12 12 echo "[extensions]" >> $HGRCPATH
13 13 echo "convert = " >> $HGRCPATH
14 14 echo "graphlog = " >> $HGRCPATH
15 15 echo "[convert]" >> $HGRCPATH
16 16 echo "cvsps=builtin" >> $HGRCPATH
17 17
18 18 echo % create cvs repository
19 19 mkdir cvsrepo
20 20 cd cvsrepo
21 21 export CVSROOT=`pwd`
22 22 export CVS_OPTIONS=-f
23 23 cd ..
24 24
25 25 cvscall -q -d "$CVSROOT" init
26 26
27 27 echo % Create a new project
28 28
29 29 mkdir src
30 30 cd src
31 31 echo "1" > a
32 32 echo "1" > b
33 33 cvscall import -m "init" src v0 r0 | sort
34 34 cd ..
35 35 cvscall co src
36 36 cd src
37 37
38 38 echo % Branch the project
39 39
40 40 cvscall tag -b BRANCH
41 cvscall up -r BRANCH
41 cvscall up -r BRANCH > /dev/null
42 42
43 43 echo % Modify file a, then b, then a
44 44
45 45 echo "2" > a
46 46 cvscall ci -m "mod a" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
47 47
48 48 echo "2" > b
49 49 cvscall ci -m "mod b" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
50 50
51 51 echo "3" > a
52 52 cvscall ci -m "mod a again" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
53 53
54 54 echo % Convert
55 55
56 56 cd ..
57 57 hg convert src | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
58 58
59 59 echo % Check the result
60 60
61 61 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'
Show file before | Show file after | Hide comments
@@ -1,121 +1,121 b''
1 1 #!/bin/sh
2 2
3 3 "$TESTDIR/hghave" cvs || exit 80
4 4
5 5 cvscall()
6 6 {
7 7 cvs -f "$@"
8 8 }
9 9
10 10 hgcat()
11 11 {
12 12 hg --cwd src-hg cat -r tip "$1"
13 13 }
14 14
15 15 echo "[extensions]" >> $HGRCPATH
16 16 echo "convert = " >> $HGRCPATH
17 17 echo "graphlog = " >> $HGRCPATH
18 18 echo "[convert]" >> $HGRCPATH
19 19 echo "cvsps=builtin" >> $HGRCPATH
20 20
21 21 echo % create cvs repository
22 22 mkdir cvsrepo
23 23 cd cvsrepo
24 24 export CVSROOT=`pwd`
25 25 export CVS_OPTIONS=-f
26 26 cd ..
27 27
28 28 cvscall -q -d "$CVSROOT" init
29 29
30 30 echo % create source directory
31 31 mkdir src-temp
32 32 cd src-temp
33 33 echo a > a
34 34 mkdir b
35 35 cd b
36 36 echo c > c
37 37 cd ..
38 38
39 39 echo % import source directory
40 40 cvscall -q import -m import src INITIAL start
41 41 cd ..
42 42
43 43 echo % checkout source directory
44 44 cvscall -q checkout src
45 45
46 46 echo % commit a new revision changing b/c
47 47 cd src
48 48 sleep 1
49 49 echo c >> b/c
50 50 cvscall -q commit -mci0 . | grep '<--' |\
51 51 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
52 52 cd ..
53 53
54 54 echo % convert fresh repo
55 55 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
56 56 hgcat a
57 57 hgcat b/c
58 58
59 59 echo % convert fresh repo with --filemap
60 60 echo include b/c > filemap
61 61 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
62 62 hgcat b/c
63 63 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
64 64
65 65 echo % commit new file revisions
66 66 cd src
67 67 echo a >> a
68 68 echo c >> b/c
69 69 cvscall -q commit -mci1 . | grep '<--' |\
70 70 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
71 71 cd ..
72 72
73 73 echo % convert again
74 74 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
75 75 hgcat a
76 76 hgcat b/c
77 77
78 78 echo % convert again with --filemap
79 79 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
80 80 hgcat b/c
81 81 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
82 82
83 83 echo % commit branch
84 84 cd src
85 85 cvs -q update -r1.1 b/c
86 86 cvs -q tag -b branch
87 cvs -q update -r branch
87 cvs -q update -r branch > /dev/null
88 88 echo d >> b/c
89 89 cvs -q commit -mci2 . | grep '<--' |\
90 90 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
91 91 cd ..
92 92
93 93 echo % convert again
94 94 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
95 95 hgcat a
96 96 hgcat b/c
97 97
98 98 echo % convert again with --filemap
99 99 hg convert --filemap filemap src src-filemap | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
100 100 hgcat b/c
101 101 hg -R src-filemap log --template '#rev# #desc# files: #files#\n'
102 102
103 103 echo % commit a new revision with funny log message
104 104 cd src
105 105 sleep 1
106 106 echo e >> a
107 107 cvscall -q commit -m'funny
108 108 ----------------------------
109 109 log message' . | grep '<--' |\
110 110 sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
111 111 cd ..
112 112
113 113 echo % convert again
114 114 hg convert src src-hg | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
115 115
116 116 echo "graphlog = " >> $HGRCPATH
117 117 hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'
118 118
119 119 echo % testing debugcvsps
120 120 cd src
121 121 hg debugcvsps | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/'
General Comments 0
You need to be logged in to leave comments. Login now