author | Brodie Rao <brodie@bitheap.org> |
Wed, 22 Sep 2010 16:05:58 -0500 | |
branch | stable |
changeset 797 | f0d8ac85ca21 |
parent 793 | 9cc90e2c826f |
child 800 | c4211177a2fc |
permissions | -rw-r--r-- |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1 |
$ cat <<EOF >> $HGRCPATH |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
2 |
> [extensions] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
3 |
> keyword = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
4 |
> mq = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
5 |
> notify = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
6 |
> record = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
7 |
> transplant = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
8 |
> [ui] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
9 |
> interactive = true |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
10 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
11 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
12 |
Run kwdemo before [keyword] files are set up |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
13 |
as it would succeed without uisetup otherwise |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
14 |
|
784
7e69e2b40d9b
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
782
diff
changeset
|
15 |
$ hg --quiet kwdemo |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
16 |
[extensions] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
17 |
keyword = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
18 |
[keyword] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
19 |
demo.txt = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
20 |
[keywordmaps] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
21 |
Author = {author|user} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
22 |
Date = {date|utcdate} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
23 |
Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
24 |
Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
25 |
RCSFile = {file|basename},v |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
26 |
RCSfile = {file|basename},v |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
27 |
Revision = {node|short} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
28 |
Source = {root}/{file},v |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
29 |
$Author: test $ |
784
7e69e2b40d9b
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
782
diff
changeset
|
30 |
\$Date: ..../../.. ..:..:.. \$ |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
31 |
\$Header: .*/demo\.txt,v ............ ..../../.. ..:..:.. test \$ |
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
32 |
\$Id: demo\.txt,v ............ ..../../.. ..:..:.. test \$ |
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
33 |
$RCSFile: demo.txt,v $ |
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
34 |
$RCSfile: demo.txt,v $ |
784
7e69e2b40d9b
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
782
diff
changeset
|
35 |
\$Revision: ............ \$ |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
36 |
\$Source: .*/demo\.txt,v \$ |
643
0c7f033354c7
test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
634
diff
changeset
|
37 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
38 |
$ hg --quiet kwdemo "Branch = {branches}" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
39 |
[extensions] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
40 |
keyword = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
41 |
[keyword] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
42 |
demo.txt = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
43 |
[keywordmaps] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
44 |
Branch = {branches} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
45 |
$Branch: demobranch $ |
643
0c7f033354c7
test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
634
diff
changeset
|
46 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
47 |
$ cat <<EOF >> $HGRCPATH |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
48 |
> [keyword] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
49 |
> ** = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
50 |
> b = ignore |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
51 |
> [hooks] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
52 |
> commit= |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
53 |
> commit.test=cp a hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
54 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
55 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
56 |
$ hg init Test-bndl |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
57 |
$ cd Test-bndl |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
58 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
59 |
kwshrink should exit silently in empty/invalid repo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
60 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
61 |
$ hg kwshrink |
643
0c7f033354c7
test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
634
diff
changeset
|
62 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
63 |
Symlinks cannot be created on Windows. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
64 |
A bundle to test this was made with: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
65 |
hg init t |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
66 |
cd t |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
67 |
echo a > a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
68 |
ln -s a sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
69 |
hg add sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
70 |
hg ci -m addsym -u mercurial |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
71 |
hg bundle --base null ../test-keyword.hg |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
72 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
73 |
$ hg pull -u "$TESTDIR"/test-keyword.hg |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
74 |
pulling from .*test-keyword\.hg |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
75 |
requesting all changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
76 |
adding changesets |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
77 |
adding manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
78 |
adding file changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
79 |
added 1 changesets with 1 changes to 1 files |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
80 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
81 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
82 |
$ echo 'expand $Id$' > a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
83 |
$ echo 'do not process $Id:' >> a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
84 |
$ echo 'xxx $' >> a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
85 |
$ echo 'ignore $Id$' > b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
86 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
87 |
Output files as they were created |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
88 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
89 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
90 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
91 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
92 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
93 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
94 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
95 |
no kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
96 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
97 |
$ hg kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
98 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
99 |
untracked candidates |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
100 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
101 |
$ hg -v kwfiles --unknown |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
102 |
k a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
103 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
104 |
Add files and check status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
105 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
106 |
$ hg addremove |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
107 |
adding a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
108 |
adding b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
109 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
110 |
A a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
111 |
A b |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
112 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
113 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
114 |
Default keyword expansion including commit hook |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
115 |
Interrupted commit should not change state or run commit hook |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
116 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
117 |
$ hg --debug commit |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
118 |
abort: empty commit message |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
792
diff
changeset
|
119 |
[255] |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
120 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
121 |
A a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
122 |
A b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
123 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
124 |
Commit with several checks |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
125 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
126 |
$ hg --debug commit -mabsym -u 'User Name <user@example.com>' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
127 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
128 |
b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
129 |
overwriting a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
130 |
running hook commit.test: cp a hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
131 |
committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
132 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
133 |
? hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
134 |
$ hg debugrebuildstate |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
135 |
$ hg --quiet identify |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
136 |
ef63ca68695b |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
137 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
138 |
cat files in working directory with keywords expanded |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
139 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
140 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
141 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
142 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
143 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
144 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
145 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
146 |
hg cat files and symlink, no expansion |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
147 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
148 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
149 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
150 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
151 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
152 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
153 |
a.* |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
154 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
155 |
Test hook execution |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
156 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
157 |
$ diff a hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
158 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
159 |
Removing commit hook from config |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
160 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
161 |
$ sed -e '/\[hooks\]/,$ d' "$HGRCPATH" > $HGRCPATH.nohook |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
162 |
$ mv "$HGRCPATH".nohook "$HGRCPATH" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
163 |
$ rm hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
164 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
165 |
bundle |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
166 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
167 |
$ hg bundle --base null ../kw.hg |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
168 |
2 changesets found |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
169 |
$ cd .. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
170 |
$ hg init Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
171 |
$ cd Test |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
172 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
173 |
Notify on pull to check whether keywords stay as is in email |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
174 |
ie. if patch.diff wrapper acts as it should |
294 | 175 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
176 |
$ cat <<EOF >> $HGRCPATH |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
177 |
> [hooks] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
178 |
> incoming.notify = python:hgext.notify.hook |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
179 |
> [notify] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
180 |
> sources = pull |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
181 |
> diffstat = False |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
182 |
> [reposubs] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
183 |
> * = Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
184 |
> EOF |
294 | 185 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
186 |
Pull from bundle and trigger notify |
384
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
187 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
188 |
$ hg pull -u ../kw.hg |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
189 |
pulling from ../kw.hg |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
190 |
requesting all changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
191 |
adding changesets |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
192 |
adding manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
193 |
adding file changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
194 |
added 2 changesets with 3 changes to 3 files |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
195 |
Content-Type: text/plain; charset="us-ascii" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
196 |
MIME-Version: 1.0 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
197 |
Content-Transfer-Encoding: 7bit |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
198 |
Date: .* |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
199 |
Subject: changeset in .* |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
200 |
From: mercurial |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
201 |
X-Hg-Notification: changeset a2392c293916 |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
202 |
Message-Id: <hg\.a2392c293916.*> |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
203 |
To: Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
204 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
205 |
changeset a2392c293916 in .* |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
206 |
details: .*\?cmd=changeset;node=a2392c293916 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
207 |
description: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
208 |
addsym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
209 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
210 |
diffs (6 lines): |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
211 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
212 |
diff -r 000000000000 -r a2392c293916 sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
213 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
214 |
+++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
215 |
@@ -0,0 +1,1 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
216 |
+a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
217 |
\ No newline at end of file |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
218 |
Content-Type: text/plain; charset="us-ascii" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
219 |
MIME-Version: 1.0 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
220 |
Content-Transfer-Encoding: 7bit |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
221 |
Date:.* |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
222 |
Subject: changeset in.* |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
223 |
From: User Name <user@example.com> |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
224 |
X-Hg-Notification: changeset ef63ca68695b |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
225 |
Message-Id: <hg\.ef63ca68695b.*> |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
226 |
To: Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
227 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
228 |
changeset ef63ca68695b in .* |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
229 |
details: .*\?cmd=changeset;node=ef63ca68695b |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
230 |
description: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
231 |
absym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
232 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
233 |
diffs (12 lines): |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
234 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
235 |
diff -r a2392c293916 -r ef63ca68695b a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
236 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
237 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
238 |
@@ -0,0 +1,3 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
239 |
+expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
240 |
+do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
241 |
+xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
242 |
diff -r a2392c293916 -r ef63ca68695b b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
243 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
244 |
+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
245 |
@@ -0,0 +1,1 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
246 |
+ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
247 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
409
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
248 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
249 |
Remove notify config |
409
6e2293f7b9f7
Add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
392
diff
changeset
|
250 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
251 |
$ sed -e '/\[hooks\]/,$ d' "$HGRCPATH" > $HGRCPATH.nonotify |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
252 |
$ mv "$HGRCPATH".nonotify "$HGRCPATH" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
253 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
254 |
Touch files and check with status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
255 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
256 |
$ touch a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
257 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
258 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
259 |
Update and expand |
384
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
260 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
261 |
$ rm sym a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
262 |
$ hg update -C |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
263 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
264 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
265 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
266 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
267 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
268 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
269 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
270 |
Check whether expansion is filewise |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
271 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
272 |
$ echo '$Id$' > c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
273 |
$ echo 'tests for different changenodes' >> c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
274 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
275 |
commit file c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
276 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
277 |
$ hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
278 |
adding c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
279 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
280 |
force expansion |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
281 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
282 |
$ hg -v kwexpand |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
283 |
overwriting a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
284 |
overwriting c expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
285 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
286 |
compare changenodes in a and c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
287 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
288 |
$ cat a c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
289 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
290 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
291 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
292 |
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
293 |
tests for different changenodes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
294 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
295 |
record chunk |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
296 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
297 |
$ python -c \ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
298 |
> 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
299 |
$ hg record -d '1 10' -m rectest<<EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
300 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
301 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
302 |
> n |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
303 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
304 |
diff --git a/a b/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
305 |
2 hunks, 2 lines changed |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
306 |
examine changes to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
307 |
@@ -1,3 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
308 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
309 |
+foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
310 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
311 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
312 |
record change 1/2 to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
313 |
@@ -2,2 +3,3 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
314 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
315 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
316 |
+bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
317 |
record change 2/2 to 'a'? [Ynsfdaq?] |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
338
diff
changeset
|
318 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
319 |
$ hg identify |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
320 |
d17e03c92c97+ tip |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
321 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
322 |
M a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
323 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
324 |
Cat modified file a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
325 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
326 |
$ cat a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
327 |
expand $Id: a,v d17e03c92c97 1970/01/01 00:00:01 test $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
328 |
foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
329 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
330 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
331 |
bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
332 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
333 |
Diff remaining chunk |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
334 |
|
786
5a41673d33fb
test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
784
diff
changeset
|
335 |
$ hg diff |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
336 |
diff -r d17e03c92c97 a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
337 |
--- a/a Wed Dec 31 23:59:51 1969 -0000 |
786
5a41673d33fb
test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
784
diff
changeset
|
338 |
\+\+\+ b/a .* |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
339 |
@@ -2,3 +2,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
340 |
foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
341 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
342 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
343 |
+bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
344 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
345 |
$ hg rollback |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
346 |
rolling back to revision 2 (undo commit) |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
347 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
348 |
Record all chunks in file a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
349 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
350 |
$ echo foo > msg |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
351 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
352 |
- do not use "hg record -m" here! |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
353 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
354 |
$ hg record -l msg -d '1 11'<<EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
355 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
356 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
357 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
358 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
359 |
diff --git a/a b/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
360 |
2 hunks, 2 lines changed |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
361 |
examine changes to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
362 |
@@ -1,3 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
363 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
364 |
+foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
365 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
366 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
367 |
record change 1/2 to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
368 |
@@ -2,2 +3,3 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
369 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
370 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
371 |
+bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
372 |
record change 2/2 to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
373 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
374 |
File a should be clean |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
375 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
376 |
$ hg status -A a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
377 |
C a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
378 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
379 |
$ rm msg |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
380 |
$ hg rollback |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
381 |
rolling back to revision 2 (undo commit) |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
382 |
$ hg update -C |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
383 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
384 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
385 |
Test patch queue repo |
765
c5badbf855db
Force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
743
diff
changeset
|
386 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
387 |
$ hg init --mq |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
388 |
$ hg qimport -r tip -n mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
389 |
$ hg commit --mq -m mqtest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
390 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
391 |
Keywords should not be expanded in patch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
392 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
393 |
$ cat .hg/patches/mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
394 |
# HG changeset patch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
395 |
# User User Name <user@example.com> |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
396 |
# Date 1 0 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
397 |
# Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
398 |
# Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
399 |
cndiff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
400 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
401 |
diff -r ef63ca68695b -r 40a904bbbe4c c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
402 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
403 |
+++ b/c Thu Jan 01 00:00:01 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
404 |
@@ -0,0 +1,2 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
405 |
+$Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
406 |
+tests for different changenodes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
407 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
408 |
$ hg qpop |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
409 |
popping mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
410 |
patch queue now empty |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
411 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
412 |
qgoto, implying qpush, should expand |
737 | 413 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
414 |
$ hg qgoto mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
415 |
applying mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
416 |
now at: mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
417 |
$ cat c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
418 |
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
419 |
tests for different changenodes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
420 |
$ hg cat c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
421 |
$Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
422 |
tests for different changenodes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
423 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
424 |
Keywords should not be expanded in filelog |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
425 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
426 |
$ hg --config 'extensions.keyword=!' cat c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
427 |
$Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
428 |
tests for different changenodes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
429 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
430 |
qpop and move on |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
431 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
432 |
$ hg qpop |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
433 |
popping mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
434 |
patch queue now empty |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
333
diff
changeset
|
435 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
436 |
Copy and show added kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
437 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
438 |
$ hg cp a c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
439 |
$ hg kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
440 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
441 |
c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
442 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
443 |
Commit and show expansion in original and copy |
259
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
257
diff
changeset
|
444 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
445 |
$ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
446 |
c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
447 |
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
448 |
overwriting c expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
449 |
committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
450 |
$ cat a c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
451 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
452 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
453 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
454 |
expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
455 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
456 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
457 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
458 |
Touch copied c and check its status |
259
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
257
diff
changeset
|
459 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
460 |
$ touch c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
461 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
462 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
463 |
Test different options of hg kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
464 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
465 |
$ hg kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
466 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
467 |
c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
468 |
$ hg -v kwfiles --ignore |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
469 |
I b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
470 |
I sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
471 |
$ hg kwfiles --all |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
472 |
K a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
473 |
K c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
474 |
I b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
475 |
I sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
476 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
477 |
Diff specific revision |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
478 |
|
786
5a41673d33fb
test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
784
diff
changeset
|
479 |
$ hg diff --rev 1 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
480 |
diff -r ef63ca68695b c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
481 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
786
5a41673d33fb
test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
784
diff
changeset
|
482 |
\+\+\+ b/c .* |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
483 |
@@ -0,0 +1,3 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
484 |
+expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
485 |
+do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
486 |
+xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
487 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
488 |
Status after rollback: |
247 | 489 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
490 |
$ hg rollback |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
491 |
rolling back to revision 1 (undo commit) |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
492 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
493 |
A c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
494 |
$ hg update --clean |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
495 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
496 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
497 |
Custom keywordmaps as argument to kwdemo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
498 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
499 |
$ hg --quiet kwdemo "Xinfo = {author}: {desc}" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
500 |
[extensions] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
501 |
keyword = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
502 |
[keyword] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
503 |
** = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
504 |
b = ignore |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
505 |
demo.txt = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
506 |
[keywordmaps] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
507 |
Xinfo = {author}: {desc} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
508 |
$Xinfo: test: hg keyword configuration and expansion example $ |
224
fd98a9bffcbe
Test "hg diff --rev", update _getcmd comment (backwards compatibility)
Christian Ebert <blacktrash@gmx.net>
parents:
223
diff
changeset
|
509 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
510 |
Configure custom keywordmaps |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
511 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
512 |
$ cat <<EOF >>$HGRCPATH |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
513 |
> [keywordmaps] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
514 |
> Id = {file} {node|short} {date|rfc822date} {author|user} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
515 |
> Xinfo = {author}: {desc} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
516 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
517 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
518 |
Cat and hg cat files before custom expansion |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
519 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
520 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
521 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
522 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
523 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
524 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
525 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
526 |
expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
527 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
528 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
529 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
530 |
a.* |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
531 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
532 |
Write custom keyword and prepare multiline commit message |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
533 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
534 |
$ echo '$Xinfo$' >> a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
535 |
$ cat <<EOF >> log |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
536 |
> firstline |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
537 |
> secondline |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
538 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
539 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
540 |
Interrupted commit should not change state |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
541 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
542 |
$ hg commit |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
543 |
abort: empty commit message |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
792
diff
changeset
|
544 |
[255] |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
545 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
546 |
M a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
547 |
? c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
548 |
? log |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
549 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
550 |
Commit with multiline message and custom expansion |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
551 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
552 |
$ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
553 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
554 |
overwriting a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
555 |
committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
556 |
$ rm log |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
557 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
558 |
Stat, verify and show custom expansion (firstline) |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
559 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
560 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
561 |
? c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
562 |
$ hg verify |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
563 |
checking changesets |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
564 |
checking manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
565 |
crosschecking files in changesets and manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
566 |
checking files |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
567 |
3 files, 3 changesets, 4 total revisions |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
568 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
569 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
570 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
571 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
572 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
573 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
574 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
575 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
576 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
577 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
578 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
579 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
580 |
a.* |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
581 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
582 |
annotate |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
583 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
584 |
$ hg annotate a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
585 |
1: expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
586 |
1: do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
587 |
1: xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
588 |
2: $Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
589 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
590 |
remove with status checks |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
591 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
592 |
$ hg debugrebuildstate |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
593 |
$ hg remove a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
594 |
$ hg --debug commit -m rma |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
595 |
committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
596 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
597 |
? c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
598 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
599 |
Rollback, revert, and check expansion |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
600 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
601 |
$ hg rollback |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
602 |
rolling back to revision 2 (undo commit) |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
603 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
604 |
R a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
605 |
? c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
606 |
$ hg revert --no-backup --rev tip a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
607 |
$ cat a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
608 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
609 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
610 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
611 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
612 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
613 |
Clone to test global and local configurations |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
614 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
615 |
$ cd .. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
616 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
617 |
Expansion in destinaton with global configuration |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
618 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
619 |
$ hg --quiet clone Test globalconf |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
620 |
$ cat globalconf/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
621 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
622 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
623 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
624 |
$Xinfo: User Name <user@example.com>: firstline $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
625 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
626 |
No expansion in destination with local configuration in origin only |
215 | 627 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
628 |
$ hg --quiet --config 'keyword.**=ignore' clone Test localconf |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
629 |
$ cat localconf/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
630 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
631 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
632 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
633 |
$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
634 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
635 |
Clone to test incoming |
773
9f939fae8ff3
Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
765
diff
changeset
|
636 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
637 |
$ hg clone -r1 Test Test-a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
638 |
requesting all changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
639 |
adding changesets |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
640 |
adding manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
641 |
adding file changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
642 |
added 2 changesets with 3 changes to 3 files |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
643 |
updating to branch default |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
644 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
645 |
$ cd Test-a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
646 |
$ cat <<EOF >> .hg/hgrc |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
647 |
> [paths] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
648 |
> default = ../Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
649 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
650 |
$ hg incoming |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
651 |
comparing with .*test-keyword\.t/Test |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
652 |
searching for changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
653 |
changeset: 2:bb948857c743 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
654 |
tag: tip |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
655 |
user: User Name <user@example.com> |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
656 |
date: Thu Jan 01 00:00:02 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
657 |
summary: firstline |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
658 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
659 |
Imported patch should not be rejected |
773
9f939fae8ff3
Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
765
diff
changeset
|
660 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
661 |
$ sed -e 's/Id.*/& rejecttest/' a > a.new |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
662 |
$ mv a.new a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
663 |
$ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
664 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
665 |
overwriting a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
666 |
committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
667 |
$ hg export -o ../rejecttest.diff tip |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
668 |
$ cd ../Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
669 |
$ hg import ../rejecttest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
670 |
applying ../rejecttest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
671 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
672 |
expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
673 |
do not process $Id: rejecttest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
674 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
675 |
$Xinfo: User Name <user@example.com>: rejects? $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
676 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
677 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
678 |
$ hg rollback |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
679 |
rolling back to revision 2 (undo commit) |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
680 |
$ hg update --clean |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
681 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
682 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
683 |
kwexpand/kwshrink on selected files |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
684 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
685 |
$ mkdir x |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
686 |
$ hg copy a x/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
687 |
$ hg --verbose kwexpand a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
688 |
overwriting a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
689 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
690 |
kwexpand x/a should abort |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
691 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
692 |
$ hg --verbose kwexpand x/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
693 |
abort: outstanding uncommitted changes |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
792
diff
changeset
|
694 |
[255] |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
695 |
$ cd x |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
696 |
$ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
697 |
x/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
698 |
x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
699 |
overwriting x/a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
700 |
committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
701 |
$ cat a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
702 |
expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
703 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
704 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
705 |
$Xinfo: User Name <user@example.com>: xa $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
706 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
707 |
kwshrink a inside directory x |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
708 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
709 |
$ hg --verbose kwshrink a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
710 |
overwriting x/a shrinking keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
711 |
$ cat a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
712 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
713 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
714 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
715 |
$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
716 |
$ cd .. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
717 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
718 |
kwexpand nonexistent |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
719 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
720 |
$ hg kwexpand nonexistent |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
721 |
nonexistent:.* |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
722 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
723 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
724 |
hg serve |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
725 |
- expand with hgweb file |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
726 |
- no expansion with hgweb annotate/changeset/filediff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
727 |
- check errors |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
728 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
729 |
$ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
730 |
$ cat hg.pid >> $DAEMON_PIDS |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
731 |
$ $TESTDIR/get-with-headers.py localhost:$HGPORT '/file/tip/a/?style=raw' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
732 |
200 Script output follows |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
733 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
734 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
735 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
736 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
737 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
738 |
$ $TESTDIR/get-with-headers.py localhost:$HGPORT '/annotate/tip/a/?style=raw' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
739 |
200 Script output follows |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
740 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
741 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
742 |
user@1: expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
743 |
user@1: do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
744 |
user@1: xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
745 |
user@2: $Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
746 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
747 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
748 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
749 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
750 |
$ $TESTDIR/get-with-headers.py localhost:$HGPORT '/rev/tip/?style=raw' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
751 |
200 Script output follows |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
752 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
753 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
754 |
# HG changeset patch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
755 |
# User User Name <user@example.com> |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
756 |
# Date 3 0 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
757 |
# Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
758 |
# Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
759 |
xa |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
760 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
761 |
diff -r bb948857c743 -r b4560182a3f9 x/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
762 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
763 |
+++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
764 |
@@ -0,0 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
765 |
+expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
766 |
+do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
767 |
+xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
768 |
+$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
769 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
770 |
$ $TESTDIR/get-with-headers.py localhost:$HGPORT '/diff/bb948857c743/a?style=raw' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
771 |
200 Script output follows |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
772 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
773 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
774 |
diff -r ef63ca68695b -r bb948857c743 a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
775 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
776 |
+++ b/a Thu Jan 01 00:00:02 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
777 |
@@ -1,3 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
778 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
779 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
780 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
781 |
+$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
782 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
783 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
784 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
785 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
786 |
$ cat errors.log |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
787 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
788 |
Prepare merge and resolve tests |
279
1f00dce8de12
Test if warning about non-existing files is triggered
Christian Ebert <blacktrash@gmx.net>
parents:
267
diff
changeset
|
789 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
790 |
$ echo '$Id$' > m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
791 |
$ hg add m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
792 |
$ hg commit -m 4kw |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
793 |
$ echo foo >> m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
794 |
$ hg commit -m 5foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
795 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
796 |
simplemerge |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
797 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
798 |
$ hg update 4 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
799 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
800 |
$ echo foo >> m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
801 |
$ hg commit -m 6foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
802 |
created new head |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
803 |
$ hg merge |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
804 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
805 |
(branch merge, don't forget to commit) |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
806 |
$ hg commit -m simplemerge |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
807 |
$ cat m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
808 |
$Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
809 |
foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
810 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
811 |
conflict: keyword should stay outside conflict zone |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
812 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
813 |
$ hg update 4 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
814 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
815 |
$ echo bar >> m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
816 |
$ hg commit -m 8bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
817 |
created new head |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
818 |
$ hg merge |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
819 |
merging m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
820 |
warning: conflicts during merge. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
821 |
merging m failed! |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
822 |
0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
792
b87861f57222
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
786
diff
changeset
|
823 |
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
792
diff
changeset
|
824 |
[1] |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
825 |
$ cat m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
826 |
$Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
827 |
<<<<<<< local |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
828 |
bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
829 |
======= |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
830 |
foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
831 |
>>>>>>> other |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
832 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
833 |
resolve to local |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
834 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
835 |
$ HGMERGE=internal:local hg resolve -a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
836 |
$ hg commit -m localresolve |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
837 |
$ cat m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
838 |
$Id: m 41efa6d38e9b Thu, 01 Jan 1970 00:00:00 +0000 test $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
839 |
bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
840 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
841 |
Test restricted mode with transplant -b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
842 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
843 |
$ hg update 6 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
844 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
845 |
$ hg branch foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
846 |
marked working directory as branch foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
847 |
$ mv a a.bak |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
848 |
$ echo foobranch > a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
849 |
$ cat a.bak >> a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
850 |
$ rm a.bak |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
851 |
$ hg commit -m 9foobranch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
852 |
$ hg update default |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
853 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
854 |
$ hg -y transplant -b foo tip |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
855 |
applying 4aa30d025d50 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
856 |
4aa30d025d50 transplanted to 5a4da427c162 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
857 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
858 |
Expansion in changeset but not in file |
485
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
859 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
860 |
$ hg tip -p |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
861 |
changeset: 11:5a4da427c162 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
862 |
tag: tip |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
863 |
parent: 9:41efa6d38e9b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
864 |
user: test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
865 |
date: Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
866 |
summary: 9foobranch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
867 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
868 |
diff -r 41efa6d38e9b -r 5a4da427c162 a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
869 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
870 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
871 |
@@ -1,3 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
872 |
+foobranch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
873 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
874 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
875 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
876 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
877 |
$ head -n 2 a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
878 |
foobranch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
879 |
expand $Id: a 5a4da427c162 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
880 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
881 |
Switch of expansion |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
882 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
883 |
$ hg -q rollback |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
884 |
$ hg -q update -C |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
885 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
886 |
kwshrink with unknown file u |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
887 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
888 |
$ cp a u |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
889 |
$ hg --verbose kwshrink |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
890 |
overwriting a shrinking keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
891 |
overwriting m shrinking keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
892 |
overwriting x/a shrinking keywords |
668
13a6a2c0440f
Go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
653
diff
changeset
|
893 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
894 |
Keywords shrunk in working directory, but not yet disabled |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
895 |
- cat shows unexpanded keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
896 |
- hg cat shows expanded keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
897 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
898 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
899 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
900 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
901 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
902 |
$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
903 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
904 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
905 |
expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
906 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
907 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
908 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
909 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
910 |
a.* |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
911 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
912 |
Now disable keyword expansion |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
913 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
914 |
$ rm "$HGRCPATH" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
915 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
916 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
917 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
918 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
919 |
$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
920 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
921 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
922 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
923 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
924 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
925 |
$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
926 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
927 |
a.* |