author | Christian Ebert <blacktrash@gmx.net> |
Sat, 10 Sep 2011 13:23:41 +0100 | |
changeset 982 | 639bb4617c70 |
parent 981 | 0b32ba113ad2 |
child 985 | d60568a69465 |
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 = |
874
272a8a316f7a
Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
868
diff
changeset
|
20 |
[keywordset] |
272a8a316f7a
Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
868
diff
changeset
|
21 |
svn = False |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
22 |
[keywordmaps] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
23 |
Author = {author|user} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
24 |
Date = {date|utcdate} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
25 |
Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
26 |
Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
27 |
RCSFile = {file|basename},v |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
28 |
RCSfile = {file|basename},v |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
29 |
Revision = {node|short} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
30 |
Source = {root}/{file},v |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
31 |
$Author: test $ |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
32 |
$Date: ????/??/?? ??:??:?? $ (glob) |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
33 |
$Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob) |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
34 |
$Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob) |
797
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
35 |
$RCSFile: demo.txt,v $ |
f0d8ac85ca21
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
793
diff
changeset
|
36 |
$RCSfile: demo.txt,v $ |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
37 |
$Revision: ???????????? $ (glob) |
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
38 |
$Source: */demo.txt,v $ (glob) |
643
0c7f033354c7
test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
634
diff
changeset
|
39 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
40 |
$ hg --quiet kwdemo "Branch = {branches}" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
41 |
[extensions] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
42 |
keyword = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
43 |
[keyword] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
44 |
demo.txt = |
874
272a8a316f7a
Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
868
diff
changeset
|
45 |
[keywordset] |
272a8a316f7a
Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
868
diff
changeset
|
46 |
svn = False |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
47 |
[keywordmaps] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
48 |
Branch = {branches} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
49 |
$Branch: demobranch $ |
643
0c7f033354c7
test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
634
diff
changeset
|
50 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
51 |
$ cat <<EOF >> $HGRCPATH |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
52 |
> [keyword] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
53 |
> ** = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
54 |
> b = ignore |
814
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
55 |
> i = ignore |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
56 |
> [hooks] |
817
cd834b4035ec
test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
814
diff
changeset
|
57 |
> EOF |
cd834b4035ec
test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
814
diff
changeset
|
58 |
$ cp $HGRCPATH $HGRCPATH.nohooks |
cd834b4035ec
test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
814
diff
changeset
|
59 |
> cat <<EOF >> $HGRCPATH |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
60 |
> commit= |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
61 |
> commit.test=cp a hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
62 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
63 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
64 |
$ hg init Test-bndl |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
65 |
$ cd Test-bndl |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
66 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
67 |
kwshrink should exit silently in empty/invalid repo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
68 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
69 |
$ hg kwshrink |
643
0c7f033354c7
test: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
634
diff
changeset
|
70 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
71 |
Symlinks cannot be created on Windows. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
72 |
A bundle to test this was made with: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
73 |
hg init t |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
74 |
cd t |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
75 |
echo a > a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
76 |
ln -s a sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
77 |
hg add sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
78 |
hg ci -m addsym -u mercurial |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
79 |
hg bundle --base null ../test-keyword.hg |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
80 |
|
925
b73d6eb16638
tests: move test bundles in a bundles/ subdirectory
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
888
diff
changeset
|
81 |
$ hg pull -u "$TESTDIR"/bundles/test-keyword.hg |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
82 |
pulling from *test-keyword.hg (glob) |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
83 |
requesting all changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
84 |
adding changesets |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
85 |
adding manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
86 |
adding file changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
87 |
added 1 changesets with 1 changes to 1 files |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
88 |
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
|
89 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
90 |
$ echo 'expand $Id$' > a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
91 |
$ echo 'do not process $Id:' >> a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
92 |
$ echo 'xxx $' >> a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
93 |
$ echo 'ignore $Id$' > b |
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 |
Output files as they were created |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
96 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
97 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
98 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
99 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
100 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
101 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
102 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
103 |
no kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
104 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
105 |
$ hg kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
106 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
107 |
untracked candidates |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
108 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
109 |
$ hg -v kwfiles --unknown |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
110 |
k a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
111 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
112 |
Add files and check status |
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 |
$ hg addremove |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
115 |
adding a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
116 |
adding b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
117 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
118 |
A a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
119 |
A b |
392
45a318c5ea20
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
384
diff
changeset
|
120 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
121 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
122 |
Default keyword expansion including commit hook |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
123 |
Interrupted commit should not change state or run commit hook |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
124 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
125 |
$ hg --debug commit |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
126 |
abort: empty commit message |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
792
diff
changeset
|
127 |
[255] |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
128 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
129 |
A a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
130 |
A b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
131 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
132 |
Commit with several checks |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
133 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
134 |
$ hg --debug commit -mabsym -u 'User Name <user@example.com>' |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
135 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
136 |
b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
137 |
overwriting a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
138 |
running hook commit.test: cp a hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
139 |
committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
140 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
141 |
? hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
142 |
$ hg debugrebuildstate |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
143 |
$ hg --quiet identify |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
144 |
ef63ca68695b |
305
d3cdaa49a644
Test that commit hooks are not run on interrupted commit
Christian Ebert <blacktrash@gmx.net>
parents:
302
diff
changeset
|
145 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
146 |
cat files in working directory with keywords expanded |
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 |
$ cat a b |
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 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
154 |
hg cat files and symlink, no expansion |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
155 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
156 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
157 |
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
|
158 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
159 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
160 |
ignore $Id$ |
828
725ab7fe00e5
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
827
diff
changeset
|
161 |
a |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
162 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
163 |
Test hook execution |
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 |
$ diff a hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
166 |
|
817
cd834b4035ec
test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
814
diff
changeset
|
167 |
$ cp $HGRCPATH.nohooks $HGRCPATH |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
168 |
$ rm hooktest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
169 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
170 |
bundle |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
171 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
172 |
$ hg bundle --base null ../kw.hg |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
173 |
2 changesets found |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
174 |
$ cd .. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
175 |
$ hg init Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
176 |
$ cd Test |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
177 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
178 |
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
|
179 |
ie. if patch.diff wrapper acts as it should |
294 | 180 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
181 |
$ cat <<EOF >> $HGRCPATH |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
182 |
> [hooks] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
183 |
> incoming.notify = python:hgext.notify.hook |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
184 |
> [notify] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
185 |
> sources = pull |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
186 |
> diffstat = False |
831
1069be3ee9db
test-keyword: ignore subject in notify hook mails
Mads Kiilerich <mads@kiilerich.com>
parents:
830
diff
changeset
|
187 |
> maxsubject = 15 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
188 |
> [reposubs] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
189 |
> * = Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
190 |
> EOF |
294 | 191 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
192 |
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
|
193 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
194 |
$ hg pull -u ../kw.hg |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
195 |
pulling from ../kw.hg |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
196 |
requesting all changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
197 |
adding changesets |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
198 |
adding manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
199 |
adding file changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
200 |
added 2 changesets with 3 changes to 3 files |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
201 |
Content-Type: text/plain; charset="us-ascii" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
202 |
MIME-Version: 1.0 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
203 |
Content-Transfer-Encoding: 7bit |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
204 |
Date: * (glob) |
831
1069be3ee9db
test-keyword: ignore subject in notify hook mails
Mads Kiilerich <mads@kiilerich.com>
parents:
830
diff
changeset
|
205 |
Subject: changeset in... |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
206 |
From: mercurial |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
207 |
X-Hg-Notification: changeset a2392c293916 |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
208 |
Message-Id: <hg.a2392c293916*> (glob) |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
209 |
To: Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
210 |
|
828
725ab7fe00e5
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
827
diff
changeset
|
211 |
changeset a2392c293916 in $TESTTMP/Test |
888
8c5c3a0aa6d5
tests: use $TESTTMP more and use (glob) less
Martin Geisler <mg@aragost.com>
parents:
884
diff
changeset
|
212 |
details: $TESTTMP/Test?cmd=changeset;node=a2392c293916 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
213 |
description: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
214 |
addsym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
215 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
216 |
diffs (6 lines): |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
217 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
218 |
diff -r 000000000000 -r a2392c293916 sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
219 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
220 |
+++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
221 |
@@ -0,0 +1,1 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
222 |
+a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
223 |
\ No newline at end of file |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
224 |
Content-Type: text/plain; charset="us-ascii" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
225 |
MIME-Version: 1.0 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
226 |
Content-Transfer-Encoding: 7bit |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
227 |
Date:* (glob) |
831
1069be3ee9db
test-keyword: ignore subject in notify hook mails
Mads Kiilerich <mads@kiilerich.com>
parents:
830
diff
changeset
|
228 |
Subject: changeset in... |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
229 |
From: User Name <user@example.com> |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
230 |
X-Hg-Notification: changeset ef63ca68695b |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
231 |
Message-Id: <hg.ef63ca68695b*> (glob) |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
232 |
To: Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
233 |
|
828
725ab7fe00e5
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
827
diff
changeset
|
234 |
changeset ef63ca68695b in $TESTTMP/Test |
725ab7fe00e5
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
827
diff
changeset
|
235 |
details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
236 |
description: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
237 |
absym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
238 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
239 |
diffs (12 lines): |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
240 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
241 |
diff -r a2392c293916 -r ef63ca68695b a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
242 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
243 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
244 |
@@ -0,0 +1,3 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
245 |
+expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
246 |
+do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
247 |
+xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
248 |
diff -r a2392c293916 -r ef63ca68695b b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
249 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
250 |
+++ b/b Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
251 |
@@ -0,0 +1,1 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
252 |
+ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
253 |
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
|
254 |
|
817
cd834b4035ec
test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
814
diff
changeset
|
255 |
$ cp $HGRCPATH.nohooks $HGRCPATH |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
256 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
257 |
Touch files and check with 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 |
$ touch a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
260 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
261 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
262 |
Update and expand |
384
482c91f8c230
Do not set up kwrepo when pulling from bundlerepo
Christian Ebert <blacktrash@gmx.net>
parents:
381
diff
changeset
|
263 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
264 |
$ rm sym a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
265 |
$ hg update -C |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
266 |
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
|
267 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
268 |
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
|
269 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
270 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
271 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
272 |
|
981
0b32ba113ad2
Preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
928
diff
changeset
|
273 |
Check whether expansion is filewise and file mode is preserved |
782
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 |
$ echo '$Id$' > c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
276 |
$ echo 'tests for different changenodes' >> c |
981
0b32ba113ad2
Preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
928
diff
changeset
|
277 |
$ chmod 600 c |
0b32ba113ad2
Preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
928
diff
changeset
|
278 |
$ ls -l c | cut -b 1-10 |
0b32ba113ad2
Preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
928
diff
changeset
|
279 |
-rw------- |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
280 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
281 |
commit file c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
282 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
283 |
$ 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
|
284 |
adding c |
981
0b32ba113ad2
Preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
928
diff
changeset
|
285 |
$ ls -l c | cut -b 1-10 |
0b32ba113ad2
Preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
928
diff
changeset
|
286 |
-rw------- |
782
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 |
force expansion |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
289 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
290 |
$ hg -v kwexpand |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
291 |
overwriting a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
292 |
overwriting c expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
293 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
294 |
compare changenodes in a and c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
295 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
296 |
$ cat a c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
297 |
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
|
298 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
299 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
300 |
$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
|
301 |
tests for different changenodes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
302 |
|
836
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
303 |
record |
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
304 |
|
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
305 |
$ echo '$Id$' > r |
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
306 |
$ hg add r |
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
307 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
308 |
record chunk |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
309 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
310 |
$ python -c \ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
311 |
> 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);' |
836
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
312 |
$ hg record -d '1 10' -m rectest a<<EOF |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
313 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
314 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
315 |
> n |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
316 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
317 |
diff --git a/a b/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
318 |
2 hunks, 2 lines changed |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
319 |
examine changes to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
320 |
@@ -1,3 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
321 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
322 |
+foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
323 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
324 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
325 |
record change 1/2 to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
326 |
@@ -2,2 +3,3 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
327 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
328 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
329 |
+bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
330 |
record change 2/2 to 'a'? [Ynsfdaq?] |
342
abf7ccaf0788
Add a very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
338
diff
changeset
|
331 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
332 |
$ hg identify |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
333 |
d17e03c92c97+ tip |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
334 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
335 |
M a |
836
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
336 |
A r |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
337 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
338 |
Cat modified file a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
339 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
340 |
$ cat a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
341 |
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
|
342 |
foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
343 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
344 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
345 |
bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
346 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
347 |
Diff remaining chunk |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
348 |
|
836
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
349 |
$ hg diff a |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
350 |
diff -r d17e03c92c97 a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
351 |
--- a/a Wed Dec 31 23:59:51 1969 -0000 |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
352 |
+++ b/a * (glob) |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
353 |
@@ -2,3 +2,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
354 |
foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
355 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
356 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
357 |
+bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
358 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
359 |
$ hg rollback |
884
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
360 |
repository tip rolled back to revision 2 (undo commit) |
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
361 |
working directory now based on revision 2 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
362 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
363 |
Record all chunks in file a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
364 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
365 |
$ echo foo > msg |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
366 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
367 |
- do not use "hg record -m" here! |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
368 |
|
836
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
369 |
$ hg record -l msg -d '1 11' a<<EOF |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
370 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
371 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
372 |
> y |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
373 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
374 |
diff --git a/a b/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
375 |
2 hunks, 2 lines changed |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
376 |
examine changes to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
377 |
@@ -1,3 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
378 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
379 |
+foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
380 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
381 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
382 |
record change 1/2 to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
383 |
@@ -2,2 +3,3 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
384 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
385 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
386 |
+bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
387 |
record change 2/2 to 'a'? [Ynsfdaq?] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
388 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
389 |
File a should be clean |
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 |
$ hg status -A a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
392 |
C a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
393 |
|
809
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
394 |
rollback and revert expansion |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
395 |
|
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
396 |
$ cat a |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
397 |
expand $Id: a,v 59f969a3b52c 1970/01/01 00:00:01 test $ |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
398 |
foo |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
399 |
do not process $Id: |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
400 |
xxx $ |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
401 |
bar |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
402 |
$ hg --verbose rollback |
884
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
403 |
repository tip rolled back to revision 2 (undo commit) |
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
404 |
working directory now based on revision 2 |
809
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
405 |
overwriting a expanding keywords |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
406 |
$ hg status a |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
407 |
M a |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
408 |
$ cat a |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
409 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
410 |
foo |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
411 |
do not process $Id: |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
412 |
xxx $ |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
413 |
bar |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
414 |
$ echo '$Id$' > y |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
415 |
$ echo '$Id$' > z |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
416 |
$ hg add y |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
417 |
$ hg commit -Am "rollback only" z |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
418 |
$ cat z |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
419 |
$Id: z,v 45a5d3adce53 1970/01/01 00:00:00 test $ |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
420 |
$ hg --verbose rollback |
884
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
421 |
repository tip rolled back to revision 2 (undo commit) |
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
422 |
working directory now based on revision 2 |
809
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
423 |
overwriting z shrinking keywords |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
424 |
|
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
425 |
Only z should be overwritten |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
426 |
|
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
427 |
$ hg status a y z |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
428 |
M a |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
429 |
A y |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
430 |
A z |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
431 |
$ cat z |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
432 |
$Id$ |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
433 |
$ hg forget y z |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
434 |
$ rm y z |
028b6584decb
Support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
806
diff
changeset
|
435 |
|
836
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
436 |
record added file alone |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
437 |
|
818
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
438 |
$ hg -v record -l msg -d '1 12' r<<EOF |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
439 |
> y |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
440 |
> EOF |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
441 |
diff --git a/r b/r |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
442 |
new file mode 100644 |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
443 |
examine changes to 'r'? [Ynsfdaq?] |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
444 |
r |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
445 |
committed changeset 3:899491280810 |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
446 |
overwriting r expanding keywords |
982
639bb4617c70
Make status test after record and kwexpand/kwshrink reliable
Christian Ebert <blacktrash@gmx.net>
parents:
981
diff
changeset
|
447 |
- status call required for dirstate.normallookup() check |
639bb4617c70
Make status test after record and kwexpand/kwshrink reliable
Christian Ebert <blacktrash@gmx.net>
parents:
981
diff
changeset
|
448 |
$ hg status r |
818
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
449 |
$ hg --verbose rollback |
884
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
450 |
repository tip rolled back to revision 2 (undo commit) |
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
451 |
working directory now based on revision 2 |
818
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
452 |
overwriting r shrinking keywords |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
453 |
$ hg forget r |
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
454 |
$ rm msg r |
836
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
455 |
$ hg update -C |
53a9228f13de
Fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
831
diff
changeset
|
456 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
818
b742a071ad9c
Specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
817
diff
changeset
|
457 |
|
846
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
458 |
record added keyword ignored file |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
459 |
|
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
460 |
$ echo '$Id$' > i |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
461 |
$ hg add i |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
462 |
$ hg --verbose record -d '1 13' -m recignored<<EOF |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
463 |
> y |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
464 |
> EOF |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
465 |
diff --git a/i b/i |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
466 |
new file mode 100644 |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
467 |
examine changes to 'i'? [Ynsfdaq?] |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
468 |
i |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
469 |
committed changeset 3:5f40fe93bbdc |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
470 |
$ cat i |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
471 |
$Id$ |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
472 |
$ hg -q rollback |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
473 |
$ hg forget i |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
474 |
$ rm i |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
475 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
476 |
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
|
477 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
478 |
$ hg init --mq |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
479 |
$ hg qimport -r tip -n mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
480 |
$ hg commit --mq -m mqtest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
481 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
482 |
Keywords should not be expanded in patch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
483 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
484 |
$ cat .hg/patches/mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
485 |
# HG changeset patch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
486 |
# User User Name <user@example.com> |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
487 |
# Date 1 0 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
488 |
# Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
489 |
# Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
490 |
cndiff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
491 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
492 |
diff -r ef63ca68695b -r 40a904bbbe4c c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
493 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
494 |
+++ b/c Thu Jan 01 00:00:01 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
495 |
@@ -0,0 +1,2 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
496 |
+$Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
497 |
+tests for different changenodes |
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 qpop |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
500 |
popping mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
501 |
patch queue now empty |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
502 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
503 |
qgoto, implying qpush, should expand |
737 | 504 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
505 |
$ hg qgoto mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
506 |
applying mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
507 |
now at: mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
508 |
$ cat c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
509 |
$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
|
510 |
tests for different changenodes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
511 |
$ hg cat c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
512 |
$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
|
513 |
tests for different changenodes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
514 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
515 |
Keywords should not be expanded in filelog |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
516 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
517 |
$ hg --config 'extensions.keyword=!' cat c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
518 |
$Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
519 |
tests for different changenodes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
520 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
521 |
qpop and move on |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
522 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
523 |
$ hg qpop |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
524 |
popping mqtest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
525 |
patch queue now empty |
336
46f5cf3e1a7f
Test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
333
diff
changeset
|
526 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
527 |
Copy and show added kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
528 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
529 |
$ hg cp a c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
530 |
$ hg kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
531 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
532 |
c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
533 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
534 |
Commit and show expansion in original and copy |
259
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
257
diff
changeset
|
535 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
536 |
$ 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
|
537 |
c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
538 |
c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
539 |
overwriting c expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
540 |
committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
541 |
$ cat a c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
542 |
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
|
543 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
544 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
545 |
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
|
546 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
547 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
548 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
549 |
Touch copied c and check its status |
259
76402fc0fb58
Test kwfiles working context
Christian Ebert <blacktrash@gmx.net>
parents:
257
diff
changeset
|
550 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
551 |
$ touch c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
552 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
553 |
|
814
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
554 |
Copy kwfile to keyword ignored file unexpanding keywords |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
555 |
|
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
556 |
$ hg --verbose copy a i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
557 |
copying a to i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
558 |
overwriting i shrinking keywords |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
559 |
$ head -n 1 i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
560 |
expand $Id$ |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
561 |
$ hg forget i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
562 |
$ rm i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
563 |
|
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
564 |
Copy ignored file to ignored file: no overwriting |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
565 |
|
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
566 |
$ hg --verbose copy b i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
567 |
copying b to i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
568 |
$ hg forget i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
569 |
$ rm i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
570 |
|
868
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
571 |
cp symlink file; hg cp -A symlink file (part1) |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
572 |
- copied symlink points to kwfile: overwrite |
814
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
573 |
|
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
574 |
$ cp sym i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
575 |
$ ls -l i |
830
7c5571af20c9
test-keyword: fix test glob to ACL/SELinux flag
Mads Kiilerich <mads@kiilerich.com>
parents:
828
diff
changeset
|
576 |
-rw-r--r--* (glob) |
814
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
577 |
$ head -1 i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
578 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
579 |
$ hg copy --after --verbose sym i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
580 |
copying sym to i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
581 |
overwriting i shrinking keywords |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
582 |
$ head -1 i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
583 |
expand $Id$ |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
584 |
$ hg forget i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
585 |
$ rm i |
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
586 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
587 |
Test different options of hg kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
588 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
589 |
$ hg kwfiles |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
590 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
591 |
c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
592 |
$ hg -v kwfiles --ignore |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
593 |
I b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
594 |
I sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
595 |
$ hg kwfiles --all |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
596 |
K a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
597 |
K c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
598 |
I b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
599 |
I sym |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
600 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
601 |
Diff specific revision |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
602 |
|
786
5a41673d33fb
test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
784
diff
changeset
|
603 |
$ hg diff --rev 1 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
604 |
diff -r ef63ca68695b c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
605 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
606 |
+++ b/c * (glob) |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
607 |
@@ -0,0 +1,3 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
608 |
+expand $Id$ |
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 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
612 |
Status after rollback: |
247 | 613 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
614 |
$ hg rollback |
884
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
615 |
repository tip rolled back to revision 1 (undo commit) |
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
616 |
working directory now based on revision 1 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
617 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
618 |
A c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
619 |
$ hg update --clean |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
620 |
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
|
621 |
|
868
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
622 |
cp symlink file; hg cp -A symlink file (part2) |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
623 |
- copied symlink points to kw ignored file: do not overwrite |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
624 |
|
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
625 |
$ cat a > i |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
626 |
$ ln -s i symignored |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
627 |
$ hg commit -Am 'fake expansion in ignored and symlink' i symignored |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
628 |
$ cp symignored x |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
629 |
$ hg copy --after --verbose symignored x |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
630 |
copying symignored to x |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
631 |
$ head -n 1 x |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
632 |
expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
633 |
$ hg forget x |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
634 |
$ rm x |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
635 |
|
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
636 |
$ hg rollback |
884
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
637 |
repository tip rolled back to revision 1 (undo commit) |
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
638 |
working directory now based on revision 1 |
868
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
639 |
$ hg update --clean |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
640 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
641 |
$ rm i symignored |
16cfcb56859a
Copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
850
diff
changeset
|
642 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
643 |
Custom keywordmaps as argument to kwdemo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
644 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
645 |
$ hg --quiet kwdemo "Xinfo = {author}: {desc}" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
646 |
[extensions] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
647 |
keyword = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
648 |
[keyword] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
649 |
** = |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
650 |
b = ignore |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
651 |
demo.txt = |
814
0588121c815b
Support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
809
diff
changeset
|
652 |
i = ignore |
874
272a8a316f7a
Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
868
diff
changeset
|
653 |
[keywordset] |
272a8a316f7a
Inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
868
diff
changeset
|
654 |
svn = False |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
655 |
[keywordmaps] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
656 |
Xinfo = {author}: {desc} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
657 |
$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
|
658 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
659 |
Configure custom keywordmaps |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
660 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
661 |
$ cat <<EOF >>$HGRCPATH |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
662 |
> [keywordmaps] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
663 |
> Id = {file} {node|short} {date|rfc822date} {author|user} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
664 |
> Xinfo = {author}: {desc} |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
665 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
666 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
667 |
Cat and hg cat files before custom expansion |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
668 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
669 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
670 |
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
|
671 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
672 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
673 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
674 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
675 |
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
|
676 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
677 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
678 |
ignore $Id$ |
828
725ab7fe00e5
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
827
diff
changeset
|
679 |
a |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
680 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
681 |
Write custom keyword and prepare multiline commit message |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
682 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
683 |
$ echo '$Xinfo$' >> a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
684 |
$ cat <<EOF >> log |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
685 |
> firstline |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
686 |
> secondline |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
687 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
688 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
689 |
Interrupted commit should not change state |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
690 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
691 |
$ hg commit |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
692 |
abort: empty commit message |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
792
diff
changeset
|
693 |
[255] |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
694 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
695 |
M a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
696 |
? c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
697 |
? log |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
698 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
699 |
Commit with multiline message and custom expansion |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
700 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
701 |
$ 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
|
702 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
703 |
overwriting a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
704 |
committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
705 |
$ rm log |
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 |
Stat, verify and show custom expansion (firstline) |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
708 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
709 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
710 |
? c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
711 |
$ hg verify |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
712 |
checking changesets |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
713 |
checking manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
714 |
crosschecking files in changesets and manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
715 |
checking files |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
716 |
3 files, 3 changesets, 4 total revisions |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
717 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
718 |
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
|
719 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
720 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
721 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
722 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
723 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
724 |
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
|
725 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
726 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
727 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
728 |
ignore $Id$ |
828
725ab7fe00e5
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
827
diff
changeset
|
729 |
a |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
730 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
731 |
annotate |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
732 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
733 |
$ hg annotate a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
734 |
1: expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
735 |
1: do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
736 |
1: xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
737 |
2: $Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
738 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
739 |
remove with status checks |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
740 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
741 |
$ hg debugrebuildstate |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
742 |
$ hg remove a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
743 |
$ hg --debug commit -m rma |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
744 |
committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
745 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
746 |
? c |
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 |
Rollback, revert, and check expansion |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
749 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
750 |
$ hg rollback |
884
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
751 |
repository tip rolled back to revision 2 (undo commit) |
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
752 |
working directory now based on revision 2 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
753 |
$ hg status |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
754 |
R a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
755 |
? c |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
756 |
$ hg revert --no-backup --rev tip a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
757 |
$ cat a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
758 |
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
|
759 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
760 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
761 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
762 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
763 |
Clone to test global and local configurations |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
764 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
765 |
$ cd .. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
766 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
767 |
Expansion in destinaton with global configuration |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
768 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
769 |
$ hg --quiet clone Test globalconf |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
770 |
$ cat globalconf/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
771 |
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
|
772 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
773 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
774 |
$Xinfo: User Name <user@example.com>: firstline $ |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
775 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
776 |
No expansion in destination with local configuration in origin only |
215 | 777 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
778 |
$ hg --quiet --config 'keyword.**=ignore' clone Test localconf |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
779 |
$ cat localconf/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
780 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
781 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
782 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
783 |
$Xinfo$ |
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 |
Clone to test incoming |
773
9f939fae8ff3
Move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
765
diff
changeset
|
786 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
787 |
$ hg clone -r1 Test Test-a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
788 |
adding changesets |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
789 |
adding manifests |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
790 |
adding file changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
791 |
added 2 changesets with 3 changes to 3 files |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
792 |
updating to branch default |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
793 |
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
|
794 |
$ cd Test-a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
795 |
$ cat <<EOF >> .hg/hgrc |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
796 |
> [paths] |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
797 |
> default = ../Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
798 |
> EOF |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
799 |
$ hg incoming |
828
725ab7fe00e5
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
827
diff
changeset
|
800 |
comparing with $TESTTMP/Test |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
801 |
searching for changes |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
802 |
changeset: 2:bb948857c743 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
803 |
tag: tip |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
804 |
user: User Name <user@example.com> |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
805 |
date: Thu Jan 01 00:00:02 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
806 |
summary: firstline |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
807 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
808 |
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
|
809 |
|
817
cd834b4035ec
test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
814
diff
changeset
|
810 |
$ python -c \ |
cd834b4035ec
test: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
814
diff
changeset
|
811 |
> 'import re; s=re.sub("(Id.*)","\\1 rejecttest",open("a").read()); open("a","wb").write(s);' |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
812 |
$ 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
|
813 |
a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
814 |
overwriting a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
815 |
committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
816 |
$ hg export -o ../rejecttest.diff tip |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
817 |
$ cd ../Test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
818 |
$ hg import ../rejecttest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
819 |
applying ../rejecttest.diff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
820 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
821 |
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
|
822 |
do not process $Id: rejecttest |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
823 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
824 |
$Xinfo: User Name <user@example.com>: rejects? $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
825 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
826 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
827 |
$ hg rollback |
884
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
828 |
repository tip rolled back to revision 2 (undo commit) |
fe775751eb93
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
874
diff
changeset
|
829 |
working directory now based on revision 2 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
830 |
$ hg update --clean |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
831 |
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
|
832 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
833 |
kwexpand/kwshrink on selected files |
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 |
$ mkdir x |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
836 |
$ hg copy a x/a |
846
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
837 |
$ hg --verbose kwshrink a |
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
838 |
overwriting a shrinking keywords |
982
639bb4617c70
Make status test after record and kwexpand/kwshrink reliable
Christian Ebert <blacktrash@gmx.net>
parents:
981
diff
changeset
|
839 |
- sleep required for dirstate.normal() check |
639bb4617c70
Make status test after record and kwexpand/kwshrink reliable
Christian Ebert <blacktrash@gmx.net>
parents:
981
diff
changeset
|
840 |
$ sleep 1 |
846
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
841 |
$ hg status a |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
842 |
$ hg --verbose kwexpand a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
843 |
overwriting a expanding keywords |
846
d565787a8a5d
Fix regressions introduced in 9d01f9cab5e2
Christian Ebert <blacktrash@gmx.net>
parents:
836
diff
changeset
|
844 |
$ hg status a |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
845 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
846 |
kwexpand x/a should abort |
189
247159261ba5
Add backwards compatible test-suite
Christian Ebert <blacktrash@gmx.net>
parents:
diff
changeset
|
847 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
848 |
$ hg --verbose kwexpand x/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
849 |
abort: outstanding uncommitted changes |
793
9cc90e2c826f
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
792
diff
changeset
|
850 |
[255] |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
851 |
$ cd x |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
852 |
$ 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
|
853 |
x/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
854 |
x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
855 |
overwriting x/a expanding keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
856 |
committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
857 |
$ cat a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
858 |
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
|
859 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
860 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
861 |
$Xinfo: User Name <user@example.com>: xa $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
862 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
863 |
kwshrink a inside directory x |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
864 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
865 |
$ hg --verbose kwshrink a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
866 |
overwriting x/a shrinking keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
867 |
$ cat a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
868 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
869 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
870 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
871 |
$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
872 |
$ cd .. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
873 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
874 |
kwexpand nonexistent |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
875 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
876 |
$ hg kwexpand nonexistent |
801
413c6fe6d1e3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
800
diff
changeset
|
877 |
nonexistent:* (glob) |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
878 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
879 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
880 |
hg serve |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
881 |
- expand with hgweb file |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
882 |
- no expansion with hgweb annotate/changeset/filediff |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
883 |
- check errors |
316
98656ffb1cec
Test potential import conflict
Christian Ebert <blacktrash@gmx.net>
parents:
313
diff
changeset
|
884 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
885 |
$ 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
|
886 |
$ cat hg.pid >> $DAEMON_PIDS |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
887 |
$ $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
|
888 |
200 Script output follows |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
889 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
890 |
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
|
891 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
892 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
893 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
894 |
$ $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
|
895 |
200 Script output follows |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
896 |
|
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 |
user@1: expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
899 |
user@1: do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
900 |
user@1: xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
901 |
user@2: $Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
902 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
903 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
904 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
905 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
906 |
$ $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
|
907 |
200 Script output follows |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
908 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
909 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
910 |
# HG changeset patch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
911 |
# User User Name <user@example.com> |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
912 |
# Date 3 0 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
913 |
# Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
914 |
# Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
915 |
xa |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
916 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
917 |
diff -r bb948857c743 -r b4560182a3f9 x/a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
918 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
919 |
+++ 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
|
920 |
@@ -0,0 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
921 |
+expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
922 |
+do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
923 |
+xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
924 |
+$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
925 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
926 |
$ $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
|
927 |
200 Script output follows |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
928 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
929 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
930 |
diff -r ef63ca68695b -r bb948857c743 a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
931 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
932 |
+++ b/a Thu Jan 01 00:00:02 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
933 |
@@ -1,3 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
934 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
935 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
936 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
937 |
+$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
938 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
939 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
940 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
941 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
942 |
$ cat errors.log |
241
e0a846f9f095
Test kwshrink w/ argument while not in top level directory
Christian Ebert <blacktrash@gmx.net>
parents:
224
diff
changeset
|
943 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
944 |
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
|
945 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
946 |
$ echo '$Id$' > m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
947 |
$ hg add m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
948 |
$ hg commit -m 4kw |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
949 |
$ echo foo >> m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
950 |
$ hg commit -m 5foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
951 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
952 |
simplemerge |
482
18dc6c3588ea
Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
479
diff
changeset
|
953 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
954 |
$ hg update 4 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
955 |
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
|
956 |
$ echo foo >> m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
957 |
$ hg commit -m 6foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
958 |
created new head |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
959 |
$ hg merge |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
960 |
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
|
961 |
(branch merge, don't forget to commit) |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
962 |
$ hg commit -m simplemerge |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
963 |
$ cat m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
964 |
$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
|
965 |
foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
966 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
967 |
conflict: keyword should stay outside conflict zone |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
968 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
969 |
$ hg update 4 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
970 |
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
|
971 |
$ echo bar >> m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
972 |
$ hg commit -m 8bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
973 |
created new head |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
974 |
$ hg merge |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
975 |
merging m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
976 |
warning: conflicts during merge. |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
977 |
merging m failed! |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
978 |
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
|
979 |
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
|
980 |
[1] |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
981 |
$ cat m |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
982 |
$Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
983 |
<<<<<<< local |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
984 |
bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
985 |
======= |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
986 |
foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
987 |
>>>>>>> other |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
988 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
989 |
resolve to local |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
990 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
991 |
$ HGMERGE=internal:local hg resolve -a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
992 |
$ hg commit -m localresolve |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
993 |
$ cat m |
928
e1bf64aaef4f
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
925
diff
changeset
|
994 |
$Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $ |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
995 |
bar |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
996 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
997 |
Test restricted mode with transplant -b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
998 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
999 |
$ hg update 6 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1000 |
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
|
1001 |
$ hg branch foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1002 |
marked working directory as branch foo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1003 |
$ mv a a.bak |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1004 |
$ echo foobranch > a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1005 |
$ cat a.bak >> a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1006 |
$ rm a.bak |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1007 |
$ hg commit -m 9foobranch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1008 |
$ hg update default |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1009 |
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
|
1010 |
$ hg -y transplant -b foo tip |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1011 |
applying 4aa30d025d50 |
928
e1bf64aaef4f
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
925
diff
changeset
|
1012 |
4aa30d025d50 transplanted to e00abbf63521 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1013 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1014 |
Expansion in changeset but not in file |
485
5c3637b12e88
Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
482
diff
changeset
|
1015 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1016 |
$ hg tip -p |
928
e1bf64aaef4f
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
925
diff
changeset
|
1017 |
changeset: 11:e00abbf63521 |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1018 |
tag: tip |
928
e1bf64aaef4f
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
925
diff
changeset
|
1019 |
parent: 9:800511b3a22d |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1020 |
user: test |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1021 |
date: Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1022 |
summary: 9foobranch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1023 |
|
928
e1bf64aaef4f
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
925
diff
changeset
|
1024 |
diff -r 800511b3a22d -r e00abbf63521 a |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1025 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1026 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1027 |
@@ -1,3 +1,4 @@ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1028 |
+foobranch |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1029 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1030 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1031 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1032 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1033 |
$ head -n 2 a |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1034 |
foobranch |
928
e1bf64aaef4f
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
925
diff
changeset
|
1035 |
expand $Id: a e00abbf63521 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1036 |
|
806
a0dc79015ddf
test: fix typo, rephrase
Christian Ebert <blacktrash@gmx.net>
parents:
801
diff
changeset
|
1037 |
Turn off expansion |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1038 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1039 |
$ hg -q rollback |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1040 |
$ hg -q update -C |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1041 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1042 |
kwshrink with unknown file u |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1043 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1044 |
$ cp a u |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1045 |
$ hg --verbose kwshrink |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1046 |
overwriting a shrinking keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1047 |
overwriting m shrinking keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1048 |
overwriting x/a shrinking keywords |
668
13a6a2c0440f
Go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
653
diff
changeset
|
1049 |
|
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1050 |
Keywords shrunk in working directory, but not yet disabled |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1051 |
- cat shows unexpanded keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1052 |
- hg cat shows expanded keywords |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1053 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1054 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1055 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1056 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1057 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1058 |
$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1059 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1060 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1061 |
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
|
1062 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1063 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1064 |
$Xinfo: User Name <user@example.com>: firstline $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1065 |
ignore $Id$ |
828
725ab7fe00e5
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
827
diff
changeset
|
1066 |
a |
782
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1067 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1068 |
Now disable keyword expansion |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1069 |
|
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1070 |
$ rm "$HGRCPATH" |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1071 |
$ cat a b |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1072 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1073 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1074 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1075 |
$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1076 |
ignore $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1077 |
$ hg cat sym a b && echo |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1078 |
expand $Id$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1079 |
do not process $Id: |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1080 |
xxx $ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1081 |
$Xinfo$ |
09bae16e7a6d
tests: unify test-keyword
Christian Ebert <blacktrash@gmx.net>
parents:
773
diff
changeset
|
1082 |
ignore $Id$ |
828
725ab7fe00e5
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
827
diff
changeset
|
1083 |
a |