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