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