Mercurial > hg
annotate tests/test-keyword.t @ 35595:91201737d07a
revsetlang: fix quoting of %ls string
Before, "'" wasn't escaped appropriately. This also changes the separator
'\0' to '\\0', but that's okay as a string token is unescaped.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 01 Apr 2017 17:51:56 +0900 |
parents | 4441705b7111 |
children | 4b68ca118d8d |
rev | line source |
---|---|
29634
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
1 Run kwdemo outside a repo |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
2 $ hg -q --config extensions.keyword= --config keywordmaps.Foo="{author|user}" kwdemo |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
3 [extensions] |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
4 keyword = |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
5 [keyword] |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
6 demo.txt = |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
7 [keywordset] |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
8 svn = False |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
9 [keywordmaps] |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
10 Foo = {author|user} |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
11 $Foo: test $ |
8421cbebc783
keyword: avoid traceback when kwdemo is run outside a repo
Christian Ebert <blacktrash@gmx.net>
parents:
28694
diff
changeset
|
12 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
13 $ cat <<EOF >> $HGRCPATH |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
14 > [extensions] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
15 > keyword = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
16 > mq = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
17 > notify = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
18 > record = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
19 > transplant = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
20 > [ui] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
21 > interactive = true |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
22 > EOF |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
23 |
17015
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
24 hide outer repo |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
25 $ hg init |
73d20de5f30b
tests: add missing no-outer-repo requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
26 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
27 Run kwdemo before [keyword] files are set up |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
28 as it would succeed without uisetup otherwise |
5816 | 29 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
30 $ hg --quiet kwdemo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
31 [extensions] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
32 keyword = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
33 [keyword] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
34 demo.txt = |
13298
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13069
diff
changeset
|
35 [keywordset] |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13069
diff
changeset
|
36 svn = False |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
37 [keywordmaps] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
38 Author = {author|user} |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
39 Date = {date|utcdate} |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
40 Header = {root}/{file},v {node|short} {date|utcdate} {author|user} |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
41 Id = {file|basename},v {node|short} {date|utcdate} {author|user} |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
42 RCSFile = {file|basename},v |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
43 RCSfile = {file|basename},v |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
44 Revision = {node|short} |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
45 Source = {root}/{file},v |
12372
5163e3c8aa52
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12316
diff
changeset
|
46 $Author: test $ |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
47 $Date: ????/??/?? ??:??:?? $ (glob) |
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
48 $Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob) |
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
49 $Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob) |
12372
5163e3c8aa52
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12316
diff
changeset
|
50 $RCSFile: demo.txt,v $ |
5163e3c8aa52
tests: improve regexes in unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12316
diff
changeset
|
51 $RCSfile: demo.txt,v $ |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
52 $Revision: ???????????? $ (glob) |
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
53 $Source: */demo.txt,v $ (glob) |
9462
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
54 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
55 $ hg --quiet kwdemo "Branch = {branches}" |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
56 [extensions] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
57 keyword = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
58 [keyword] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
59 demo.txt = |
13298
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13069
diff
changeset
|
60 [keywordset] |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13069
diff
changeset
|
61 svn = False |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
62 [keywordmaps] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
63 Branch = {branches} |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
64 $Branch: demobranch $ |
9462
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
65 |
28694
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
66 (test template filter svnisodate and svnutcdate) |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
67 |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
68 $ hg --quiet kwdemo --config keywordset.svn=True |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
69 [extensions] |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
70 keyword = |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
71 [keyword] |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
72 demo.txt = |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
73 [keywordset] |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
74 svn = True |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
75 [keywordmaps] |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
76 Author = {author|user} |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
77 Date = {date|svnisodate} |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
78 Id = {file|basename},v {node|short} {date|svnutcdate} {author|user} |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
79 LastChangedBy = {author|user} |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
80 LastChangedDate = {date|svnisodate} |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
81 LastChangedRevision = {node|short} |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
82 Revision = {node|short} |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
83 $Author: test $ |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
84 $Date: ????-??-?? ??:??:?? ????? (???, ?? ??? ????) $ (glob) |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
85 $Id: demo.txt,v ???????????? ????-??-?? ??:??:??Z test $ (glob) |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
86 $LastChangedBy: test $ |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
87 $LastChangedDate: ????-??-?? ??:??:?? ????? (???, ?? ??? ????) $ (glob) |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
88 $LastChangedRevision: ???????????? $ (glob) |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
89 $Revision: ???????????? $ (glob) |
9a6fa1d93bc8
keyword: use templatefilter to mark a function as template filter
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27890
diff
changeset
|
90 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
91 $ cat <<EOF >> $HGRCPATH |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
92 > [keyword] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
93 > ** = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
94 > b = ignore |
12626
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
95 > i = ignore |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
96 > [hooks] |
12629
c623752b1af5
test-keyword: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
12626
diff
changeset
|
97 > EOF |
c623752b1af5
test-keyword: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
12626
diff
changeset
|
98 $ cp $HGRCPATH $HGRCPATH.nohooks |
c623752b1af5
test-keyword: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
12626
diff
changeset
|
99 > cat <<EOF >> $HGRCPATH |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
100 > commit= |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
101 > commit.test=cp a hooktest |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
102 > EOF |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
103 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
104 $ hg init Test-bndl |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
105 $ cd Test-bndl |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
106 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
107 kwshrink should exit silently in empty/invalid repo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
108 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
109 $ hg kwshrink |
9462
1f54b1b7122f
test-keyword: run kwdemo before setting up [keyword] files
Christian Ebert <blacktrash@gmx.net>
parents:
9306
diff
changeset
|
110 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
111 Symlinks cannot be created on Windows. |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
112 A bundle to test this was made with: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
113 hg init t |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
114 cd t |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
115 echo a > a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
116 ln -s a sym |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
117 hg add sym |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
118 hg ci -m addsym -u mercurial |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
119 hg bundle --base null ../test-keyword.hg |
5816 | 120 |
14116
cd3032437064
tests: move test bundles in a bundles/ subdirectory
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
13572
diff
changeset
|
121 $ hg pull -u "$TESTDIR"/bundles/test-keyword.hg |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
122 pulling from *test-keyword.hg (glob) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
123 requesting all changes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
124 adding changesets |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
125 adding manifests |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
126 adding file changes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
127 added 1 changesets with 1 changes to 1 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34310
diff
changeset
|
128 new changesets a2392c293916 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
129 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5816 | 130 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
131 $ echo 'expand $Id$' > a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
132 $ echo 'do not process $Id:' >> a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
133 $ echo 'xxx $' >> a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
134 $ echo 'ignore $Id$' > b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
135 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
136 Output files as they were created |
5816 | 137 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
138 $ cat a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
139 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
140 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
141 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
142 ignore $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
143 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
144 no kwfiles |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
145 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
146 $ hg kwfiles |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
147 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
148 untracked candidates |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
149 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
150 $ hg -v kwfiles --unknown |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
151 k a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
152 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
153 Add files and check status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
154 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
155 $ hg addremove |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
156 adding a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
157 adding b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
158 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
159 A a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
160 A b |
6061
de08788511d7
test-keyword: make it run under Windows
Patrick Mezard <pmezard@gmail.com>
parents:
6051
diff
changeset
|
161 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
162 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
163 Default keyword expansion including commit hook |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
164 Interrupted commit should not change state or run commit hook |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
165 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
166 $ hg --debug commit |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
167 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
168 [255] |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
169 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
170 A a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
171 A b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
172 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
173 Commit with several checks |
5816 | 174 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
175 $ hg --debug commit -mabsym -u 'User Name <user@example.com>' |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
176 committing files: |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
177 a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
178 b |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
179 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
180 committing changelog |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
181 overwriting a expanding keywords |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30460
diff
changeset
|
182 updating the branch cache |
27192
a01d3d32b53a
commands: make commit acquire locks before processing (issue4368)
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
27092
diff
changeset
|
183 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
184 running hook commit.test: cp a hooktest |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
185 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
186 ? hooktest |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
187 $ hg debugrebuildstate |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
188 $ hg --quiet identify |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
189 ef63ca68695b |
5816 | 190 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
191 cat files in working directory with keywords expanded |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
192 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
193 $ cat a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
194 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
195 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
196 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
197 ignore $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
198 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
199 hg cat files and symlink, no expansion |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
200 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
201 $ hg cat sym a b && echo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
202 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
203 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
204 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
205 ignore $Id$ |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12638
diff
changeset
|
206 a |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
207 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
208 $ diff a hooktest |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
209 |
12629
c623752b1af5
test-keyword: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
12626
diff
changeset
|
210 $ cp $HGRCPATH.nohooks $HGRCPATH |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
211 $ rm hooktest |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
212 |
15871
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
213 hg status of kw-ignored binary file starting with '\1\n' |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
214 |
16098
c6c9b83a1e8a
tests: tighten checks for octal escapes in shell printf.
Jim Hague <jim.hague@acm.org>
parents:
15902
diff
changeset
|
215 >>> open("i", "wb").write("\1\nfoo") |
15871
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
216 $ hg -q commit -Am metasep i |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
217 $ hg status |
16098
c6c9b83a1e8a
tests: tighten checks for octal escapes in shell printf.
Jim Hague <jim.hague@acm.org>
parents:
15902
diff
changeset
|
218 >>> open("i", "wb").write("\1\nbar") |
15871
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
219 $ hg status |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
220 M i |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
221 $ hg -q commit -m "modify metasep" i |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
222 $ hg status --rev 2:3 |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
223 M i |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
224 $ touch empty |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
225 $ hg -q commit -A -m "another file" |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
226 $ hg status -A --rev 3:4 i |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
227 C i |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
228 |
23621
bb679344c88d
keyword: update test file syntax
Christian Ebert <blacktrash@gmx.net>
parents:
22589
diff
changeset
|
229 $ hg -q strip --no-backup 2 |
15871
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
230 |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
231 Test hook execution |
07893690c435
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert <blacktrash@gmx.net>
parents:
15615
diff
changeset
|
232 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
233 bundle |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
234 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
235 $ hg bundle --base null ../kw.hg |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
236 2 changesets found |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
237 $ cd .. |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
238 $ hg init Test |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
239 $ cd Test |
5816 | 240 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
241 Notify on pull to check whether keywords stay as is in email |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
242 ie. if patch.diff wrapper acts as it should |
5816 | 243 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
244 $ cat <<EOF >> $HGRCPATH |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
245 > [hooks] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
246 > incoming.notify = python:hgext.notify.hook |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
247 > [notify] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
248 > sources = pull |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
249 > diffstat = False |
12648
8be2d78460ef
test-keyword: ignore subject in notify hook mails
Mads Kiilerich <mads@kiilerich.com>
parents:
12647
diff
changeset
|
250 > maxsubject = 15 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
251 > [reposubs] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
252 > * = Test |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
253 > EOF |
5816 | 254 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
255 Pull from bundle and trigger notify |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
256 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
257 $ hg pull -u ../kw.hg |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
258 pulling from ../kw.hg |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
259 requesting all changes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
260 adding changesets |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
261 adding manifests |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
262 adding file changes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
263 added 2 changesets with 3 changes to 3 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34310
diff
changeset
|
264 new changesets a2392c293916:ef63ca68695b |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33961
diff
changeset
|
265 MIME-Version: 1.0 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
266 Content-Type: text/plain; charset="us-ascii" |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
267 Content-Transfer-Encoding: 7bit |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
268 Date: * (glob) |
12648
8be2d78460ef
test-keyword: ignore subject in notify hook mails
Mads Kiilerich <mads@kiilerich.com>
parents:
12647
diff
changeset
|
269 Subject: changeset in... |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
270 From: mercurial |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
271 X-Hg-Notification: changeset a2392c293916 |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
272 Message-Id: <hg.a2392c293916*> (glob) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
273 To: Test |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
274 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
275 changeset a2392c293916 in $TESTTMP/Test |
13572
1bb2a56a9d73
tests: use $TESTTMP more and use (glob) less
Martin Geisler <mg@aragost.com>
parents:
13446
diff
changeset
|
276 details: $TESTTMP/Test?cmd=changeset;node=a2392c293916 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
277 description: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
278 addsym |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
279 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
280 diffs (6 lines): |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
281 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
282 diff -r 000000000000 -r a2392c293916 sym |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
283 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
284 +++ b/sym Sat Feb 09 20:25:47 2008 +0100 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
285 @@ -0,0 +1,1 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
286 +a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
287 \ No newline at end of file |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33961
diff
changeset
|
288 MIME-Version: 1.0 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
289 Content-Type: text/plain; charset="us-ascii" |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
290 Content-Transfer-Encoding: 7bit |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
291 Date:* (glob) |
12648
8be2d78460ef
test-keyword: ignore subject in notify hook mails
Mads Kiilerich <mads@kiilerich.com>
parents:
12647
diff
changeset
|
292 Subject: changeset in... |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
293 From: User Name <user@example.com> |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
294 X-Hg-Notification: changeset ef63ca68695b |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
295 Message-Id: <hg.ef63ca68695b*> (glob) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
296 To: Test |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
297 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
298 changeset ef63ca68695b in $TESTTMP/Test |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12638
diff
changeset
|
299 details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
300 description: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
301 absym |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
302 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
303 diffs (12 lines): |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
304 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
305 diff -r a2392c293916 -r ef63ca68695b a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
306 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
307 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
308 @@ -0,0 +1,3 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
309 +expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
310 +do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
311 +xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
312 diff -r a2392c293916 -r ef63ca68695b b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
313 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
314 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
315 @@ -0,0 +1,1 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
316 +ignore $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
317 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
318 |
12629
c623752b1af5
test-keyword: remove remaining sed calls
Christian Ebert <blacktrash@gmx.net>
parents:
12626
diff
changeset
|
319 $ cp $HGRCPATH.nohooks $HGRCPATH |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
320 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
321 Touch files and check with status |
6116
e27f39865d7e
keyword: add test for patch.diff monkey
Christian Ebert <blacktrash@gmx.net>
parents:
6061
diff
changeset
|
322 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
323 $ touch a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
324 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
325 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
326 Update and expand |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
327 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
328 $ rm sym a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
329 $ hg update -C |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
330 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
331 $ cat a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
332 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
333 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
334 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
335 ignore $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
336 |
15070
e4c65158b5e7
keyword: preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
14162
diff
changeset
|
337 Check whether expansion is filewise and file mode is preserved |
6051
1038b1458d7a
keyword: safeguards against erroneous behaviour or aborts
Christian Ebert <blacktrash@gmx.net>
parents:
5894
diff
changeset
|
338 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
339 $ echo '$Id$' > c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
340 $ echo 'tests for different changenodes' >> c |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
341 #if unix-permissions |
15070
e4c65158b5e7
keyword: preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
14162
diff
changeset
|
342 $ chmod 600 c |
e4c65158b5e7
keyword: preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
14162
diff
changeset
|
343 $ ls -l c | cut -b 1-10 |
e4c65158b5e7
keyword: preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
14162
diff
changeset
|
344 -rw------- |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
345 #endif |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
346 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
347 commit file c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
348 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
349 $ hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>' |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
350 adding c |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
351 #if unix-permissions |
15070
e4c65158b5e7
keyword: preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
14162
diff
changeset
|
352 $ ls -l c | cut -b 1-10 |
e4c65158b5e7
keyword: preserve file mode when overwriting
Christian Ebert <blacktrash@gmx.net>
parents:
14162
diff
changeset
|
353 -rw------- |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
354 #endif |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
355 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
356 force expansion |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
357 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
358 $ hg -v kwexpand |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
359 overwriting a expanding keywords |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
360 overwriting c expanding keywords |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
361 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
362 compare changenodes in a and c |
5816 | 363 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
364 $ cat a c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
365 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
366 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
367 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
368 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
369 tests for different changenodes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
370 |
12684
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
371 record |
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
372 |
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
373 $ echo '$Id$' > r |
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
374 $ hg add r |
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
375 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
376 record chunk |
5816 | 377 |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
378 >>> lines = open('a', 'rb').readlines() |
15556
e5804c0f6576
test-keyword: use inline doctest syntax
Christian Ebert <blacktrash@gmx.net>
parents:
15501
diff
changeset
|
379 >>> lines.insert(1, 'foo\n') |
e5804c0f6576
test-keyword: use inline doctest syntax
Christian Ebert <blacktrash@gmx.net>
parents:
15501
diff
changeset
|
380 >>> lines.append('bar\n') |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
381 >>> open('a', 'wb').writelines(lines) |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
382 $ hg record -d '10 1' -m rectest a<<EOF |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
383 > y |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
384 > y |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
385 > n |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
386 > EOF |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
387 diff --git a/a b/a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
388 2 hunks, 2 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
389 examine changes to 'a'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
390 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
391 @@ -1,3 +1,4 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
392 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
393 +foo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
394 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
395 xxx $ |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
396 record change 1/2 to 'a'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
397 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
398 @@ -2,2 +3,3 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
399 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
400 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
401 +bar |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
402 record change 2/2 to 'a'? [Ynesfdaq?] n |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
403 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
404 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
405 $ hg identify |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
406 5f5eb23505c3+ tip |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
407 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
408 M a |
12684
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
409 A r |
5894
e181665c1c79
keyword: add very simple mq test
Christian Ebert <blacktrash@gmx.net>
parents:
5856
diff
changeset
|
410 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
411 Cat modified file a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
412 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
413 $ cat a |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
414 expand $Id: a,v 5f5eb23505c3 1970/01/01 00:00:10 test $ |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
415 foo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
416 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
417 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
418 bar |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
419 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
420 Diff remaining chunk |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
421 |
12684
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
422 $ hg diff a |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
423 diff -r 5f5eb23505c3 a |
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
424 --- a/a Thu Jan 01 00:00:09 1970 -0000 |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
425 +++ b/a * (glob) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
426 @@ -2,3 +2,4 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
427 foo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
428 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
429 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
430 +bar |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
431 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
432 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
433 repository tip rolled back to revision 2 (undo commit) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
434 working directory now based on revision 2 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
435 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
436 Record all chunks in file a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
437 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
438 $ echo foo > msg |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
439 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
440 - do not use "hg record -m" here! |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
441 |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
442 $ hg record -l msg -d '11 1' a<<EOF |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
443 > y |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
444 > y |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
445 > y |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
446 > EOF |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
447 diff --git a/a b/a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
448 2 hunks, 2 lines changed |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
449 examine changes to 'a'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
450 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
451 @@ -1,3 +1,4 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
452 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
453 +foo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
454 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
455 xxx $ |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
456 record change 1/2 to 'a'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
457 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
458 @@ -2,2 +3,3 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
459 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
460 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
461 +bar |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
462 record change 2/2 to 'a'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
463 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
464 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
465 File a should be clean |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
466 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
467 $ hg status -A a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
468 C a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
469 |
12498
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
470 rollback and revert expansion |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
471 |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
472 $ cat a |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
473 expand $Id: a,v 78e0a02d76aa 1970/01/01 00:00:11 test $ |
12498
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
474 foo |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
475 do not process $Id: |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
476 xxx $ |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
477 bar |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
478 $ hg --verbose rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
479 repository tip rolled back to revision 2 (undo commit) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
480 working directory now based on revision 2 |
12498
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
481 overwriting a expanding keywords |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
482 $ hg status a |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
483 M a |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
484 $ cat a |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
485 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
486 foo |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
487 do not process $Id: |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
488 xxx $ |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
489 bar |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
490 $ echo '$Id$' > y |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
491 $ echo '$Id$' > z |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
492 $ hg add y |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
493 $ hg commit -Am "rollback only" z |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
494 $ cat z |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
495 $Id: z,v 45a5d3adce53 1970/01/01 00:00:00 test $ |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
496 $ hg --verbose rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
497 repository tip rolled back to revision 2 (undo commit) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
498 working directory now based on revision 2 |
12498
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
499 overwriting z shrinking keywords |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
500 |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
501 Only z should be overwritten |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
502 |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
503 $ hg status a y z |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
504 M a |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
505 A y |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
506 A z |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
507 $ cat z |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
508 $Id$ |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
509 $ hg forget y z |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
510 $ rm y z |
4846e8cd9327
keyword: support rollback by restoring expansion to previous values
Christian Ebert <blacktrash@gmx.net>
parents:
12495
diff
changeset
|
511 |
12684
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
512 record added file alone |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
513 |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
514 $ hg -v record -l msg -d '12 2' r<<EOF |
12630
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
515 > y |
24235
79fceed67676
record: allow editing new files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
23749
diff
changeset
|
516 > y |
12630
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
517 > EOF |
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
518 diff --git a/r b/r |
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
519 new file mode 100644 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
520 examine changes to 'r'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
521 |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
522 @@ -0,0 +1,1 @@ |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
523 +$Id$ |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
524 record this change to 'r'? [Ynesfdaq?] y |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
525 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
526 resolving manifests |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
527 patching file r |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
528 committing files: |
12630
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
529 r |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
530 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
531 committing changelog |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
532 committed changeset 3:82a2f715724d |
12630
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
533 overwriting r expanding keywords |
15075
77325c92db95
keyword: make status test after record and kwexpand/kwshrink reliable
Christian Ebert <blacktrash@gmx.net>
parents:
15070
diff
changeset
|
534 $ hg status r |
12630
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
535 $ hg --verbose rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
536 repository tip rolled back to revision 2 (undo commit) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
537 working directory now based on revision 2 |
12630
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
538 overwriting r shrinking keywords |
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
539 $ hg forget r |
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
540 $ rm msg r |
12684
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
541 $ hg update -C |
8348599c68d7
keyword: fix weeding of expansion candidates when recording
Christian Ebert <blacktrash@gmx.net>
parents:
12648
diff
changeset
|
542 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12630
94926263b7ab
keyword: specific regular expressions depending on read mode
Christian Ebert <blacktrash@gmx.net>
parents:
12629
diff
changeset
|
543 |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
544 record added keyword ignored file |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
545 |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
546 $ echo '$Id$' > i |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
547 $ hg add i |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
548 $ hg --verbose record -d '13 1' -m recignored<<EOF |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
549 > y |
24235
79fceed67676
record: allow editing new files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
23749
diff
changeset
|
550 > y |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
551 > EOF |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
552 diff --git a/i b/i |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
553 new file mode 100644 |
22589
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
554 examine changes to 'i'? [Ynesfdaq?] y |
9ab18a912c44
ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
555 |
24845
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
556 @@ -0,0 +1,1 @@ |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
557 +$Id$ |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
558 record this change to 'i'? [Ynesfdaq?] y |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
559 |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
560 resolving manifests |
8133494accf1
record: edit patch of newly added files (issue4304)
Laurent Charignon <lcharignon@fb.com>
parents:
24837
diff
changeset
|
561 patching file i |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
562 committing files: |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
563 i |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
564 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
565 committing changelog |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
566 committed changeset 3:9f40ceb5a072 |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
567 $ cat i |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
568 $Id$ |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
569 $ hg -q rollback |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
570 $ hg forget i |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
571 $ rm i |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
572 |
16810
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
573 amend |
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
574 |
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
575 $ echo amend >> a |
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
576 $ echo amend >> b |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
577 $ hg -q commit -d '14 1' -m 'prepare amend' |
16810
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
578 |
17098
09305d7745dd
tests: don't use dates before epoch in test-keyword.t
Mads Kiilerich <mads@kiilerich.com>
parents:
17028
diff
changeset
|
579 $ hg --debug commit --amend -d '15 1' -m 'amend without changes' | grep keywords |
16810
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
580 overwriting a expanding keywords |
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
581 $ hg -q id |
17811
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17537
diff
changeset
|
582 67d8c481a6be |
16810
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
583 $ head -1 a |
17811
a8aba2921456
amend: add noise in extra to avoid creating obsolescence cycle (issue3664)
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
17537
diff
changeset
|
584 expand $Id: a,v 67d8c481a6be 1970/01/01 00:00:15 test $ |
16810
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
585 |
23621
bb679344c88d
keyword: update test file syntax
Christian Ebert <blacktrash@gmx.net>
parents:
22589
diff
changeset
|
586 $ hg -q strip --no-backup tip |
16810
846607ff274f
keyword: support commit --amend (issue3471)
Christian Ebert <blacktrash@gmx.net>
parents:
16623
diff
changeset
|
587 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
588 Test patch queue repo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
589 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
590 $ hg init --mq |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
591 $ hg qimport -r tip -n mqtest.diff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
592 $ hg commit --mq -m mqtest |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
593 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
594 Keywords should not be expanded in patch |
11252
56f306238256
keyword: force dirstate normal when all changes in a file are recorded
Christian Ebert <blacktrash@gmx.net>
parents:
11065
diff
changeset
|
595 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
596 $ cat .hg/patches/mqtest.diff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
597 # HG changeset patch |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
598 # User User Name <user@example.com> |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
599 # Date 1 0 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
18462
diff
changeset
|
600 # Thu Jan 01 00:00:01 1970 +0000 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
601 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
602 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
603 cndiff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
604 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
605 diff -r ef63ca68695b -r 40a904bbbe4c c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
606 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
607 +++ b/c Thu Jan 01 00:00:01 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
608 @@ -0,0 +1,2 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
609 +$Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
610 +tests for different changenodes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
611 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
612 $ hg qpop |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
613 popping mqtest.diff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
614 patch queue now empty |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
615 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
616 qgoto, implying qpush, should expand |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
617 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
618 $ hg qgoto mqtest.diff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
619 applying mqtest.diff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
620 now at: mqtest.diff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
621 $ cat c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
622 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
623 tests for different changenodes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
624 $ hg cat c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
625 $Id: c,v 40a904bbbe4c 1970/01/01 00:00:01 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
626 tests for different changenodes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
627 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
628 Keywords should not be expanded in filelog |
11046
6e9b9f6c117c
keyword: test recording
Christian Ebert <blacktrash@gmx.net>
parents:
11044
diff
changeset
|
629 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
630 $ hg --config 'extensions.keyword=!' cat c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
631 $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
632 tests for different changenodes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
633 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
634 qpop and move on |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
635 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
636 $ hg qpop |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
637 popping mqtest.diff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
638 patch queue now empty |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
639 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
640 Copy and show added kwfiles |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
641 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
642 $ hg cp a c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
643 $ hg kwfiles |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
644 a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
645 c |
5856
85888efbdfff
keyword: test that expansion is done filewise
Christian Ebert <blacktrash@gmx.net>
parents:
5855
diff
changeset
|
646 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
647 Commit and show expansion in original and copy |
5816 | 648 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
649 $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>' |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
650 committing files: |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
651 c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
652 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292 |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
653 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
654 committing changelog |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
655 overwriting c expanding keywords |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30460
diff
changeset
|
656 updating the branch cache |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
657 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
658 $ cat a c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
659 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
660 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
661 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
662 expand $Id: c,v 25736cf2f5cb 1970/01/01 00:00:01 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
663 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
664 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
665 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
666 Touch copied c and check its status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
667 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
668 $ touch c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
669 $ hg status |
5816 | 670 |
12626
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
671 Copy kwfile to keyword ignored file unexpanding keywords |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
672 |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
673 $ hg --verbose copy a i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
674 copying a to i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
675 overwriting i shrinking keywords |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
676 $ head -n 1 i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
677 expand $Id$ |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
678 $ hg forget i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
679 $ rm i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
680 |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
681 Copy ignored file to ignored file: no overwriting |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
682 |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
683 $ hg --verbose copy b i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
684 copying b to i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
685 $ hg forget i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
686 $ rm i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
687 |
13069
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
688 cp symlink file; hg cp -A symlink file (part1) |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
689 - copied symlink points to kwfile: overwrite |
12626
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
690 |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
691 #if symlink |
12626
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
692 $ cp sym i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
693 $ ls -l i |
12647
60c7ae35fcbe
test-keyword: fix test glob to ACL/SELinux flag
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
694 -rw-r--r--* (glob) |
12626
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
695 $ head -1 i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
696 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
697 $ hg copy --after --verbose sym i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
698 copying sym to i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
699 overwriting i shrinking keywords |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
700 $ head -1 i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
701 expand $Id$ |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
702 $ hg forget i |
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
703 $ rm i |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
704 #endif |
12626
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
705 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
706 Test different options of hg kwfiles |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
707 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
708 $ hg kwfiles |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
709 a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
710 c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
711 $ hg -v kwfiles --ignore |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
712 I b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
713 I sym |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
714 $ hg kwfiles --all |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
715 K a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
716 K c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
717 I b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
718 I sym |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
719 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
720 Diff specific revision |
5816 | 721 |
12102
9aba4ceb654d
test-keyword: use regular expressions instead of grepping
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
11905
diff
changeset
|
722 $ hg diff --rev 1 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
723 diff -r ef63ca68695b c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
724 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
725 +++ b/c * (glob) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
726 @@ -0,0 +1,3 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
727 +expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
728 +do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
729 +xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
730 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
731 Status after rollback: |
5816 | 732 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
733 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
734 repository tip rolled back to revision 1 (undo commit) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
735 working directory now based on revision 1 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
736 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
737 A c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
738 $ hg update --clean |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
739 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
740 |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16810
diff
changeset
|
741 #if symlink |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16810
diff
changeset
|
742 |
13069
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
743 cp symlink file; hg cp -A symlink file (part2) |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
744 - copied symlink points to kw ignored file: do not overwrite |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
745 |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
746 $ cat a > i |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
747 $ ln -s i symignored |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
748 $ hg commit -Am 'fake expansion in ignored and symlink' i symignored |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
749 $ cp symignored x |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
750 $ hg copy --after --verbose symignored x |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
751 copying symignored to x |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
752 $ head -n 1 x |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
753 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
754 $ hg forget x |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
755 $ rm x |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
756 |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
757 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
758 repository tip rolled back to revision 1 (undo commit) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
759 working directory now based on revision 1 |
13069
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
760 $ hg update --clean |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
761 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
762 $ rm i symignored |
6aff4f144ad3
keyword: copy: when copied source is a symlink, follow it
Christian Ebert <blacktrash@gmx.net>
parents:
12847
diff
changeset
|
763 |
16908
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16810
diff
changeset
|
764 #endif |
6a997aacba5d
tests: convert some 'hghave symlink' to #if
Mads Kiilerich <mads@kiilerich.com>
parents:
16810
diff
changeset
|
765 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
766 Custom keywordmaps as argument to kwdemo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
767 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
768 $ hg --quiet kwdemo "Xinfo = {author}: {desc}" |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
769 [extensions] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
770 keyword = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
771 [keyword] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
772 ** = |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
773 b = ignore |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
774 demo.txt = |
12626
41df968a54c9
keyword: support copy and rename
Christian Ebert <blacktrash@gmx.net>
parents:
12587
diff
changeset
|
775 i = ignore |
13298
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13069
diff
changeset
|
776 [keywordset] |
f715e6bd8091
keyword: inform user about current keywordset in kwdemo
Christian Ebert <blacktrash@gmx.net>
parents:
13069
diff
changeset
|
777 svn = False |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
778 [keywordmaps] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
779 Xinfo = {author}: {desc} |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
780 $Xinfo: test: hg keyword configuration and expansion example $ |
5816 | 781 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
782 Configure custom keywordmaps |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
783 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
784 $ cat <<EOF >>$HGRCPATH |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
785 > [keywordmaps] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
786 > Id = {file} {node|short} {date|rfc822date} {author|user} |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
787 > Xinfo = {author}: {desc} |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
788 > EOF |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
789 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
790 Cat and hg cat files before custom expansion |
5816 | 791 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
792 $ cat a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
793 expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
794 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
795 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
796 ignore $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
797 $ hg cat sym a b && echo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
798 expand $Id: a ef63ca68695b Thu, 01 Jan 1970 00:00:00 +0000 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
799 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
800 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
801 ignore $Id$ |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12638
diff
changeset
|
802 a |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
803 |
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
804 Write custom keyword and prepare multi-line commit message |
5816 | 805 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
806 $ echo '$Xinfo$' >> a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
807 $ cat <<EOF >> log |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
808 > firstline |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
809 > secondline |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
810 > EOF |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
811 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
812 Interrupted commit should not change state |
5816 | 813 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
814 $ hg commit |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
815 abort: empty commit message |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
816 [255] |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
817 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
818 M a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
819 ? c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
820 ? log |
5816 | 821 |
17424
e7cfe3587ea4
fix trivial spelling errors
Mads Kiilerich <mads@kiilerich.com>
parents:
17345
diff
changeset
|
822 Commit with multi-line message and custom expansion |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
823 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
824 $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>' |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
825 committing files: |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
826 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
827 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
828 committing changelog |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
829 overwriting a expanding keywords |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30460
diff
changeset
|
830 updating the branch cache |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
831 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
832 $ rm log |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
833 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
834 Stat, verify and show custom expansion (firstline) |
5816 | 835 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
836 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
837 ? c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
838 $ hg verify |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
839 checking changesets |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
840 checking manifests |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
841 crosschecking files in changesets and manifests |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
842 checking files |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
843 3 files, 3 changesets, 4 total revisions |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
844 $ cat a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
845 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
846 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
847 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
848 $Xinfo: User Name <user@example.com>: firstline $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
849 ignore $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
850 $ hg cat sym a b && echo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
851 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
852 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
853 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
854 $Xinfo: User Name <user@example.com>: firstline $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
855 ignore $Id$ |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12638
diff
changeset
|
856 a |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
857 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
858 annotate |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
859 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
860 $ hg annotate a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
861 1: expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
862 1: do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
863 1: xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
864 2: $Xinfo$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
865 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
866 remove with status checks |
5816 | 867 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
868 $ hg debugrebuildstate |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
869 $ hg remove a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
870 $ hg --debug commit -m rma |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
871 committing files: |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
872 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
873 committing changelog |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30460
diff
changeset
|
874 updating the branch cache |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
875 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
876 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
877 ? c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
878 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
879 Rollback, revert, and check expansion |
5816 | 880 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
881 $ hg rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
882 repository tip rolled back to revision 2 (undo commit) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
883 working directory now based on revision 2 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
884 $ hg status |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
885 R a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
886 ? c |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
887 $ hg revert --no-backup --rev tip a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
888 $ cat a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
889 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
890 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
891 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
892 $Xinfo: User Name <user@example.com>: firstline $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
893 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
894 Clone to test global and local configurations |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
895 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
896 $ cd .. |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
897 |
17485 | 898 Expansion in destination with global configuration |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
899 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
900 $ hg --quiet clone Test globalconf |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
901 $ cat globalconf/a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
902 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
903 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
904 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
905 $Xinfo: User Name <user@example.com>: firstline $ |
5816 | 906 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
907 No expansion in destination with local configuration in origin only |
5816 | 908 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
909 $ hg --quiet --config 'keyword.**=ignore' clone Test localconf |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
910 $ cat localconf/a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
911 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
912 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
913 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
914 $Xinfo$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
915 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
916 Clone to test incoming |
11678
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
917 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
918 $ hg clone -r1 Test Test-a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
919 adding changesets |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
920 adding manifests |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
921 adding file changes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
922 added 2 changesets with 3 changes to 3 files |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
34310
diff
changeset
|
923 new changesets a2392c293916:ef63ca68695b |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
924 updating to branch default |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
925 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
926 $ cd Test-a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
927 $ cat <<EOF >> .hg/hgrc |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
928 > [paths] |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
929 > default = ../Test |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
930 > EOF |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
931 $ hg incoming |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
34661
diff
changeset
|
932 comparing with $TESTTMP/Test |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
933 searching for changes |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
934 changeset: 2:bb948857c743 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
935 tag: tip |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
936 user: User Name <user@example.com> |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
937 date: Thu Jan 01 00:00:02 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
938 summary: firstline |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
939 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
940 Imported patch should not be rejected |
11678
f5aa20e177c0
keyword: move collecting of [keyword] patterns to reposetup (issue2303)
Christian Ebert <blacktrash@gmx.net>
parents:
11252
diff
changeset
|
941 |
15556
e5804c0f6576
test-keyword: use inline doctest syntax
Christian Ebert <blacktrash@gmx.net>
parents:
15501
diff
changeset
|
942 >>> import re |
e5804c0f6576
test-keyword: use inline doctest syntax
Christian Ebert <blacktrash@gmx.net>
parents:
15501
diff
changeset
|
943 >>> text = re.sub(r'(Id.*)', r'\1 rejecttest', open('a').read()) |
e5804c0f6576
test-keyword: use inline doctest syntax
Christian Ebert <blacktrash@gmx.net>
parents:
15501
diff
changeset
|
944 >>> open('a', 'wb').write(text) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
945 $ hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>' |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
946 committing files: |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
947 a |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
948 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
949 committing changelog |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
950 overwriting a expanding keywords |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30460
diff
changeset
|
951 updating the branch cache |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
952 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
953 $ hg export -o ../rejecttest.diff tip |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
954 $ cd ../Test |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
955 $ hg import ../rejecttest.diff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
956 applying ../rejecttest.diff |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
957 $ cat a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
958 expand $Id: a 4e0994474d25 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
959 do not process $Id: rejecttest |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
960 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
961 $Xinfo: User Name <user@example.com>: rejects? $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
962 ignore $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
963 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
964 $ hg rollback |
15198
62dc0e7ab092
import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
15075
diff
changeset
|
965 repository tip rolled back to revision 2 (undo import) |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13298
diff
changeset
|
966 working directory now based on revision 2 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
967 $ hg update --clean |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
968 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
969 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
970 kwexpand/kwshrink on selected files |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
971 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
972 $ mkdir x |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
973 $ hg copy a x/a |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
974 $ hg --verbose kwshrink a |
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
975 overwriting a shrinking keywords |
15075
77325c92db95
keyword: make status test after record and kwexpand/kwshrink reliable
Christian Ebert <blacktrash@gmx.net>
parents:
15070
diff
changeset
|
976 - sleep required for dirstate.normal() check |
77325c92db95
keyword: make status test after record and kwexpand/kwshrink reliable
Christian Ebert <blacktrash@gmx.net>
parents:
15070
diff
changeset
|
977 $ sleep 1 |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
978 $ hg status a |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
979 $ hg --verbose kwexpand a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
980 overwriting a expanding keywords |
12844
a1b49b9a0328
keyword: fix regressions introduced in d87f3ff904ba
Christian Ebert <blacktrash@gmx.net>
parents:
12684
diff
changeset
|
981 $ hg status a |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
982 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
983 kwexpand x/a should abort |
5816 | 984 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
985 $ hg --verbose kwexpand x/a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
986 abort: outstanding uncommitted changes |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
987 [255] |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
988 $ cd x |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
989 $ hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>' |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
990 committing files: |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
991 x/a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
992 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
993 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
994 committing changelog |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
995 overwriting x/a expanding keywords |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30460
diff
changeset
|
996 updating the branch cache |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
997 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
998 $ cat a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
999 expand $Id: x/a b4560182a3f9 Thu, 01 Jan 1970 00:00:03 +0000 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1000 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1001 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1002 $Xinfo: User Name <user@example.com>: xa $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1003 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1004 kwshrink a inside directory x |
5816 | 1005 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1006 $ hg --verbose kwshrink a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1007 overwriting x/a shrinking keywords |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1008 $ cat a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1009 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1010 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1011 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1012 $Xinfo$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1013 $ cd .. |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1014 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1015 kwexpand nonexistent |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1016 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1017 $ hg kwexpand nonexistent |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
1018 nonexistent:* (glob) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1019 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1020 |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
1021 #if serve |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1022 hg serve |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1023 - expand with hgweb file |
33065
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
1024 - no expansion with hgweb annotate/changeset/filediff/comparison |
33064
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1025 - expand with hgweb file, again |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1026 - check errors |
5816 | 1027 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1028 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1029 $ cat hg.pid >> $DAEMON_PIDS |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
24845
diff
changeset
|
1030 $ get-with-headers.py localhost:$HGPORT 'file/tip/a/?style=raw' |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1031 200 Script output follows |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1032 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1033 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1034 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1035 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1036 $Xinfo: User Name <user@example.com>: firstline $ |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
24845
diff
changeset
|
1037 $ get-with-headers.py localhost:$HGPORT 'annotate/tip/a/?style=raw' |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1038 200 Script output follows |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1039 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1040 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1041 user@1: expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1042 user@1: do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1043 user@1: xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1044 user@2: $Xinfo$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1045 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1046 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1047 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1048 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
24845
diff
changeset
|
1049 $ get-with-headers.py localhost:$HGPORT 'rev/tip/?style=raw' |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1050 200 Script output follows |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1051 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1052 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1053 # HG changeset patch |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1054 # User User Name <user@example.com> |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1055 # Date 3 0 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1056 # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1057 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1058 xa |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1059 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1060 diff -r bb948857c743 -r b4560182a3f9 x/a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1061 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1062 +++ b/x/a Thu Jan 01 00:00:03 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1063 @@ -0,0 +1,4 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1064 +expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1065 +do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1066 +xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1067 +$Xinfo$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1068 |
25472
4d2b9b304ad0
tests: drop explicit $TESTDIR from executables
Matt Mackall <mpm@selenic.com>
parents:
24845
diff
changeset
|
1069 $ get-with-headers.py localhost:$HGPORT 'diff/bb948857c743/a?style=raw' |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1070 200 Script output follows |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1071 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1072 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1073 diff -r ef63ca68695b -r bb948857c743 a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1074 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1075 +++ b/a Thu Jan 01 00:00:02 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1076 @@ -1,3 +1,4 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1077 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1078 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1079 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1080 +$Xinfo$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1081 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1082 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1083 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1084 |
33065
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
1085 $ get-with-headers.py localhost:$HGPORT 'comparison/bb948857c743/a' | grep '\$[a-zA-Z]' |
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
1086 <td class="source equal"><a href="#l1r1"> 1</a> expand $Id$</td> |
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
1087 <td class="source equal"><a href="#l1r1"> 1</a> expand $Id$</td> |
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
1088 <td class="source equal"><a href="#l2r2"> 2</a> do not process $Id:</td> |
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
1089 <td class="source equal"><a href="#l2r2"> 2</a> do not process $Id:</td> |
0afdc1a4f925
keyword: make comparison webcommand suppress keyword expansion
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33064
diff
changeset
|
1090 <td class="source insert"><a href="#r4"> 4</a> $Xinfo$</td> |
33064
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1091 |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1092 (check "kwweb_skip"-ed webcommand doesn't suppress expanding keywords |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1093 at subsequent webcommands) |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1094 |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1095 $ get-with-headers.py localhost:$HGPORT 'file/tip/a/?style=raw' |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1096 200 Script output follows |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1097 |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1098 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1099 do not process $Id: |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1100 xxx $ |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1101 $Xinfo: User Name <user@example.com>: firstline $ |
9062458febca
keyword: restore kwtemplater.match at the end of wrapped webcommands
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33063
diff
changeset
|
1102 |
33066
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1103 $ killdaemons.py |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1104 $ cat errors.log |
17099
1c55d1add24f
test-keyword: adapt for Windows
Adrian Buehlmann <adrian@cadifra.com>
parents:
17098
diff
changeset
|
1105 #endif |
5816 | 1106 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1107 Prepare merge and resolve tests |
5816 | 1108 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1109 $ echo '$Id$' > m |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1110 $ hg add m |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
17099
diff
changeset
|
1111 $ hg commit -m 4kw |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1112 $ echo foo >> m |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1113 $ hg commit -m 5foo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1114 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1115 simplemerge |
6927
959113c5e1cd
keyword: thorough hgweb testing
Christian Ebert <blacktrash@gmx.net>
parents:
6867
diff
changeset
|
1116 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1117 $ hg update 4 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1118 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1119 $ echo foo >> m |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1120 $ hg commit -m 6foo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1121 created new head |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1122 $ hg merge |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1123 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1124 (branch merge, don't forget to commit) |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1125 $ hg commit -m simplemerge |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1126 $ cat m |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1127 $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1128 foo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1129 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1130 conflict: keyword should stay outside conflict zone |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1131 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1132 $ hg update 4 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1133 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1134 $ echo bar >> m |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1135 $ hg commit -m 8bar |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1136 created new head |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1137 $ hg merge |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1138 merging m |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25472
diff
changeset
|
1139 warning: conflicts while merging m! (edit, then use 'hg resolve --mark') |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1140 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
12314
f2daa6ab514a
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents:
12102
diff
changeset
|
1141 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
1142 [1] |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1143 $ cat m |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1144 $Id$ |
30062
940c05b25b07
merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents:
29634
diff
changeset
|
1145 <<<<<<< working copy: 88a80c8d172e - test: 8bar |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1146 bar |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1147 ======= |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1148 foo |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30062
diff
changeset
|
1149 >>>>>>> merge rev: 85d2d2d732a5 - test: simplemerge |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1150 |
23622
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23621
diff
changeset
|
1151 resolve to local, m must contain hash of last change (local parent) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1152 |
23621
bb679344c88d
keyword: update test file syntax
Christian Ebert <blacktrash@gmx.net>
parents:
22589
diff
changeset
|
1153 $ hg resolve -t internal:local -a |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21789
diff
changeset
|
1154 (no more unresolved files) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1155 $ hg commit -m localresolve |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1156 $ cat m |
23622
cb9d845406e5
keyword: handle resolve to either parent
Christian Ebert <blacktrash@gmx.net>
parents:
23621
diff
changeset
|
1157 $Id: m 88a80c8d172e Thu, 01 Jan 1970 00:00:00 +0000 test $ |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1158 bar |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1159 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1160 Test restricted mode with transplant -b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1161 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1162 $ hg update 6 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1163 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1164 $ hg branch foo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1165 marked working directory as branch foo |
15615 | 1166 (branches are permanent and global, did you want a bookmark?) |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1167 $ mv a a.bak |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1168 $ echo foobranch > a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1169 $ cat a.bak >> a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1170 $ rm a.bak |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1171 $ hg commit -m 9foobranch |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1172 $ hg update default |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1173 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1174 $ hg -y transplant -b foo tip |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1175 applying 4aa30d025d50 |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14116
diff
changeset
|
1176 4aa30d025d50 transplanted to e00abbf63521 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1177 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1178 Expansion in changeset but not in file |
6933
17bdcd59b9ad
keyword: avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net>
parents:
6927
diff
changeset
|
1179 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1180 $ hg tip -p |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14116
diff
changeset
|
1181 changeset: 11:e00abbf63521 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1182 tag: tip |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14116
diff
changeset
|
1183 parent: 9:800511b3a22d |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1184 user: test |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1185 date: Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1186 summary: 9foobranch |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1187 |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14116
diff
changeset
|
1188 diff -r 800511b3a22d -r e00abbf63521 a |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1189 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1190 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1191 @@ -1,3 +1,4 @@ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1192 +foobranch |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1193 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1194 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1195 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1196 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1197 $ head -n 2 a |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1198 foobranch |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
14116
diff
changeset
|
1199 expand $Id: a e00abbf63521 Thu, 01 Jan 1970 00:00:00 +0000 test $ |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1200 |
12495
6401e8547427
test-keyword: fix typo, rephrase
Christian Ebert <blacktrash@gmx.net>
parents:
12376
diff
changeset
|
1201 Turn off expansion |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1202 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1203 $ hg -q rollback |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1204 $ hg -q update -C |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1205 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1206 kwshrink with unknown file u |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1207 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1208 $ cp a u |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1209 $ hg --verbose kwshrink |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1210 overwriting a shrinking keywords |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1211 overwriting m shrinking keywords |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1212 overwriting x/a shrinking keywords |
10117
98867145f4b5
keyword: go into restricted mode when transplanting
Christian Ebert <blacktrash@gmx.net>
parents:
9602
diff
changeset
|
1213 |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1214 Keywords shrunk in working directory, but not yet disabled |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1215 - cat shows unexpanded keywords |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1216 - hg cat shows expanded keywords |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1217 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1218 $ cat a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1219 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1220 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1221 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1222 $Xinfo$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1223 ignore $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1224 $ hg cat sym a b && echo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1225 expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1226 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1227 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1228 $Xinfo: User Name <user@example.com>: firstline $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1229 ignore $Id$ |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12638
diff
changeset
|
1230 a |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1231 |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1232 Now disable keyword expansion |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1233 |
21703
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1234 $ cp $HGRCPATH $HGRCPATH.backup |
11905
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1235 $ rm "$HGRCPATH" |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1236 $ cat a b |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1237 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1238 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1239 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1240 $Xinfo$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1241 ignore $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1242 $ hg cat sym a b && echo |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1243 expand $Id$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1244 do not process $Id: |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1245 xxx $ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1246 $Xinfo$ |
0b84864d1325
tests: drop big sed from test-keyword.t
Matt Mackall <mpm@selenic.com>
parents:
11678
diff
changeset
|
1247 ignore $Id$ |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12638
diff
changeset
|
1248 a |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
1249 |
21703
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1250 enable keyword expansion again |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1251 |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1252 $ cat $HGRCPATH.backup >> $HGRCPATH |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1253 |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1254 Test restricted mode with unshelve |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1255 |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1256 $ cat <<EOF >> $HGRCPATH |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1257 > [extensions] |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1258 > shelve = |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1259 > EOF |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1260 |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1261 $ echo xxxx >> a |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1262 $ hg diff |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1263 diff -r 800511b3a22d a |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1264 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1265 +++ b/a * (glob) |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1266 @@ -2,3 +2,4 @@ |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1267 do not process $Id: |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1268 xxx $ |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1269 $Xinfo$ |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1270 +xxxx |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1271 $ hg shelve -q --name tmp |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1272 $ hg shelve --list --patch |
27092
156985f2dec0
shelve: use colon instead of quotes in 'changes to' description
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
1273 tmp (*)* changes to: localresolve (glob) |
21703
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1274 |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1275 diff --git a/a b/a |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1276 --- a/a |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1277 +++ b/a |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1278 @@ -2,3 +2,4 @@ |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1279 do not process $Id: |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1280 xxx $ |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1281 $Xinfo$ |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1282 +xxxx |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1283 |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1284 $ hg update -q -C 10 |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1285 $ hg unshelve -q tmp |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1286 $ hg diff |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1287 diff -r 4aa30d025d50 a |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1288 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1289 +++ b/a * (glob) |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1290 @@ -3,3 +3,4 @@ |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1291 do not process $Id: |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1292 xxx $ |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1293 $Xinfo$ |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1294 +xxxx |
99f7e5fe35f2
keyword: suppress keyword expansion while 'hg unshelve' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
18648
diff
changeset
|
1295 |
21704
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1296 Test restricted mode with rebase |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1297 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1298 $ cat <<EOF >> $HGRCPATH |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1299 > [extensions] |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1300 > rebase = |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1301 > EOF |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1302 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1303 $ hg update -q -C 9 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1304 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1305 $ echo xxxx >> a |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1306 $ hg commit -m '#11' |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1307 $ hg diff -c 11 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1308 diff -r 800511b3a22d -r b07670694489 a |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1309 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1310 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1311 @@ -2,3 +2,4 @@ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1312 do not process $Id: |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1313 xxx $ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1314 $Xinfo$ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1315 +xxxx |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1316 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1317 $ hg diff -c 10 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1318 diff -r 27d48ee14f67 -r 4aa30d025d50 a |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1319 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1320 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1321 @@ -1,3 +1,4 @@ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1322 +foobranch |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1323 expand $Id$ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1324 do not process $Id: |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1325 xxx $ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1326 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1327 $ hg rebase -q -s 10 -d 11 --keep |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1328 $ hg diff -r 9 -r 12 a |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1329 diff -r 800511b3a22d -r 1939b927726c a |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1330 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1331 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1332 @@ -1,4 +1,6 @@ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1333 +foobranch |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1334 expand $Id$ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1335 do not process $Id: |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1336 xxx $ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1337 $Xinfo$ |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1338 +xxxx |
65dd65c645ed
keyword: suppress keyword expansion while 'hg rebase' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21703
diff
changeset
|
1339 |
21705
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1340 Test restricted mode with graft |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1341 |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1342 $ hg graft -q 10 |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1343 $ hg diff -r 9 -r 13 a |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1344 diff -r 800511b3a22d -r 01a68de1003a a |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1345 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1346 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1347 @@ -1,4 +1,6 @@ |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1348 +foobranch |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1349 expand $Id$ |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1350 do not process $Id: |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1351 xxx $ |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1352 $Xinfo$ |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1353 +xxxx |
dd5ca1a32109
keyword: suppress keyword expansion while 'hg graft' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21704
diff
changeset
|
1354 |
21706
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1355 Test restricted mode with backout |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1356 |
27890
ce76c4d2b85c
backout: commit changeset by default (BC)
Ruslan Sayfutdinov <sayfutdinov@fb.com>
parents:
27192
diff
changeset
|
1357 $ hg backout -q 11 --no-commit |
21706
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1358 $ hg diff a |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1359 diff -r 01a68de1003a a |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1360 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1361 +++ b/a * (glob) |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1362 @@ -3,4 +3,3 @@ |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1363 do not process $Id: |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1364 xxx $ |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1365 $Xinfo$ |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1366 -xxxx |
5c64c338fa9f
keyword: suppress keyword expansion while 'hg backout' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21705
diff
changeset
|
1367 |
21707
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1368 Test restricted mode with histedit |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1369 |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1370 $ cat <<EOF >> $HGRCPATH |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1371 > [extensions] |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1372 > histedit = |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1373 > EOF |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1374 |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1375 $ hg commit -m 'backout #11' |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1376 $ hg histedit -q --command - 13 <<EOF |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1377 > pick 49f5f2d940c3 14 backout #11 |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1378 > pick 01a68de1003a 13 9foobranch |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1379 > EOF |
e22cfd1ae97c
keyword: suppress keyword expansion while 'hg histedit' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21706
diff
changeset
|
1380 |
21708
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1381 Test restricted mode with fetch (with merge) |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1382 |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1383 $ cat <<EOF >> $HGRCPATH |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1384 > [extensions] |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1385 > fetch = |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1386 > EOF |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1387 |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1388 $ hg clone -q -r 9 . ../fetch-merge |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1389 $ cd ../fetch-merge |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1390 $ hg -R ../Test export 10 | hg import -q - |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1391 $ hg fetch -q -r 11 |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1392 $ hg diff -r 9 a |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1393 diff -r 800511b3a22d a |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1394 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1395 +++ b/a * (glob) |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1396 @@ -1,4 +1,6 @@ |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1397 +foobranch |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1398 expand $Id$ |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1399 do not process $Id: |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1400 xxx $ |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1401 $Xinfo$ |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1402 +xxxx |
2668a78df8ba
keyword: suppress keyword expansion while 'hg fetch' for internal merge
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21707
diff
changeset
|
1403 |
33063
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1404 Test that patch.diff(), which is implied by "hg diff" or so, doesn't |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1405 suppress expanding keywords at subsequent commands |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1406 |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1407 #if windows |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1408 $ PYTHONPATH="$TESTDIR/../contrib;$PYTHONPATH" |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1409 #else |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1410 $ PYTHONPATH="$TESTDIR/../contrib:$PYTHONPATH" |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1411 #endif |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1412 $ export PYTHONPATH |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1413 |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1414 $ grep -v '^promptecho ' < $HGRCPATH >> $HGRCPATH.new |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1415 $ mv $HGRCPATH.new $HGRCPATH |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1416 |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1417 >>> from __future__ import print_function |
33961
237d2502ee6e
tests: update test-keyword to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33066
diff
changeset
|
1418 >>> from hgclient import check, readchannel, runcommand |
33063
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1419 >>> @check |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1420 ... def check(server): |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1421 ... # hello block |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1422 ... readchannel(server) |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1423 ... |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1424 ... runcommand(server, ['cat', 'm']) |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1425 ... runcommand(server, ['diff', '-c', '.', 'm']) |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1426 ... runcommand(server, ['cat', 'm']) |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1427 *** runcommand cat m |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1428 $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $ |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1429 bar |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1430 *** runcommand diff -c . m |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1431 *** runcommand cat m |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1432 $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $ |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1433 bar |
7f569ce30216
keyword: restore kwtemplater.restrict at the end of wrapped patch.diff
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
32267
diff
changeset
|
1434 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16908
diff
changeset
|
1435 $ cd .. |
33066
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1436 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1437 #if serve |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1438 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1439 Test that keywords are expanded only in repositories, which enable |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1440 keyword extension, even if multiple repositories are served in a |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1441 process |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1442 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1443 $ cat >> fetch-merge/.hg/hgrc <<EOF |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1444 > [extensions] |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1445 > keyword = ! |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1446 > EOF |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1447 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1448 $ cat > paths.conf <<EOF |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1449 > [paths] |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1450 > enabled=Test |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1451 > disabled=fetch-merge |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1452 > EOF |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1453 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1454 $ hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E error.log --webdir-conf paths.conf |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1455 $ cat hg.pid >> $DAEMON_PIDS |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1456 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1457 $ get-with-headers.py localhost:$HGPORT 'enabled/file/tip/m/?style=raw' |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1458 200 Script output follows |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1459 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1460 $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $ |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1461 bar |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1462 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1463 $ get-with-headers.py localhost:$HGPORT 'disabled/file/tip/m/?style=raw' |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1464 200 Script output follows |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1465 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1466 $Id$ |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1467 bar |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1468 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1469 (check expansion again, for safety) |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1470 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1471 $ get-with-headers.py localhost:$HGPORT 'enabled/file/tip/m/?style=raw' |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1472 200 Script output follows |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1473 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1474 $Id: m 800511b3a22d Thu, 01 Jan 1970 00:00:00 +0000 test $ |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1475 bar |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1476 |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1477 $ killdaemons.py |
cf0da12afe8a
keyword: add test for keyword expansion at serving multiple repositories
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
33065
diff
changeset
|
1478 #endif |