]>
Commit | Line | Data |
---|---|---|
6ed77266 EW |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2007 Eric Wong | |
4 | # | |
5 | ||
1364ff27 | 6 | test_description='git svn log tests' |
7a98d9ab | 7 | |
6ed77266 EW |
8 | . ./lib-git-svn.sh |
9 | ||
f69e836f | 10 | test_expect_success 'setup repository and import' ' |
6ed77266 | 11 | mkdir import && |
18a82692 JN |
12 | ( |
13 | cd import && | |
14 | for i in trunk branches/a branches/b tags/0.1 tags/0.2 tags/0.3 | |
15 | do | |
16 | mkdir -p $i && | |
17 | echo hello >>$i/README || | |
18 | exit 1 | |
19 | done && | |
da083d68 | 20 | svn_cmd import -m test . "$svnrepo" |
18a82692 | 21 | ) && |
1364ff27 NS |
22 | git svn init "$svnrepo" -T trunk -b branches -t tags && |
23 | git svn fetch && | |
fe191fca | 24 | git reset --hard origin/trunk && |
6ed77266 EW |
25 | echo bye >> README && |
26 | git commit -a -m bye && | |
27 | git svn dcommit && | |
fe191fca | 28 | git reset --hard origin/a && |
6ed77266 EW |
29 | echo why >> FEEDME && |
30 | git update-index --add FEEDME && | |
31 | git commit -m feedme && | |
32 | git svn dcommit && | |
fe191fca | 33 | git reset --hard origin/trunk && |
6ed77266 EW |
34 | echo aye >> README && |
35 | git commit -a -m aye && | |
111947ef | 36 | git svn dcommit && |
fe191fca | 37 | git reset --hard origin/b && |
111947ef DK |
38 | echo spy >> README && |
39 | git commit -a -m spy && | |
40 | echo try >> README && | |
41 | git commit -a -m try && | |
6ed77266 | 42 | git svn dcommit |
f69e836f | 43 | ' |
6ed77266 EW |
44 | |
45 | test_expect_success 'run log' " | |
fe191fca | 46 | git reset --hard origin/a && |
de26f02d JS |
47 | git svn log -r2 origin/trunk >out && |
48 | grep ^r2 out && | |
49 | git svn log -r4 origin/trunk >out && | |
50 | grep ^r4 out && | |
51 | git svn log -r3 >out && | |
52 | grep ^r3 out | |
6ed77266 EW |
53 | " |
54 | ||
55 | test_expect_success 'run log against a from trunk' " | |
fe191fca | 56 | git reset --hard origin/trunk && |
de26f02d JS |
57 | git svn log -r3 origin/a >out && |
58 | grep ^r3 out | |
6ed77266 EW |
59 | " |
60 | ||
60f3ff12 | 61 | printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4 |
fede44b2 DK |
62 | |
63 | test_expect_success 'test ascending revision range' " | |
fe191fca | 64 | git reset --hard origin/trunk && |
82ebb0b6 | 65 | git svn log -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - |
fede44b2 DK |
66 | " |
67 | ||
9963e025 | 68 | test_expect_success 'test ascending revision range with --show-commit' " |
fe191fca | 69 | git reset --hard origin/trunk && |
9963e025 MG |
70 | git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2-r4 - |
71 | " | |
72 | ||
73 | test_expect_success 'test ascending revision range with --show-commit (sha1)' " | |
74 | git svn find-rev r1 >expected-range-r1-r2-r4-sha1 && | |
75 | git svn find-rev r2 >>expected-range-r1-r2-r4-sha1 && | |
76 | git svn find-rev r4 >>expected-range-r1-r2-r4-sha1 && | |
fe191fca | 77 | git reset --hard origin/trunk && |
9963e025 MG |
78 | git svn log --show-commit -r 1:4 | grep '^r[0-9]' | cut -d'|' -f2 >out && |
79 | git rev-parse \$(cat out) >actual && | |
80 | test_cmp expected-range-r1-r2-r4-sha1 actual | |
81 | " | |
82 | ||
60f3ff12 | 83 | printf 'r4 \nr2 \nr1 \n' > expected-range-r4-r2-r1 |
fede44b2 DK |
84 | |
85 | test_expect_success 'test descending revision range' " | |
fe191fca | 86 | git reset --hard origin/trunk && |
82ebb0b6 | 87 | git svn log -r 4:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4-r2-r1 - |
fede44b2 DK |
88 | " |
89 | ||
111947ef DK |
90 | printf 'r1 \nr2 \n' > expected-range-r1-r2 |
91 | ||
92 | test_expect_success 'test ascending revision range with unreachable revision' " | |
fe191fca | 93 | git reset --hard origin/trunk && |
82ebb0b6 | 94 | git svn log -r 1:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r1-r2 - |
111947ef DK |
95 | " |
96 | ||
97 | printf 'r2 \nr1 \n' > expected-range-r2-r1 | |
98 | ||
99 | test_expect_success 'test descending revision range with unreachable revision' " | |
fe191fca | 100 | git reset --hard origin/trunk && |
82ebb0b6 | 101 | git svn log -r 3:1 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2-r1 - |
111947ef DK |
102 | " |
103 | ||
104 | printf 'r2 \n' > expected-range-r2 | |
105 | ||
106 | test_expect_success 'test ascending revision range with unreachable upper boundary revision and 1 commit' " | |
fe191fca | 107 | git reset --hard origin/trunk && |
82ebb0b6 | 108 | git svn log -r 2:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 - |
111947ef DK |
109 | " |
110 | ||
111 | test_expect_success 'test descending revision range with unreachable upper boundary revision and 1 commit' " | |
fe191fca | 112 | git reset --hard origin/trunk && |
82ebb0b6 | 113 | git svn log -r 3:2 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r2 - |
111947ef DK |
114 | " |
115 | ||
116 | printf 'r4 \n' > expected-range-r4 | |
117 | ||
118 | test_expect_success 'test ascending revision range with unreachable lower boundary revision and 1 commit' " | |
fe191fca | 119 | git reset --hard origin/trunk && |
82ebb0b6 | 120 | git svn log -r 3:4 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 - |
111947ef DK |
121 | " |
122 | ||
123 | test_expect_success 'test descending revision range with unreachable lower boundary revision and 1 commit' " | |
fe191fca | 124 | git reset --hard origin/trunk && |
82ebb0b6 | 125 | git svn log -r 4:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 - |
111947ef DK |
126 | " |
127 | ||
128 | printf -- '------------------------------------------------------------------------\n' > expected-separator | |
129 | ||
130 | test_expect_success 'test ascending revision range with unreachable boundary revisions and no commits' " | |
fe191fca | 131 | git reset --hard origin/trunk && |
82ebb0b6 | 132 | git svn log -r 5:6 | test_cmp expected-separator - |
111947ef DK |
133 | " |
134 | ||
135 | test_expect_success 'test descending revision range with unreachable boundary revisions and no commits' " | |
fe191fca | 136 | git reset --hard origin/trunk && |
82ebb0b6 | 137 | git svn log -r 6:5 | test_cmp expected-separator - |
111947ef DK |
138 | " |
139 | ||
140 | test_expect_success 'test ascending revision range with unreachable boundary revisions and 1 commit' " | |
fe191fca | 141 | git reset --hard origin/trunk && |
82ebb0b6 | 142 | git svn log -r 3:5 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 - |
111947ef DK |
143 | " |
144 | ||
145 | test_expect_success 'test descending revision range with unreachable boundary revisions and 1 commit' " | |
fe191fca | 146 | git reset --hard origin/trunk && |
82ebb0b6 | 147 | git svn log -r 5:3 | grep '^r[0-9]' | cut -d'|' -f1 | test_cmp expected-range-r4 - |
111947ef DK |
148 | " |
149 | ||
6ed77266 | 150 | test_done |