Mercurial > hg
annotate tests/test-convert-baz @ 8810:ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:26 +0200 |
parents | 5b7da468531b |
children | bb5ea66789e3 |
rev | line source |
---|---|
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
1 #!/bin/sh |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
2 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
3 "$TESTDIR/hghave" baz || exit 80 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
4 |
6101
abb1c451a88e
Define tla username locally in baz and tla tests
Patrick Mezard <pmezard@gmail.com>
parents:
6084
diff
changeset
|
5 mkdir do_not_use_HOME_baz |
abb1c451a88e
Define tla username locally in baz and tla tests
Patrick Mezard <pmezard@gmail.com>
parents:
6084
diff
changeset
|
6 cd do_not_use_HOME_baz |
abb1c451a88e
Define tla username locally in baz and tla tests
Patrick Mezard <pmezard@gmail.com>
parents:
6084
diff
changeset
|
7 HOME=`pwd`; export HOME |
abb1c451a88e
Define tla username locally in baz and tla tests
Patrick Mezard <pmezard@gmail.com>
parents:
6084
diff
changeset
|
8 cd .. |
6102
4e351c03a31a
test-convert-baz: set username with baz, not tla
Patrick Mezard <pmezard@gmail.com>
parents:
6101
diff
changeset
|
9 baz my-id "mercurial <mercurial@selenic.com>" |
6084
a672df805855
Document and fix tla/baz conversion tests
Patrick Mezard <pmezard@gmail.com>
parents:
6078
diff
changeset
|
10 |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
11 echo "[extensions]" >> $HGRCPATH |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
12 echo "convert=" >> $HGRCPATH |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
13 echo 'hgext.graphlog =' >> $HGRCPATH |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
14 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
15 echo % create baz archive |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
16 baz make-archive baz@mercurial--convert hg-test-convert-baz |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
17 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
18 echo % initialize baz repo |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
19 mkdir baz-repo |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
20 cd baz-repo/ |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
21 baz init-tree baz@mercurial--convert/baz--test--0 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
22 baz import |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
23 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
24 echo % create initial files |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
25 echo 'this is a file' > a |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
26 baz add a |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
27 mkdir src |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
28 baz add src |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
29 cd src |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
30 dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
31 baz add b |
8267
faa318261ee8
test-convert-baz: hide GNU tar deprecation warning
Mads Kiilerich <mads@kiilerich.com>
parents:
7567
diff
changeset
|
32 # HACK: hide GNU tar-1.22 "tar: The --preserve option is deprecated, use --preserve-permissions --preserve-order instead" |
faa318261ee8
test-convert-baz: hide GNU tar deprecation warning
Mads Kiilerich <mads@kiilerich.com>
parents:
7567
diff
changeset
|
33 baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v ^tar |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
34 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
35 echo % create link file and modify a |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
36 ln -s ../a a-link |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
37 baz add a-link |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
38 echo 'this a modification to a' >> ../a |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
39 baz commit -s "added link to a and modify a" |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
40 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
41 echo % create second link and modify b |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
42 ln -s ../a a-link-2 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
43 baz add a-link-2 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
44 dd count=1 seek=1 if=/dev/zero of=b > /dev/null 2> /dev/null |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
45 baz commit -s "added second link and modify b" |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
46 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
47 echo % b file to link and a-link-2 to regular file |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
48 rm -f a-link-2 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
49 echo 'this is now a regular file' > a-link-2 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
50 ln -sf ../a b |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
51 baz commit -s "file to link and link to file test" |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
52 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
53 echo % move a-link-2 file and src directory |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
54 cd .. |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
55 baz mv src/a-link-2 c |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
56 baz mv src test |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
57 baz commit -s "move and rename a-link-2 file and src directory" |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
58 |
7567
0946294d1f32
convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents:
6799
diff
changeset
|
59 echo % move and add the moved file again |
0946294d1f32
convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents:
6799
diff
changeset
|
60 echo e > e |
0946294d1f32
convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents:
6799
diff
changeset
|
61 baz add e |
0946294d1f32
convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents:
6799
diff
changeset
|
62 baz commit -s "add e" |
0946294d1f32
convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents:
6799
diff
changeset
|
63 baz mv e f |
0946294d1f32
convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents:
6799
diff
changeset
|
64 echo ee > e |
0946294d1f32
convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents:
6799
diff
changeset
|
65 baz add e |
0946294d1f32
convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents:
6799
diff
changeset
|
66 baz commit -s "move e and recreate it again" |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
67 cd .. |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
68 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
69 echo % converting baz repo to Mercurial |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
70 hg convert baz-repo baz-repo-hg |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
71 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
72 baz register-archive -d baz@mercurial--convert |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
73 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
74 glog() |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
75 { |
8523
5b7da468531b
tests: replace #...# syntax with {...}
Martin Geisler <mg@lazybytes.net>
parents:
8267
diff
changeset
|
76 hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
77 } |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
78 |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
79 echo % show graph log |
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
80 glog -R baz-repo-hg |
6799
12d1e1e79faf
Fix tests failures introduced by 7239e06e58e9
Patrick Mezard <pmezard@gmail.com>
parents:
6102
diff
changeset
|
81 hg up -q -R baz-repo-hg |
6078
ebc23d34102f
convert: added gnu arch (baz) tests
Aleix Conchillo Flaque <aleix@member.fsf.org>
parents:
diff
changeset
|
82 hg -R baz-repo-hg manifest --debug |
7567
0946294d1f32
convert/gnuarch: fix switched copy source and destination
Patrick Mezard <pmezard@gmail.com>
parents:
6799
diff
changeset
|
83 hg -R baz-repo-hg log -r 5 -r 7 -C --debug | grep copies |