Mercurial > public > mercurial-scm > hg
annotate tests/test-keyword @ 11109:a2bc2f2d77a9
subrepo: normalize path part of URLs so that pulling subrepos from webdir works
For a "all projects at root" repo layout eg:
/main
/sub
Where subrepos are used such that a clone of main has this layout:
./main/
./main/.hgsub
./main/sub/
And the .hgsub content is:
sub = ../sub
This allows a pull from a hgweb where main and sub are exposed
at the root (or same directory level)
The current code doesn't normalize the path component of a pull
url. this results in trying to pull from
http://server.com/hg/main/../sub
Current hgweb implementation doesn't reduce the path component
so this results in a 404 error though everything is setup logically.
This patch adresses this 404 error on the puller side
normalizing the URLs used for pulling sub repos. For this
example, the URL would be reduced to http://server.com/hg/sub
Fix + test
| author | Edouard Gomez <ed.gomez@free.fr> |
|---|---|
| date | Sat, 01 May 2010 23:05:19 +0200 |
| parents | 76d6c19aa8ef |
| children | 56f306238256 |
| rev | line source |
|---|---|
| 5816 | 1 #!/bin/sh |
| 2 | |
| 3 cat <<EOF >> $HGRCPATH | |
| 4 [extensions] | |
|
10125
19c3fefdaec9
tests highlight, keyword: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net>
parents:
10117
diff
changeset
|
5 keyword = |
|
19c3fefdaec9
tests highlight, keyword: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net>
parents:
10117
diff
changeset
|
6 mq = |
|
19c3fefdaec9
tests highlight, keyword: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net>
parents:
10117
diff
changeset
|
7 notify = |
|
11046
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
8 record = |
|
10125
19c3fefdaec9
tests highlight, keyword: load extensions with "ext ="
Christian Ebert <blacktrash@gmx.net>
parents:
10117
diff
changeset
|
9 transplant = |
|
11046
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
10 [ui] |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
11 interactive = true |
|
9462
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
12 EOF |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
13 |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
14 # demo before [keyword] files are set up |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
15 # would succeed without uisetup otherwise |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
16 echo % hg kwdemo |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
17 hg --quiet kwdemo \ |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
18 | sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \ |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
19 -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \ |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
20 -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \ |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
21 -e 's! 20[0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]! 2000/00/00 00:00:00!' |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
22 |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
23 hg --quiet kwdemo "Branch = {branches}" |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
24 |
|
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
25 cat <<EOF >> $HGRCPATH |
| 5816 | 26 [keyword] |
|
11044
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
27 ** = |
| 5816 | 28 b = ignore |
| 29 [hooks] | |
| 30 commit= | |
| 31 commit.test=cp a hooktest | |
| 32 EOF | |
| 33 | |
|
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
34 hg init Test-bndl |
|
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
35 cd Test-bndl |
| 5816 | 36 |
| 37 echo % kwshrink should exit silently in empty/invalid repo | |
| 38 hg kwshrink | |
| 39 | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
40 # Symlinks cannot be created on Windows. The bundle was made with: |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
41 # |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
42 # hg init t |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
43 # cd t |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
44 # echo a > a |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
45 # ln -s a sym |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
46 # hg add sym |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
47 # hg ci -m addsym -u mercurial |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
48 # hg bundle --base null ../test-keyword.hg |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
49 # |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
50 hg pull -u "$TESTDIR/test-keyword.hg" \ |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
51 | sed 's/pulling from.*test-keyword.hg/pulling from test-keyword.hg/' |
|
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
52 |
| 5816 | 53 echo 'expand $Id$' > a |
| 54 echo 'do not process $Id:' >> a | |
| 55 echo 'xxx $' >> a | |
| 56 echo 'ignore $Id$' > b | |
| 57 echo % cat | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
58 cat a b |
| 5816 | 59 |
|
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
60 echo % no kwfiles |
|
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
61 hg kwfiles |
|
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
62 echo % untracked candidates |
|
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
63 hg -v kwfiles --unknown |
|
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
64 |
| 5816 | 65 echo % addremove |
| 66 hg addremove | |
| 67 echo % status | |
| 68 hg status | |
| 69 | |
| 70 echo % default keyword expansion including commit hook | |
| 71 echo % interrupted commit should not change state or run commit hook | |
|
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5839
diff
changeset
|
72 hg --debug commit |
| 5816 | 73 echo % status |
| 74 hg status | |
| 75 | |
| 76 echo % commit | |
|
8167
6c82beaaa11a
tests: removed redundant "-d '0 0'" from test scripts
Martin Geisler <mg@lazybytes.net>
parents:
7527
diff
changeset
|
77 hg --debug commit -mabsym -u 'User Name <user@example.com>' |
| 5816 | 78 echo % status |
| 79 hg status | |
| 80 echo % identify | |
|
6157
09b00faa8670
keyword: remove "identify" and "remove" from nokwcommands
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6116
diff
changeset
|
81 hg debugrebuildstate |
| 5816 | 82 hg --quiet identify |
| 83 echo % cat | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
84 cat a b |
| 5816 | 85 echo % hg cat |
| 86 hg cat sym a b | |
| 87 | |
| 88 echo | |
| 89 echo % diff a hooktest | |
| 90 diff a hooktest | |
| 91 | |
| 92 echo % removing commit hook from config | |
|
10775
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10125
diff
changeset
|
93 sed -e '/\[hooks\]/,$ d' "$HGRCPATH" > $HGRCPATH.nohook |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10125
diff
changeset
|
94 mv "$HGRCPATH".nohook "$HGRCPATH" |
| 5816 | 95 rm hooktest |
| 96 | |
|
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
97 echo % bundle |
|
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
98 hg bundle --base null ../kw.hg |
|
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
99 |
|
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
100 cd .. |
|
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
101 hg init Test |
|
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
102 cd Test |
|
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
103 |
|
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
104 echo % notify on pull to check whether keywords stay as is in email |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
105 echo % ie. if patch.diff wrapper acts as it should |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
106 |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
107 cat <<EOF >> $HGRCPATH |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
108 [hooks] |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
109 incoming.notify = python:hgext.notify.hook |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
110 [notify] |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
111 sources = pull |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
112 diffstat = False |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
113 [reposubs] |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
114 * = Test |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
115 EOF |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
116 |
|
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
117 echo % pull from bundle |
|
7116
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
6933
diff
changeset
|
118 hg pull -u ../kw.hg 2>&1 | sed -e '/^Content-Type:/,/^diffs (/ d' |
|
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
119 |
|
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
120 echo % remove notify config |
|
10775
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10125
diff
changeset
|
121 sed -e '/\[hooks\]/,$ d' "$HGRCPATH" > $HGRCPATH.nonotify |
|
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10125
diff
changeset
|
122 mv "$HGRCPATH".nonotify "$HGRCPATH" |
|
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
123 |
| 5816 | 124 echo % touch |
| 125 touch a b | |
| 126 echo % status | |
| 127 hg status | |
| 128 | |
| 129 rm sym a b | |
| 130 echo % update | |
|
8742
a964ab624385
merge: allow merging going backwards
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
131 hg update -C |
| 5816 | 132 echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
133 cat a b |
| 5816 | 134 |
|
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
135 echo % check whether expansion is filewise |
|
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
136 echo '$Id$' > c |
|
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
137 echo 'tests for different changenodes' >> c |
|
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
138 echo % commit c |
|
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
139 hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>' |
|
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
140 echo % force expansion |
|
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
141 hg -v kwexpand |
|
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
142 echo % compare changenodes in a c |
|
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
143 cat a c |
|
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
144 |
|
11046
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
145 echo % record |
|
11065
76d6c19aa8ef
keyword: cleanup test and make it portable
Christian Ebert <blacktrash@gmx.net>
parents:
11046
diff
changeset
|
146 python -c \ |
|
76d6c19aa8ef
keyword: cleanup test and make it portable
Christian Ebert <blacktrash@gmx.net>
parents:
11046
diff
changeset
|
147 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);' |
|
11046
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
148 hg record -d '1 10' -m rectest<<EOF |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
149 y |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
150 y |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
151 n |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
152 EOF |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
153 echo |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
154 hg identify |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
155 hg status |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
156 echo % cat modified file |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
157 cat a |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
158 hg diff | grep -v 'b/a' |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
159 hg rollback |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
160 hg update -C |
|
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
161 |
|
10931
75101b1e6302
keyword: replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net>
parents:
10775
diff
changeset
|
162 echo % init --mq |
|
75101b1e6302
keyword: replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net>
parents:
10775
diff
changeset
|
163 hg init --mq |
|
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
164 echo % qimport |
|
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
165 hg qimport -r tip -n mqtest.diff |
|
10931
75101b1e6302
keyword: replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net>
parents:
10775
diff
changeset
|
166 echo % commit --mq |
|
75101b1e6302
keyword: replace deprecated mq commands in test
Christian Ebert <blacktrash@gmx.net>
parents:
10775
diff
changeset
|
167 hg commit --mq -m mqtest |
|
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
168 echo % keywords should not be expanded in patch |
|
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
169 cat .hg/patches/mqtest.diff |
|
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
170 echo % qpop |
|
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
171 hg qpop |
|
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
172 echo % qgoto - should imply qpush |
|
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
173 hg qgoto mqtest.diff |
|
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
174 echo % cat |
|
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
175 cat c |
|
11044
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
176 echo % hg cat |
|
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
177 hg cat c |
|
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
178 echo % keyword should not be expanded in filelog |
|
5ab414f71e87
keyword: remove mq commands from restricted list
Christian Ebert <blacktrash@gmx.net>
parents:
10931
diff
changeset
|
179 hg --config 'extensions.keyword=!' cat c |
|
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
180 echo % qpop and move on |
|
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
181 hg qpop |
|
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
182 |
| 5816 | 183 echo % copy |
| 184 hg cp a c | |
| 185 | |
| 186 echo % kwfiles added | |
| 187 hg kwfiles | |
| 188 | |
| 189 echo % commit | |
| 190 hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' | |
| 191 echo % cat a c | |
| 192 cat a c | |
|
6328
991f7518c3f3
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com>
parents:
6157
diff
changeset
|
193 echo % touch copied c |
| 5816 | 194 touch c |
| 195 echo % status | |
| 196 hg status | |
| 197 | |
| 198 echo % kwfiles | |
| 199 hg kwfiles | |
|
9493
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
200 echo % ignored files |
|
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
201 hg -v kwfiles --ignore |
|
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
202 echo % all files |
|
fe1ecd15c6bd
keyword: make kwfiles -u show untracked files only (like status)
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
203 hg kwfiles --all |
| 5816 | 204 |
| 205 echo % diff --rev | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
206 hg diff --rev 1 | grep -v 'b/c' |
| 5816 | 207 |
| 208 echo % rollback | |
| 209 hg rollback | |
| 210 echo % status | |
| 211 hg status | |
| 212 echo % update -C | |
| 213 hg update --clean | |
| 214 | |
| 215 echo % custom keyword expansion | |
| 216 echo % try with kwdemo | |
| 217 hg --quiet kwdemo "Xinfo = {author}: {desc}" | |
| 218 | |
| 219 cat <<EOF >>$HGRCPATH | |
| 220 [keywordmaps] | |
| 221 Id = {file} {node|short} {date|rfc822date} {author|user} | |
| 222 Xinfo = {author}: {desc} | |
| 223 EOF | |
| 224 | |
| 225 echo % cat | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
226 cat a b |
| 5816 | 227 echo % hg cat |
| 228 hg cat sym a b | |
| 229 | |
| 230 echo | |
| 231 echo '$Xinfo$' >> a | |
| 232 cat <<EOF >> log | |
| 233 firstline | |
| 234 secondline | |
| 235 EOF | |
| 236 | |
| 237 echo % interrupted commit should not change state | |
|
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5839
diff
changeset
|
238 hg commit |
| 5816 | 239 echo % status |
| 240 hg status | |
| 241 | |
| 242 echo % commit | |
| 243 hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' | |
| 244 rm log | |
| 245 echo % status | |
| 246 hg status | |
|
6867
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
247 echo % verify |
|
e64f5abb8a88
keyword: add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net>
parents:
6667
diff
changeset
|
248 hg verify |
| 5816 | 249 |
| 250 echo % cat | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
251 cat a b |
| 5816 | 252 echo % hg cat |
| 253 hg cat sym a b | |
| 254 echo | |
|
6667
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
255 echo % annotate |
|
01e95d4bc66c
keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net>
parents:
6354
diff
changeset
|
256 hg annotate a |
| 5816 | 257 |
| 258 echo % remove | |
|
6157
09b00faa8670
keyword: remove "identify" and "remove" from nokwcommands
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
6116
diff
changeset
|
259 hg debugrebuildstate |
| 5816 | 260 hg remove a |
| 261 hg --debug commit -m rma | |
| 262 echo % status | |
| 263 hg status | |
| 264 echo % rollback | |
| 265 hg rollback | |
| 266 echo % status | |
| 267 hg status | |
| 268 echo % revert a | |
| 269 hg revert --no-backup --rev tip a | |
| 270 echo % cat a | |
| 271 cat a | |
| 272 | |
| 273 echo % clone to test incoming | |
| 274 cd .. | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
275 hg clone -r1 Test Test-a |
| 5816 | 276 cd Test-a |
| 277 cat <<EOF >> .hg/hgrc | |
| 278 [paths] | |
| 279 default = ../Test | |
| 280 EOF | |
| 281 echo % incoming | |
| 282 # remove path to temp dir | |
| 283 hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/' | |
| 284 | |
|
5839
59fba5caa94b
Don't use the -i option with sed
Will Maier <willmaier@ml1.net>
parents:
5816
diff
changeset
|
285 sed -e 's/Id.*/& rejecttest/' a > a.new |
|
59fba5caa94b
Don't use the -i option with sed
Will Maier <willmaier@ml1.net>
parents:
5816
diff
changeset
|
286 mv a.new a |
| 5816 | 287 echo % commit rejecttest |
| 288 hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' | |
| 289 echo % export | |
| 290 hg export -o ../rejecttest.diff tip | |
| 291 | |
| 292 cd ../Test | |
| 293 echo % import | |
| 294 hg import ../rejecttest.diff | |
| 295 echo % cat | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
296 cat a b |
| 5816 | 297 echo |
| 298 echo % rollback | |
| 299 hg rollback | |
| 300 echo % clean update | |
| 301 hg update --clean | |
| 302 | |
| 303 echo % kwexpand/kwshrink on selected files | |
| 304 mkdir x | |
| 305 echo % copy a x/a | |
| 306 hg copy a x/a | |
| 307 echo % kwexpand a | |
| 308 hg --verbose kwexpand a | |
| 309 echo % kwexpand x/a should abort | |
| 310 hg --verbose kwexpand x/a | |
| 311 cd x | |
| 312 hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' | |
| 313 echo % cat a | |
| 314 cat a | |
| 315 echo % kwshrink a inside directory x | |
| 316 hg --verbose kwshrink a | |
| 317 echo % cat a | |
| 318 cat a | |
|
5855
a6ccb957fd07
Solaris compatibility fixes for test-keyword:
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5839
diff
changeset
|
319 cd .. |
| 5816 | 320 |
| 321 echo % kwexpand nonexistent | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
322 hg kwexpand nonexistent 2>&1 | sed 's/nonexistent:.*/nonexistent:/' |
| 5816 | 323 |
|
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
324 echo % hg serve |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
325 hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
326 cat hg.pid >> $DAEMON_PIDS |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
327 echo % expansion |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
328 echo % hgweb file |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
329 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw') |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
330 echo % no expansion |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
331 echo % hgweb annotate |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
332 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw') |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
333 echo % hgweb changeset |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
334 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw') |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
335 echo % hgweb filediff |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
336 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw') |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
337 echo % errors encountered |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
338 cat errors.log |
|
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
339 |
|
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
340 echo % merge/resolve |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
341 echo '$Id$' > m |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
342 hg add m |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
343 hg commit -m 4kw |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
344 echo foo >> m |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
345 hg commit -m 5foo |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
346 echo % simplemerge |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
347 hg update 4 |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
348 echo foo >> m |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
349 hg commit -m 6foo |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
350 hg merge |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
351 hg commit -m simplemerge |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
352 cat m |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
353 echo % conflict |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
354 hg update 4 |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
355 echo bar >> m |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
356 hg commit -m 8bar |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
357 hg merge |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
358 echo % keyword stays outside conflict zone |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
359 cat m |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
360 echo % resolve to local |
|
7527
5a14a8f3b909
resolve: require -a switch to resolve all files
Matt Mackall <mpm@selenic.com>
parents:
7116
diff
changeset
|
361 HGMERGE=internal:local hg resolve -a |
|
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
362 hg commit -m localresolve |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
363 cat m |
|
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
364 |
|
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
365 echo % test restricted mode with transplant -b |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
366 hg update 6 |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
367 hg branch foo |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
368 mv a a.bak |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
369 echo foobranch > a |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
370 cat a.bak >> a |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
371 rm a.bak |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
372 hg commit -m 9foobranch |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
373 hg update default |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
374 hg -y transplant -b foo tip |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
375 echo % no expansion in changeset |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
376 hg tip -p |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
377 echo % expansion in file |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
378 head -n 2 a |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
379 hg -q rollback |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
380 hg -q update -C |
|
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
381 |
| 5816 | 382 echo % switch off expansion |
| 383 echo % kwshrink with unknown file u | |
| 384 cp a u | |
| 385 hg --verbose kwshrink | |
| 386 echo % cat | |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
387 cat a b |
| 5816 | 388 echo % hg cat |
| 389 hg cat sym a b | |
| 390 echo | |
|
10775
c52057614c72
Tests with spaces in paths
Mads Kiilerich <mads@kiilerich.com>
parents:
10125
diff
changeset
|
391 rm "$HGRCPATH" |
| 5816 | 392 echo % cat |
|
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
393 cat a b |
| 5816 | 394 echo % hg cat |
| 395 hg cat sym a b | |
| 396 echo |