mercurial-scm/hg-stable: tests/test-keyword.t annotate

annotate tests/test-keyword.t @ 12626:41df968a54c9

keyword: support copy and rename copy/rename destinations being unversioned and possibly ignored by the extension should not contain expanded keywords. Files copied/renamed from an ignored source are not touched. Add tests covering both of the above cases, plus the corner case of cp symlink foo; hg cp -A symlink foo (where foo becomes a regular file).

author	Christian Ebert <blacktrash@gmx.net>
date	Fri, 08 Oct 2010 18:39:46 +0100
parents	e3247ceaca5e
children	c623752b1af5

rev	line source
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	1 $ cat <<EOF >> $HGRCPATH
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	2 > [extensions]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	3 > keyword =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	4 > mq =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	5 > notify =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	6 > record =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	7 > transplant =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	8 > [ui]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	9 > interactive = true
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	10 > EOF
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	11
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	12 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	13 as it would succeed without uisetup otherwise
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	14
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	15 $ hg --quiet kwdemo
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 [keyword]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	19 demo.txt =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	20 [keywordmaps]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	21 Author = {author\|user}
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	22 Date = {date\|utcdate}
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	23 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	24 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	25 RCSFile = {file\|basename},v
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	26 RCSfile = {file\|basename},v
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	27 Revision = {node\|short}
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	28 Source = {root}/{file},v
12372 5163e3c8aa52 tests: improve regexes in unified tests Brodie Rao <brodie@bitheap.org> parents: 12316 diff changeset	29 $Author: test $
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	30 $Date: ????/??/?? ??:??:?? $ (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	31 $Header: */demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	32 $Id: demo.txt,v ???????????? ????/??/?? ??:??:?? test $ (glob)
12372 5163e3c8aa52 tests: improve regexes in unified tests Brodie Rao <brodie@bitheap.org> parents: 12316 diff changeset	33 $RCSFile: demo.txt,v $
5163e3c8aa52 tests: improve regexes in unified tests Brodie Rao <brodie@bitheap.org> parents: 12316 diff changeset	34 $RCSfile: demo.txt,v $
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	35 $Revision: ???????????? $ (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	36 $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	37
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	38 $ hg --quiet kwdemo "Branch = {branches}"
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	39 [extensions]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	40 keyword =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	41 [keyword]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	42 demo.txt =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	43 [keywordmaps]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	44 Branch = {branches}
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	45 $Branch: demobranch $
9462 1f54b1b7122f test-keyword: run kwdemo before setting up [keyword] files Christian Ebert <blacktrash@gmx.net> parents: 9306 diff changeset	46
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	47 $ cat <<EOF >> $HGRCPATH
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	48 > [keyword]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	49 > ** =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	50 > b = ignore
12626 41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	51 > i = ignore
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	52 > [hooks]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	53 > commit=
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	54 > commit.test=cp a hooktest
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	55 > EOF
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	56
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	57 $ hg init Test-bndl
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	58 $ cd Test-bndl
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	59
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	60 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	61
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	62 $ hg kwshrink
9462 1f54b1b7122f test-keyword: run kwdemo before setting up [keyword] files Christian Ebert <blacktrash@gmx.net> parents: 9306 diff changeset	63
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	64 Symlinks cannot be created on Windows.
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	65 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	66 hg init t
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	67 cd t
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	68 echo a > a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	69 ln -s a sym
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	70 hg add sym
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	71 hg ci -m addsym -u mercurial
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	72 hg bundle --base null ../test-keyword.hg
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	73
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	74 $ hg pull -u "$TESTDIR"/test-keyword.hg
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	75 pulling from *test-keyword.hg (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	76 requesting all changes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	77 adding changesets
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	78 adding manifests
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	79 adding file changes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	80 added 1 changesets with 1 changes to 1 files
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	81 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	82
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	83 $ echo 'expand $Id$' > a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	84 $ echo 'do not process $Id:' >> a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	85 $ echo 'xxx $' >> a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	86 $ echo 'ignore $Id$' > b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	87
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	88 Output files as they were created
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	89
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	90 $ cat a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	91 expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	92 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	93 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	94 ignore $Id$
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 no kwfiles
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	97
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	98 $ hg kwfiles
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	99
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	100 untracked candidates
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	101
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	102 $ hg -v kwfiles --unknown
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	103 k a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	104
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	105 Add files and check status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	106
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	107 $ hg addremove
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	108 adding a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	109 adding b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	110 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	111 A a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	112 A b
6061 de08788511d7 test-keyword: make it run under Windows Patrick Mezard <pmezard@gmail.com> parents: 6051 diff changeset	113
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	114
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	115 Default keyword expansion including commit hook
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	116 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	117
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	118 $ hg --debug commit
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	119 abort: empty commit message
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	120 [255]
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	121 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	122 A a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	123 A b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	124
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	125 Commit with several checks
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	126
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	127 $ hg --debug commit -mabsym -u 'User Name <user@example.com>'
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	128 a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	129 b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	130 overwriting a expanding keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	131 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	132 committed changeset 1:ef63ca68695bc9495032c6fda1350c71e6d256e9
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	133 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	134 ? hooktest
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	135 $ hg debugrebuildstate
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	136 $ hg --quiet identify
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	137 ef63ca68695b
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	138
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	139 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	140
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	141 $ cat a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	142 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	143 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	144 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	145 ignore $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	146
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	147 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	148
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	149 $ hg cat sym a b && echo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	150 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	151 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	152 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	153 ignore $Id$
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	154 a* (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	155
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	156 Test hook execution
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	157
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	158 $ diff a hooktest
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	159
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	160 Removing commit hook from config
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	161
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	162 $ sed -e '/\[hooks\]/,$ d' "$HGRCPATH" > $HGRCPATH.nohook
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	163 $ mv "$HGRCPATH".nohook "$HGRCPATH"
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	164 $ rm hooktest
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	165
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	166 bundle
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 bundle --base null ../kw.hg
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	169 2 changesets found
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	170 $ cd ..
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	171 $ hg init Test
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	172 $ cd Test
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	173
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	174 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	175 ie. if patch.diff wrapper acts as it should
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	176
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	177 $ cat <<EOF >> $HGRCPATH
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	178 > [hooks]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	179 > incoming.notify = python:hgext.notify.hook
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	180 > [notify]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	181 > sources = pull
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	182 > diffstat = False
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	183 > [reposubs]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	184 > * = Test
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	185 > EOF
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	186
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	187 Pull from bundle and trigger notify
6051 1038b1458d7a keyword: safeguards against erroneous behaviour or aborts Christian Ebert <blacktrash@gmx.net> parents: 5894 diff changeset	188
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	189 $ hg pull -u ../kw.hg
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	190 pulling from ../kw.hg
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	191 requesting all changes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	192 adding changesets
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	193 adding manifests
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	194 adding file changes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	195 added 2 changesets with 3 changes to 3 files
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	196 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	197 MIME-Version: 1.0
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	198 Content-Transfer-Encoding: 7bit
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	199 Date: * (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	200 Subject: changeset in * (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	201 From: mercurial
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	202 X-Hg-Notification: changeset a2392c293916
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	203 Message-Id: <hg.a2392c293916*> (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	204 To: Test
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	205
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	206 changeset a2392c293916 in * (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	207 details: *cmd=changeset;node=a2392c293916 (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	208 description:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	209 addsym
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	210
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	211 diffs (6 lines):
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	212
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	213 diff -r 000000000000 -r a2392c293916 sym
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	214 --- /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	215 +++ 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	216 @@ -0,0 +1,1 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	217 +a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	218 \ No newline at end of file
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	219 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	220 MIME-Version: 1.0
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	221 Content-Transfer-Encoding: 7bit
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	222 Date:* (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	223 Subject: changeset in* (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	224 From: User Name <user@example.com>
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	225 X-Hg-Notification: changeset ef63ca68695b
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	226 Message-Id: <hg.ef63ca68695b*> (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	227 To: Test
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	228
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	229 changeset ef63ca68695b in * (glob)
97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	230 details: *cmd=changeset;node=ef63ca68695b (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	231 description:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	232 absym
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	233
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	234 diffs (12 lines):
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	235
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	236 diff -r a2392c293916 -r ef63ca68695b a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	237 --- /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	238 +++ 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	239 @@ -0,0 +1,3 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	240 +expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	241 +do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	242 +xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	243 diff -r a2392c293916 -r ef63ca68695b b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	244 --- /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	245 +++ 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	246 @@ -0,0 +1,1 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	247 +ignore $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	248 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6116 e27f39865d7e keyword: add test for patch.diff monkey Christian Ebert <blacktrash@gmx.net> parents: 6061 diff changeset	249
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	250 Remove notify config
6116 e27f39865d7e keyword: add test for patch.diff monkey Christian Ebert <blacktrash@gmx.net> parents: 6061 diff changeset	251
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	252 $ sed -e '/\[hooks\]/,$ d' "$HGRCPATH" > $HGRCPATH.nonotify
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	253 $ mv "$HGRCPATH".nonotify "$HGRCPATH"
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	254
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	255 Touch files and check with status
6116 e27f39865d7e keyword: add test for patch.diff monkey Christian Ebert <blacktrash@gmx.net> parents: 6061 diff changeset	256
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	257 $ touch a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	258 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	259
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	260 Update and expand
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	261
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	262 $ rm sym a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	263 $ hg update -C
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	264 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	265 $ cat a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	266 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	267 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	268 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	269 ignore $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	270
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	271 Check whether expansion is filewise
6051 1038b1458d7a keyword: safeguards against erroneous behaviour or aborts Christian Ebert <blacktrash@gmx.net> parents: 5894 diff changeset	272
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	273 $ echo '$Id$' > c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	274 $ echo 'tests for different changenodes' >> c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	275
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	276 commit file c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	277
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	278 $ 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	279 adding c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	280
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	281 force expansion
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 $ hg -v kwexpand
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	284 overwriting a expanding keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	285 overwriting c expanding keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	286
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	287 compare changenodes in a and c
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	288
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	289 $ cat a c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	290 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	291 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	292 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	293 $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	294 tests for different changenodes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	295
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	296 record chunk
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	297
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	298 $ python -c \
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	299 > 'l=open("a").readlines();l.insert(1,"foo\n");l.append("bar\n");open("a","w").writelines(l);'
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	300 $ hg record -d '1 10' -m rectest<<EOF
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	301 > y
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	302 > y
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	303 > n
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	304 > EOF
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	305 diff --git a/a b/a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	306 2 hunks, 2 lines changed
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	307 examine changes to 'a'? [Ynsfdaq?]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	308 @@ -1,3 +1,4 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	309 expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	310 +foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	311 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	312 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	313 record change 1/2 to 'a'? [Ynsfdaq?]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	314 @@ -2,2 +3,3 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	315 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	316 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	317 +bar
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	318 record change 2/2 to 'a'? [Ynsfdaq?]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	319
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	320 $ hg identify
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	321 d17e03c92c97+ tip
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	322 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	323 M a
5894 e181665c1c79 keyword: add very simple mq test Christian Ebert <blacktrash@gmx.net> parents: 5856 diff changeset	324
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	325 Cat modified file a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	326
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	327 $ cat a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	328 expand $Id: a,v d17e03c92c97 1970/01/01 00:00:01 test $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	329 foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	330 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	331 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	332 bar
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	333
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	334 Diff remaining chunk
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	335
12102 9aba4ceb654d test-keyword: use regular expressions instead of grepping Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11905 diff changeset	336 $ hg diff
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	337 diff -r d17e03c92c97 a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	338 --- a/a Wed Dec 31 23:59:51 1969 -0000
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	339 +++ b/a * (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	340 @@ -2,3 +2,4 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	341 foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	342 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	343 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	344 +bar
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	345
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	346 $ hg rollback
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	347 rolling back to revision 2 (undo commit)
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 Record all chunks in file a
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 $ echo foo > msg
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	352
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	353 - 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	354
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	355 $ hg record -l msg -d '1 11'<<EOF
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	356 > y
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	357 > y
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	358 > y
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	359 > EOF
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	360 diff --git a/a b/a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	361 2 hunks, 2 lines changed
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	362 examine changes to 'a'? [Ynsfdaq?]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	363 @@ -1,3 +1,4 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	364 expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	365 +foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	366 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	367 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	368 record change 1/2 to 'a'? [Ynsfdaq?]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	369 @@ -2,2 +3,3 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	370 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	371 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	372 +bar
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	373 record change 2/2 to 'a'? [Ynsfdaq?]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	374
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	375 File a should be clean
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	376
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	377 $ hg status -A a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	378 C a
12498 4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	379 $ rm msg
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	380
12498 4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	381 rollback and revert expansion
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	382
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	383 $ cat a
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	384 expand $Id: a,v 59f969a3b52c 1970/01/01 00:00:01 test $
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	385 foo
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	386 do not process $Id:
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	387 xxx $
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	388 bar
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	389 $ hg --verbose rollback
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	390 rolling back to revision 2 (undo commit)
12498 4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	391 overwriting a expanding keywords
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	392 $ hg status a
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	393 M a
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	394 $ cat a
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	395 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	396 foo
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	397 do not process $Id:
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	398 xxx $
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	399 bar
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	400 $ echo '$Id$' > y
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	401 $ echo '$Id$' > z
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	402 $ hg add y
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	403 $ 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	404 $ cat z
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	405 $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	406 $ hg --verbose rollback
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	407 rolling back to revision 2 (undo commit)
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	408 overwriting z shrinking keywords
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	409
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	410 Only z should be overwritten
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	411
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	412 $ hg status a y z
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	413 M a
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	414 A y
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	415 A z
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	416 $ cat z
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	417 $Id$
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	418 $ hg forget y z
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	419 $ rm y z
4846e8cd9327 keyword: support rollback by restoring expansion to previous values Christian Ebert <blacktrash@gmx.net> parents: 12495 diff changeset	420
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	421 $ hg update -C
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	422 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	423
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	424 Test patch queue repo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	425
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	426 $ hg init --mq
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	427 $ 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	428 $ hg commit --mq -m mqtest
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	429
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	430 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	431
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	432 $ cat .hg/patches/mqtest.diff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	433 # HG changeset patch
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	434 # User User Name <user@example.com>
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	435 # Date 1 0
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	436 # Node ID 40a904bbbe4cd4ab0a1f28411e35db26341a40ad
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	437 # Parent ef63ca68695bc9495032c6fda1350c71e6d256e9
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	438 cndiff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	439
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	440 diff -r ef63ca68695b -r 40a904bbbe4c c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	441 --- /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	442 +++ 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	443 @@ -0,0 +1,2 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	444 +$Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	445 +tests for different changenodes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	446
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	447 $ hg qpop
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	448 popping mqtest.diff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	449 patch queue now empty
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	450
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	451 qgoto, implying qpush, should expand
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	452
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	453 $ hg qgoto mqtest.diff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	454 applying mqtest.diff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	455 now at: mqtest.diff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	456 $ cat c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	457 $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	458 tests for different changenodes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	459 $ hg cat c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	460 $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	461 tests for different changenodes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	462
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	463 Keywords should not be expanded in filelog
11046 6e9b9f6c117c keyword: test recording Christian Ebert <blacktrash@gmx.net> parents: 11044 diff changeset	464
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	465 $ hg --config 'extensions.keyword=!' cat c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	466 $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	467 tests for different changenodes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	468
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	469 qpop and move on
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	470
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	471 $ hg qpop
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	472 popping mqtest.diff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	473 patch queue now empty
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	474
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	475 Copy and show added kwfiles
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	476
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	477 $ hg cp a c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	478 $ hg kwfiles
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	479 a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	480 c
5856 85888efbdfff keyword: test that expansion is done filewise Christian Ebert <blacktrash@gmx.net> parents: 5855 diff changeset	481
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	482 Commit and show expansion in original and copy
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	483
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	484 $ hg --debug commit -ma2c -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	485 c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	486 c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	487 overwriting c expanding keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	488 committed changeset 2:25736cf2f5cbe41f6be4e6784ef6ecf9f3bbcc7d
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	489 $ cat a c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	490 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	491 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	492 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	493 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	494 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	495 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	496
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	497 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	498
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	499 $ touch c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	500 $ hg status
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	501
12626 41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	502 Copy kwfile to keyword ignored file unexpanding keywords
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	503
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	504 $ hg --verbose copy a i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	505 copying a to i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	506 overwriting i shrinking keywords
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	507 $ head -n 1 i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	508 expand $Id$
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	509 $ hg forget i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	510 $ rm i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	511
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	512 Copy ignored file to ignored file: no overwriting
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	513
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	514 $ hg --verbose copy b i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	515 copying b to i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	516 $ hg forget i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	517 $ rm i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	518
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	519 cp symlink (becomes regular file), and hg copy after
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	520
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	521 $ cp sym i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	522 $ ls -l i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	523 -rw-r--r-- * (glob)
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	524 $ head -1 i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	525 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	526 $ hg copy --after --verbose sym i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	527 copying sym to i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	528 overwriting i shrinking keywords
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	529 $ head -1 i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	530 expand $Id$
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	531 $ hg forget i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	532 $ rm i
41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	533
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	534 Test different options of hg kwfiles
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	535
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	536 $ hg kwfiles
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	537 a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	538 c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	539 $ hg -v kwfiles --ignore
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	540 I b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	541 I sym
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	542 $ hg kwfiles --all
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	543 K a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	544 K c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	545 I b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	546 I sym
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	547
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	548 Diff specific revision
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	549
12102 9aba4ceb654d test-keyword: use regular expressions instead of grepping Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11905 diff changeset	550 $ hg diff --rev 1
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	551 diff -r ef63ca68695b c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	552 --- /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	553 +++ b/c * (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	554 @@ -0,0 +1,3 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	555 +expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	556 +do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	557 +xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	558
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	559 Status after rollback:
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	560
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	561 $ hg rollback
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	562 rolling back to revision 1 (undo commit)
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	563 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	564 A c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	565 $ hg update --clean
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	566 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	567
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	568 Custom keywordmaps as argument to kwdemo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	569
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	570 $ hg --quiet kwdemo "Xinfo = {author}: {desc}"
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	571 [extensions]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	572 keyword =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	573 [keyword]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	574 ** =
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	575 b = ignore
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	576 demo.txt =
12626 41df968a54c9 keyword: support copy and rename Christian Ebert <blacktrash@gmx.net> parents: 12587 diff changeset	577 i = ignore
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	578 [keywordmaps]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	579 Xinfo = {author}: {desc}
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	580 $Xinfo: test: hg keyword configuration and expansion example $
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	581
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	582 Configure custom keywordmaps
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	583
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	584 $ cat <<EOF >>$HGRCPATH
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	585 > [keywordmaps]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	586 > 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	587 > Xinfo = {author}: {desc}
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	588 > EOF
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	589
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	590 Cat and hg cat files before custom expansion
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	591
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	592 $ cat a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	593 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	594 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	595 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	596 ignore $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	597 $ hg cat sym a b && echo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	598 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	599 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	600 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	601 ignore $Id$
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	602 a* (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	603
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	604 Write custom keyword and prepare multiline commit message
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	605
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	606 $ echo '$Xinfo$' >> a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	607 $ cat <<EOF >> log
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	608 > firstline
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	609 > secondline
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	610 > EOF
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	611
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	612 Interrupted commit should not change state
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	613
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	614 $ hg commit
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	615 abort: empty commit message
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	616 [255]
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	617 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	618 M a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	619 ? c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	620 ? log
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	621
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	622 Commit with multiline message and custom expansion
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	623
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	624 $ hg --debug commit -l log -d '2 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	625 a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	626 overwriting a expanding keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	627 committed changeset 2:bb948857c743469b22bbf51f7ec8112279ca5d83
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	628 $ rm log
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	629
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	630 Stat, verify and show custom expansion (firstline)
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	631
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	632 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	633 ? c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	634 $ hg verify
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	635 checking changesets
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	636 checking manifests
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	637 crosschecking files in changesets and manifests
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	638 checking files
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	639 3 files, 3 changesets, 4 total revisions
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	640 $ cat a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	641 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	642 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	643 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	644 $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	645 ignore $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	646 $ hg cat sym a b && echo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	647 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	648 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	649 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	650 $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	651 ignore $Id$
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	652 a* (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	653
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	654 annotate
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	655
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	656 $ hg annotate a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	657 1: expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	658 1: do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	659 1: xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	660 2: $Xinfo$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	661
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	662 remove with status checks
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	663
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	664 $ hg debugrebuildstate
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	665 $ hg remove a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	666 $ hg --debug commit -m rma
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	667 committed changeset 3:d14c712653769de926994cf7fbb06c8fbd68f012
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	668 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	669 ? c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	670
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	671 Rollback, revert, and check expansion
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	672
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	673 $ hg rollback
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	674 rolling back to revision 2 (undo commit)
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	675 $ hg status
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	676 R a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	677 ? c
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	678 $ 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	679 $ cat a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	680 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	681 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	682 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	683 $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	684
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	685 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	686
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	687 $ cd ..
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	688
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	689 Expansion in destinaton with global configuration
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	690
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	691 $ hg --quiet clone Test globalconf
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	692 $ cat globalconf/a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	693 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	694 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	695 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	696 $Xinfo: User Name <user@example.com>: firstline $
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	697
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	698 No expansion in destination with local configuration in origin only
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	699
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	700 $ 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	701 $ cat localconf/a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	702 expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	703 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	704 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	705 $Xinfo$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	706
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	707 Clone to test incoming
11678 f5aa20e177c0 keyword: move collecting of [keyword] patterns to reposetup (issue2303) Christian Ebert <blacktrash@gmx.net> parents: 11252 diff changeset	708
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	709 $ hg clone -r1 Test Test-a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	710 requesting all changes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	711 adding changesets
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	712 adding manifests
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	713 adding file changes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	714 added 2 changesets with 3 changes to 3 files
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	715 updating to branch default
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	716 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	717 $ cd Test-a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	718 $ cat <<EOF >> .hg/hgrc
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	719 > [paths]
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	720 > default = ../Test
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	721 > EOF
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	722 $ hg incoming
12587 e3247ceaca5e tests: removed test names in tests Erik Zielke <ez@aragost.com> parents: 12498 diff changeset	723 comparing with */Test (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	724 searching for changes
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	725 changeset: 2:bb948857c743
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	726 tag: tip
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	727 user: User Name <user@example.com>
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	728 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	729 summary: firstline
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	730
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	731 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	732
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	733 $ sed -e 's/Id.*/& rejecttest/' a > a.new
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	734 $ mv a.new a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	735 $ hg --debug commit -m'rejects?' -d '3 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	736 a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	737 overwriting a expanding keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	738 committed changeset 2:85e279d709ffc28c9fdd1b868570985fc3d87082
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	739 $ hg export -o ../rejecttest.diff tip
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	740 $ cd ../Test
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	741 $ hg import ../rejecttest.diff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	742 applying ../rejecttest.diff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	743 $ cat a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	744 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	745 do not process $Id: rejecttest
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	746 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	747 $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	748 ignore $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	749
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	750 $ hg rollback
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	751 rolling back to revision 2 (undo commit)
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	752 $ hg update --clean
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	753 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	754
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	755 kwexpand/kwshrink on selected files
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	756
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	757 $ mkdir x
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	758 $ hg copy a x/a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	759 $ hg --verbose kwexpand a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	760 overwriting a expanding keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	761
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	762 kwexpand x/a should abort
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	763
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	764 $ hg --verbose kwexpand x/a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	765 abort: outstanding uncommitted changes
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	766 [255]
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	767 $ cd x
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	768 $ hg --debug commit -m xa -d '3 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	769 x/a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	770 x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	771 overwriting x/a expanding keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	772 committed changeset 3:b4560182a3f9a358179fd2d835c15e9da379c1e4
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	773 $ cat a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	774 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	775 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	776 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	777 $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	778
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	779 kwshrink a inside directory x
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	780
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	781 $ hg --verbose kwshrink a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	782 overwriting x/a shrinking keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	783 $ cat a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	784 expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	785 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	786 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	787 $Xinfo$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	788 $ cd ..
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	789
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	790 kwexpand nonexistent
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	791
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	792 $ hg kwexpand nonexistent
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	793 nonexistent:* (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	794
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	795
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	796 hg serve
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	797 - expand with hgweb file
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	798 - no expansion with hgweb annotate/changeset/filediff
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	799 - check errors
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	800
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	801 $ 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	802 $ cat hg.pid >> $DAEMON_PIDS
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	803 $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/file/tip/a/?style=raw'
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	804 200 Script output follows
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	805
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	806 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	807 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	808 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	809 $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	810 $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/annotate/tip/a/?style=raw'
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	811 200 Script output follows
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	812
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	813
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	814 user@1: expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	815 user@1: do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	816 user@1: xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	817 user@2: $Xinfo$
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
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	820
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	821
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	822 $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/rev/tip/?style=raw'
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	823 200 Script output follows
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	824
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	825
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	826 # HG changeset patch
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	827 # User User Name <user@example.com>
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	828 # Date 3 0
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	829 # Node ID b4560182a3f9a358179fd2d835c15e9da379c1e4
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	830 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	831 xa
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	832
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	833 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	834 --- /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	835 +++ 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	836 @@ -0,0 +1,4 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	837 +expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	838 +do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	839 +xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	840 +$Xinfo$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	841
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	842 $ $TESTDIR/get-with-headers.py localhost:$HGPORT '/diff/bb948857c743/a?style=raw'
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	843 200 Script output follows
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	844
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	845
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	846 diff -r ef63ca68695b -r bb948857c743 a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	847 --- 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	848 +++ 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	849 @@ -1,3 +1,4 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	850 expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	851 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	852 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	853 +$Xinfo$
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
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	856
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	857
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	858 $ cat errors.log
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	859
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	860 Prepare merge and resolve tests
5816 3bd22fd3b750 keyword: add test Christian Ebert <blacktrash@gmx.net> parents: diff changeset	861
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	862 $ echo '$Id$' > m
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	863 $ hg add m
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	864 $ hg commit -m 4kw
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	865 $ echo foo >> m
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	866 $ hg commit -m 5foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	867
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	868 simplemerge
6927 959113c5e1cd keyword: thorough hgweb testing Christian Ebert <blacktrash@gmx.net> parents: 6867 diff changeset	869
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	870 $ hg update 4
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	871 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	872 $ echo foo >> m
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	873 $ hg commit -m 6foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	874 created new head
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	875 $ hg merge
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	876 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	877 (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	878 $ hg commit -m simplemerge
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	879 $ cat m
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	880 $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	881 foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	882
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	883 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	884
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	885 $ hg update 4
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	886 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	887 $ echo bar >> m
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	888 $ hg commit -m 8bar
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	889 created new head
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	890 $ hg merge
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	891 merging m
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	892 warning: conflicts during merge.
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	893 merging m failed!
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	894 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314 f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Brodie Rao <brodie@bitheap.org> parents: 12102 diff changeset	895 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	896 [1]
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	897 $ cat m
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	898 $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	899 <<<<<<< local
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	900 bar
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	901 =======
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	902 foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	903 >>>>>>> other
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	904
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	905 resolve to local
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	906
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	907 $ HGMERGE=internal:local hg resolve -a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	908 $ hg commit -m localresolve
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	909 $ cat m
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	910 $Id: m 41efa6d38e9b 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	911 bar
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	912
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	913 Test restricted mode with transplant -b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	914
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	915 $ hg update 6
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	916 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	917 $ hg branch foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	918 marked working directory as branch foo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	919 $ mv a a.bak
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	920 $ echo foobranch > a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	921 $ cat a.bak >> a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	922 $ rm a.bak
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	923 $ hg commit -m 9foobranch
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	924 $ hg update default
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	925 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	926 $ hg -y transplant -b foo tip
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	927 applying 4aa30d025d50
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	928 4aa30d025d50 transplanted to 5a4da427c162
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	929
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	930 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	931
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	932 $ hg tip -p
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	933 changeset: 11:5a4da427c162
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	934 tag: tip
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	935 parent: 9:41efa6d38e9b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	936 user: test
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	937 date: Thu Jan 01 00:00:00 1970 +0000
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	938 summary: 9foobranch
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	939
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	940 diff -r 41efa6d38e9b -r 5a4da427c162 a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	941 --- 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	942 +++ 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	943 @@ -1,3 +1,4 @@
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	944 +foobranch
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	945 expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	946 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	947 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	948
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	949 $ head -n 2 a
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	950 foobranch
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	951 expand $Id: a 5a4da427c162 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	952
12495 6401e8547427 test-keyword: fix typo, rephrase Christian Ebert <blacktrash@gmx.net> parents: 12376 diff changeset	953 Turn off expansion
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	954
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	955 $ hg -q rollback
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	956 $ hg -q update -C
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	957
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	958 kwshrink with unknown file u
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	959
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	960 $ cp a u
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	961 $ hg --verbose kwshrink
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	962 overwriting a shrinking keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	963 overwriting m shrinking keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	964 overwriting x/a shrinking keywords
10117 98867145f4b5 keyword: go into restricted mode when transplanting Christian Ebert <blacktrash@gmx.net> parents: 9602 diff changeset	965
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	966 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	967 - cat shows unexpanded keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	968 - hg cat shows expanded keywords
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	969
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	970 $ cat a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	971 expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	972 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	973 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	974 $Xinfo$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	975 ignore $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	976 $ hg cat sym a b && echo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	977 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	978 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	979 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	980 $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	981 ignore $Id$
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	982 a* (glob)
11905 0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	983
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	984 Now disable keyword expansion
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	985
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	986 $ rm "$HGRCPATH"
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	987 $ cat a b
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	988 expand $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	989 do not process $Id:
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	990 xxx $
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	991 $Xinfo$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	992 ignore $Id$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	993 $ hg cat sym a b && echo
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	994 expand $Id$
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$
0b84864d1325 tests: drop big sed from test-keyword.t Matt Mackall <mpm@selenic.com> parents: 11678 diff changeset	998 ignore $Id$
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	999 a* (glob)

Mercurial > public > mercurial-scm > hg-stable

annotate tests/test-keyword.t @ 12626:41df968a54c9