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