tags 459059 + patch thanks Patch attached. This probably wants to go upstream if there is such a thing anymore.
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-abrowse.sh
bazaar-1.4.2/src/baz/tests/test-abrowse.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-abrowse.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-abrowse.sh 2008-05-04 02:59:21.000000000
+0100
@@ -20,13 +20,20 @@
test_class "abrowse"
begin_test "make 2 of each namespace level"
-tla branch [EMAIL PROTECTED]/hello-world--mainline--1.{0,1}
-tla branch [EMAIL PROTECTED]/hello-world--{mainline,devel}--1.0
-tla branch [EMAIL PROTECTED]/hello-world--devel--1.{0,1}
-tla branch [EMAIL PROTECTED]/{hello,goodbye}-world--mainline--1.0
-tla branch [EMAIL PROTECTED]/goodbye-world--mainline--1.{0,1}
-tla branch [EMAIL PROTECTED]/goodbye-world--{mainline,devel}--1.0
-tla branch [EMAIL PROTECTED]/goodbye-world--devel--1.{0,1}
+tla branch [EMAIL PROTECTED]/hello-world--mainline--1.0 \
+ [EMAIL PROTECTED]/hello-world--mainline--1.1
+tla branch [EMAIL PROTECTED]/hello-world--mainline--1.0 \
+ [EMAIL PROTECTED]/hello-world--devel--1.0
+tla branch [EMAIL PROTECTED]/hello-world--devel--1.0 \
+ [EMAIL PROTECTED]/hello-world--devel--1.1
+tla branch [EMAIL PROTECTED]/hello-world--mainline--1.0 \
+ [EMAIL PROTECTED]/goodbye-world--mainline--1.0
+tla branch [EMAIL PROTECTED]/goodbye-world--mainline--1.0 \
+ [EMAIL PROTECTED]/goodbye-world--mainline--1.1
+tla branch [EMAIL PROTECTED]/goodbye-world--mainline--1.0 \
+ [EMAIL PROTECTED]/goodbye-world--devel--1.0
+tla branch [EMAIL PROTECTED]/goodbye-world--devel--1.0 \
+ [EMAIL PROTECTED]/goodbye-world--devel--1.1
end_test
begin_test "abrowse does not duplicate output"
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-add.sh
bazaar-1.4.2/src/baz/tests/test-add.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-add.sh 2008-05-04 02:57:35.000000000
+0100
+++ bazaar-1.4.2/src/baz/tests/test-add.sh 2008-05-04 02:59:21.000000000
+0100
@@ -34,7 +34,7 @@
setup_add
echo "a file" > new-file.c
tla add -i foobar new-file.c
-id=$(< .arch-ids/new-file.c.id)
+id=$(cat .arch-ids/new-file.c.id)
[ "foobar" = $id ]
end_test
@@ -56,14 +56,14 @@
setup_add
mkdir newdir
tla add newdir
-id=$(< newdir/.arch-ids/\=id)
+id=$(cat newdir/.arch-ids/\=id)
end_test
begin_test "add a chosen id for a directory works"
setup_add
mkdir newdir
tla add -i super_duper newdir
-id=$(< newdir/.arch-ids/\=id)
+id=$(cat newdir/.arch-ids/\=id)
[ "super_duper" = $id ]
end_test
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-archive-creation.sh
bazaar-1.4.2/src/baz/tests/test-archive-creation.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-archive-creation.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-archive-creation.sh 2008-05-04
02:59:21.000000000 +0100
@@ -21,7 +21,7 @@
tla make-archive [EMAIL PROTECTED] cached:$(pwd)/test-archive
test "$(tla whereis-archive [EMAIL PROTECTED])" = cached:$(pwd)/test-archive
test -d test-archive/=meta-info
-test "Bazaar archive format 1 0" = "$(< test-archive/.archive-version )"
+test "Bazaar archive format 1 0" = "$(cat test-archive/.archive-version )"
end_test
begin_test "Archive creation 2 (with listing)"
@@ -29,14 +29,14 @@
test "$(tla whereis-archive [EMAIL PROTECTED])" = $(pwd)/test-archive2
dir_exists test-archive2/=meta-info
test -f test-archive2/.listing
-test "Bazaar archive format 1 0" = "$(< test-archive2/.archive-version )"
+test "Bazaar archive format 1 0" = "$(cat test-archive2/.archive-version )"
end_test
begin_test "TLA Archive creation 1"
tla make-archive --tla [EMAIL PROTECTED] $(pwd)/test-archive3
test "$(tla whereis-archive [EMAIL PROTECTED])" = $(pwd)/test-archive3
test -d test-archive3/=meta-info
-test "Hackerlab arch archive directory, format version 2." = "$(<
test-archive3/.archive-version )"
+test "Hackerlab arch archive directory, format version 2." = "$(cat
test-archive3/.archive-version )"
end_test
begin_test "TLA Archive creation 2 (with listing)"
@@ -44,7 +44,7 @@
test "$(tla whereis-archive [EMAIL PROTECTED])" = $(pwd)/test-archive4
test -d test-archive4/=meta-info
test -f test-archive4/.listing
-test "Hackerlab arch archive directory, format version 2." = "$(<
test-archive4/.archive-version )"
+test "Hackerlab arch archive directory, format version 2." = "$(cat
test-archive4/.archive-version )"
end_test
begin_test "Archive creation 3 (email contains an underscore before @)"
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-archive-registration.sh
bazaar-1.4.2/src/baz/tests/test-archive-registration.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-archive-registration.sh
2008-05-04 02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-archive-registration.sh 2008-05-04
02:59:21.000000000 +0100
@@ -1053,7 +1053,7 @@
begin_test "delta name name (old)"
echo "${CACHEDARCHIVEDIR}/jane-archive" > ~/.arch-params/=locations/[EMAIL
PROTECTED]
rm -f ~/.arch-params/archives/[EMAIL PROTECTED]
-tla delta [EMAIL PROTECTED]/hello-world--mainline--1.{0,1}
+tla delta [EMAIL PROTECTED]/hello-world--mainline--1.0 [EMAIL
PROTECTED]/hello-world--mainline--1.1
end_test
begin_test "delta url url"
@@ -1125,7 +1125,7 @@
echo "${CACHEDARCHIVEDIR}/jane-archive" > ~/.arch-params/=locations/[EMAIL
PROTECTED]
rm -f ~/.arch-params/archives/[EMAIL PROTECTED]
tla get [EMAIL PROTECTED]/hello-world--mainline--1.0 foo
-tla apply-delta -d foo [EMAIL PROTECTED]/hello-world--mainline--1.{0,1}
+tla apply-delta -d foo [EMAIL PROTECTED]/hello-world--mainline--1.0 [EMAIL
PROTECTED]/hello-world--mainline--1.1
end_test
begin_test "apply-delta url url"
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-commit.sh
bazaar-1.4.2/src/baz/tests/test-commit.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-commit.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-commit.sh 2008-05-04 02:59:21.000000000
+0100
@@ -64,7 +64,7 @@
tla commit -s 'do it man' || test_fail "unexpected commit failure"
test -f
${ARCHIVEDIR}/jane-archive/hello-world/hello-world--mainline/hello-world--mainline--1.0/patch-3/ancestry.gz
|| test_fail "no ancestry file created"
test -f
${ARCHIVEDIR}/jane-archive/hello-world/hello-world--mainline/hello-world--mainline--1.0/patch-3/ancestry.gz.checksum
|| test_fail "no ancestry checksum created"
-test "$(gunzip -c $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world/hello-world--mainline/hello-world--mainline--1.0/patch-3/ancestry.gz)"
= "$(echo -e 'arch ancestry version 1\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--patch-3\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--patch-2\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--patch-1\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--base-0')"
+test "$(gunzip -c $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world/hello-world--mainline/hello-world--mainline--1.0/patch-3/ancestry.gz)"
= "$(printf 'arch ancestry version 1\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--patch-3\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--patch-2\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--patch-1\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--base-0\n')"
cd ..
tla get [EMAIL PROTECTED]/hello-world--mainline--1.0 bar
end_test
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-delta.sh
bazaar-1.4.2/src/baz/tests/test-delta.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-delta.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-delta.sh 2008-05-04 02:59:21.000000000
+0100
@@ -20,8 +20,10 @@
begin_test "delta outside project trees"
cd /tmp
-tla branch [EMAIL PROTECTED]/hello-world--mainline--1.{0,1}
-tla delta [EMAIL PROTECTED]/hello-world--mainline--1.{0,1}
+tla branch [EMAIL PROTECTED]/hello-world--mainline--1.0 \
+ [EMAIL PROTECTED]/hello-world--mainline--1.1
+tla delta [EMAIL PROTECTED]/hello-world--mainline--1.0 \
+ [EMAIL PROTECTED]/hello-world--mainline--1.1
end_test
clean_workdir
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-id.sh
bazaar-1.4.2/src/baz/tests/test-id.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-id.sh 2008-05-04 02:57:35.000000000
+0100
+++ bazaar-1.4.2/src/baz/tests/test-id.sh 2008-05-04 02:59:21.000000000
+0100
@@ -35,70 +35,70 @@
begin_test "names file id"
make_names_tree
-[ "$(tla id dir/file)" = "$(echo -e dir/file\\t?./dir/file)" ] || test_fail
"incorrect id returned : wanted '$(echo -e dir/file\\t?./dir/file)' got '$(tla
id dir/file)'"
+[ "$(tla id dir/file)" = "$(printf dir/file\\t?./dir/file\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf dir/file\\t?./dir/file\\n)' got
'$(tla id dir/file)'"
end_test
begin_test "names symlink id"
make_names_tree
-[ "$(tla id dir2/link)" = "$(echo -e dir2/link\\t?./dir2/link)" ] || test_fail
"incorrect id returned : wanted '$(echo -e dir2/link\\t?./dir2/link)' got
'$(tla id dir2/link)'"
+[ "$(tla id dir2/link)" = "$(printf dir2/link\\t?./dir2/link\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
dir2/link\\t?./dir2/link\\n)' got '$(tla id dir2/link)'"
end_test
begin_test "names dir id"
make_names_tree
-[ "$(tla id dir)" = "$(echo -e dir\\t?./dir)" ] || test_fail "incorrect id
returned : wanted '$(echo -e dir\\t?./dir)' got '$(tla id dir)'"
+[ "$(tla id dir)" = "$(printf dir\\t?./dir\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf dir\\t?./dir\\n)' got '$(tla id dir)'"
end_test
begin_test "names dir/ id"
make_names_tree
-[ "$(tla id dir/)" = "$(echo -e dir\\t?./dir)" ] || test_fail "incorrect id
returned : wanted '$(echo -e dir\\t?./dir)' got '$(tla id dir/)'"
+[ "$(tla id dir/)" = "$(printf dir\\t?./dir\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf dir\\t?./dir\\n)' got '$(tla id dir/)'"
end_test
begin_test "names subdir file id"
make_names_tree
cd dir
-[ "$(tla id file)" = "$(echo -e file\\t?./dir/file)" ] || test_fail "incorrect
id returned : wanted '$(echo -e file\\t?./dir/file)' got '$(tla id file)'"
+[ "$(tla id file)" = "$(printf file\\t?./dir/file\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf file\\t?./dir/file\\n)' got '$(tla id
file)'"
end_test
begin_test "names subdir symlink id"
make_names_tree
cd dir2
-[ "$(tla id link)" = "$(echo -e link\\t?./dir2/link)" ] || test_fail
"incorrect id returned : wanted '$(echo -e link\\t?./dir2/link)' got '$(tla id
link)'"
+[ "$(tla id link)" = "$(printf link\\t?./dir2/link\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf link\\t?./dir2/link\\n)' got '$(tla
id link)'"
end_test
begin_test "names subdir . id"
make_names_tree
cd dir
-[ "$(tla id .)" = "$(echo -e .\\t?./dir)" ] || test_fail "incorrect id
returned : wanted '$(echo -e .\\t?./dir)' got '$(tla id .)'"
+[ "$(tla id .)" = "$(printf .\\t?./dir\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf .\\t?./dir\\n)' got '$(tla id .)'"
end_test
begin_test "names subdir ./ id"
make_names_tree
cd dir
-[ "$(tla id ./)" = "$(echo -e .\\t?./dir)" ] || test_fail "incorrect id
returned : wanted '$(echo -e .\\t?./dir)' got '$(tla id ./)'"
+[ "$(tla id ./)" = "$(printf .\\t?./dir\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf .\\t?./dir\\n)' got '$(tla id ./)'"
end_test
begin_test "names subdir relpath file id"
make_names_tree
cd dir2
-[ "$(tla id ../dir/file)" = "$(echo -e ../dir/file\\t?./dir/file)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e
../dir/file\\t?./dir/file)' got '$(tla id ../dir/file)'"
+[ "$(tla id ../dir/file)" = "$(printf ../dir/file\\t?./dir/file\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
../dir/file\\t?./dir/file\\n)' got '$(tla id ../dir/file)'"
end_test
begin_test "names subdir relpath symlink id"
make_names_tree
cd dir
-[ "$(tla id ../dir2/link)" = "$(echo -e ../dir2/link\\t?./dir2/link)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e
../dir2/link\\t?./dir2/link)' got '$(tla id link)'"
+[ "$(tla id ../dir2/link)" = "$(printf ../dir2/link\\t?./dir2/link\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
../dir2/link\\t?./dir2/link\\n)' got '$(tla id link)'"
end_test
begin_test "names subdir relpath dir id"
make_names_tree
cd dir2
-[ "$(tla id ../dir)" = "$(echo -e ../dir\\t?./dir)" ] || test_fail "incorrect
id returned : wanted '$(echo -e .../dir\\t?./dir)' got '$(tla id ../dir)'"
+[ "$(tla id ../dir)" = "$(printf ../dir\\t?./dir\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf .../dir\\t?./dir\\n)' got '$(tla id
../dir)'"
end_test
begin_test "names subdir ../dir/ id"
make_names_tree
cd dir2
-[ "$(tla id ../dir/)" = "$(echo -e ../dir\\t?./dir)" ] || test_fail "incorrect
id returned : wanted '$(echo -e ../dir\\t?./dir)' got '$(tla id ../dir/)'"
+[ "$(tla id ../dir/)" = "$(printf ../dir\\t?./dir\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf ../dir\\t?./dir\\n)' got '$(tla id
../dir/)'"
end_test
tla my-id '<[EMAIL PROTECTED]>'
@@ -122,104 +122,104 @@
begin_test "implicit file id"
make_implicit_tree
-[ "$(tla id dir/file)" = "$(echo -e dir/file\\tx_fileid_)" ] || test_fail
"incorrect id returned : wanted '$(echo -e dir/file\\tx_fileid_)' got '$(tla id
dir/file)'"
+[ "$(tla id dir/file)" = "$(printf dir/file\\tx_fileid_\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf dir/file\\tx_fileid_\\n)' got '$(tla
id dir/file)'"
end_test
begin_test "implicit file id id"
make_implicit_tree
-[ "$(tla id dir/.arch-ids/file.id)" = "$(echo -e
dir/.arch-ids/file.id\\tE_fileid_)" ] || test_fail "incorrect id returned :
wanted '$(echo -e dir/.arch-ids/file.id\\tE_fileid_)' got '$(tla id
dir/.arch-ids/file.id)'"
+[ "$(tla id dir/.arch-ids/file.id)" = "$(printf
dir/.arch-ids/file.id\\tE_fileid_\\n)" ] || test_fail "incorrect id returned :
wanted '$(printf dir/.arch-ids/file.id\\tE_fileid_\\n)' got '$(tla id
dir/.arch-ids/file.id)'"
end_test
begin_test "implicit file id dir id"
make_implicit_tree
-[ "$(tla id dir/.arch-ids)" = "$(echo -e dir/.arch-ids\\tD_./dir/.arch-ids)" ]
|| test_fail "incorrect id returned : wanted '$(echo -e
dir/.arch-ids\\tD_./dir/.arch-ids)' got '$(tla id dir/.arch-ids)'"
+[ "$(tla id dir/.arch-ids)" = "$(printf dir/.arch-ids\\tD_./dir/.arch-ids\\n)"
] || test_fail "incorrect id returned : wanted '$(printf
dir/.arch-ids\\tD_./dir/.arch-ids\\n)' got '$(tla id dir/.arch-ids)'"
end_test
begin_test "implicit symlink id"
make_implicit_tree
-[ "$(tla id dir2/link)" = "$(echo -e dir2/link\\t?_./dir2/link)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e
dir2/link\\t?_./dir2/link)' got '$(tla id dir2/link)'"
+[ "$(tla id dir2/link)" = "$(printf dir2/link\\t?_./dir2/link\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
dir2/link\\t?_./dir2/link\\n)' got '$(tla id dir2/link)'"
end_test
begin_test "implicit dir id"
make_implicit_tree
-[ "$(tla id dir)" = "$(echo -e dir\\t?_./dir)" ] || test_fail "incorrect id
returned : wanted '$(echo -e dir\\t?_./dir)' got '$(tla id dir)'"
+[ "$(tla id dir)" = "$(printf dir\\t?_./dir\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf dir\\t?_./dir\\n)' got '$(tla id dir)'"
end_test
begin_test "implicit dir2/ id"
make_implicit_tree
-[ "$(tla id dir2/)" = "$(echo -e dir2\\tx_dirid_)" ] || test_fail "incorrect
id returned : wanted '$(echo -e dir2\\tx_dirid_)' got '$(tla id dir2/)'"
+[ "$(tla id dir2/)" = "$(printf dir2\\tx_dirid_\\n)" ] || test_fail "incorrect
id returned : wanted '$(printf dir2\\tx_dirid_\\n)' got '$(tla id dir2/)'"
end_test
begin_test "implicit subdir file id"
make_implicit_tree
cd dir
-[ "$(tla id file)" = "$(echo -e file\\tx_fileid_)" ] || test_fail "incorrect
id returned : wanted '$(echo -e file\\tx_fileid_)' got '$(tla id file)'"
+[ "$(tla id file)" = "$(printf file\\tx_fileid_\\n)" ] || test_fail "incorrect
id returned : wanted '$(printf file\\tx_fileid_\\n)' got '$(tla id file)'"
end_test
begin_test "implicit subdir file id id"
make_implicit_tree
cd dir
-[ "$(tla id .arch-ids/file.id)" = "$(echo -e .arch-ids/file.id\\tE_fileid_)" ]
|| test_fail "incorrect id returned : wanted '$(echo -e
.arch-ids/file.id\\tE_fileid_)' got '$(tla id .arch-ids/file.id)'"
+[ "$(tla id .arch-ids/file.id)" = "$(printf .arch-ids/file.id\\tE_fileid_\\n)"
] || test_fail "incorrect id returned : wanted '$(printf
.arch-ids/file.id\\tE_fileid_\\n)' got '$(tla id .arch-ids/file.id)'"
end_test
begin_test "implicit file subdir id dir id"
make_implicit_tree
cd dir
-[ "$(tla id .arch-ids)" = "$(echo -e .arch-ids\\tD_./dir/.arch-ids)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e
.arch-ids\\tD_./dir/.arch-ids)' got '$(tla id .arch-ids)'"
+[ "$(tla id .arch-ids)" = "$(printf .arch-ids\\tD_./dir/.arch-ids\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
.arch-ids\\tD_./dir/.arch-ids\\n)' got '$(tla id .arch-ids)'"
end_test
begin_test "implicit subdir symlink id"
make_implicit_tree
cd dir2
-[ "$(tla id link)" = "$(echo -e link\\t?_./dir2/link)" ] || test_fail
"incorrect id returned : wanted '$(echo -e link\\t?_./dir2/link)' got '$(tla id
link)'"
+[ "$(tla id link)" = "$(printf link\\t?_./dir2/link\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf link\\t?_./dir2/link\\n)' got '$(tla
id link)'"
end_test
begin_test "implicit subdir . id"
make_implicit_tree
cd dir
-[ "$(tla id .)" = "$(echo -e .\\t?_./dir)" ] || test_fail "incorrect id
returned : wanted '$(echo -e .\\t?_./dir)' got '$(tla id .)'"
+[ "$(tla id .)" = "$(printf .\\t?_./dir\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf .\\t?_./dir\\n)' got '$(tla id .)'"
end_test
begin_test "implicit subdir ./ id"
make_implicit_tree
cd dir2
-[ "$(tla id ./)" = "$(echo -e .\\tx_dirid_)" ] || test_fail "incorrect id
returned : wanted '$(echo -e .\\tx_dirid_)' got '$(tla id ./)'"
+[ "$(tla id ./)" = "$(printf .\\tx_dirid_\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf .\\tx_dirid_\\n)' got '$(tla id ./)'"
end_test
begin_test "implicit subdir relpath file id"
make_implicit_tree
cd dir2
-[ "$(tla id ../dir/file)" = "$(echo -e ../dir/file\\tx_fileid_)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e ../dir/file\\tx_fileid_)'
got '$(tla id ../dir/file)'"
+[ "$(tla id ../dir/file)" = "$(printf ../dir/file\\tx_fileid_\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
../dir/file\\tx_fileid_\\n)' got '$(tla id ../dir/file)'"
end_test
begin_test "implicit subdir relpath file id id"
make_implicit_tree
cd dir2
-[ "$(tla id ../dir/.arch-ids/file.id)" = "$(echo -e
../dir/.arch-ids/file.id\\tE_fileid_)" ] || test_fail "incorrect id returned :
wanted '$(echo -e ../dir/.arch-ids/file.id\\tE_fileid_)' got '$(tla id
../dir/.arch-ids/file.id)'"
+[ "$(tla id ../dir/.arch-ids/file.id)" = "$(printf
../dir/.arch-ids/file.id\\tE_fileid_\\n)" ] || test_fail "incorrect id returned
: wanted '$(printf ../dir/.arch-ids/file.id\\tE_fileid_\\n)' got '$(tla id
../dir/.arch-ids/file.id)'"
end_test
begin_test "implicit file relpath subdir id dir id"
make_implicit_tree
cd dir2
-[ "$(tla id ../dir/.arch-ids)" = "$(echo -e
../dir/.arch-ids\\tD_./dir/.arch-ids)" ] || test_fail "incorrect id returned :
wanted '$(echo -e ../dir/.arch-ids\\tD_./dir/.arch-ids)' got '$(tla id
../dir/.arch-ids)'"
+[ "$(tla id ../dir/.arch-ids)" = "$(printf
../dir/.arch-ids\\tD_./dir/.arch-ids\\n)" ] || test_fail "incorrect id returned
: wanted '$(printf ../dir/.arch-ids\\tD_./dir/.arch-ids\\n)' got '$(tla id
../dir/.arch-ids)'"
end_test
begin_test "implicit subdir relpath symlink id"
make_implicit_tree
cd dir
-[ "$(tla id ../dir2/link)" = "$(echo -e ../dir2/link\\t?_./dir2/link)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e
../dir2/link\\t?_./dir2/link)' got '$(tla id link)'"
+[ "$(tla id ../dir2/link)" = "$(printf ../dir2/link\\t?_./dir2/link\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
../dir2/link\\t?_./dir2/link\\n)' got '$(tla id link)'"
end_test
begin_test "implicit subdir relpath dir id"
make_implicit_tree
cd dir2
-[ "$(tla id ../dir)" = "$(echo -e ../dir\\t?_./dir)" ] || test_fail "incorrect
id returned : wanted '$(echo -e .../dir\\t?_./dir)' got '$(tla id ../dir)'"
+[ "$(tla id ../dir)" = "$(printf ../dir\\t?_./dir\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf .../dir\\t?_./dir\\n)' got '$(tla id
../dir)'"
end_test
begin_test "implicit subdir ../dir2/ id"
make_implicit_tree
cd dir
-[ "$(tla id ../dir2/)" = "$(echo -e ../dir2\\tx_dirid_)" ] || test_fail
"incorrect id returned : wanted '$(echo -e ../dir2\\tx_dirid_)' got '$(tla id
../dir2/)'"
+[ "$(tla id ../dir2/)" = "$(printf ../dir2\\tx_dirid_\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf ../dir2\\tx_dirid_\\n)' got '$(tla id
../dir2/)'"
end_test
make_tagline_tree()
@@ -242,70 +242,70 @@
begin_test "tagline file id"
make_tagline_tree
-[ "$(tla id dir/file)" = "$(echo -e dir/file\\tx_fileid_)" ] || test_fail
"incorrect id returned : wanted '$(echo -e dir/file\\tx_fileid_)' got '$(tla id
dir/file)'"
+[ "$(tla id dir/file)" = "$(printf dir/file\\tx_fileid_\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf dir/file\\tx_fileid_\\n)' got '$(tla
id dir/file)'"
end_test
begin_test "tagline symlink id"
make_tagline_tree
-[ "$(tla id dir2/link)" = "$(echo -e dir2/link\\t?_./dir2/link)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e
dir2/link\\t?_./dir2/link)' got '$(tla id dir2/link)'"
+[ "$(tla id dir2/link)" = "$(printf dir2/link\\t?_./dir2/link\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
dir2/link\\t?_./dir2/link\\n)' got '$(tla id dir2/link)'"
end_test
begin_test "tagline dir id"
make_tagline_tree
-[ "$(tla id dir)" = "$(echo -e dir\\t?_./dir)" ] || test_fail "incorrect id
returned : wanted '$(echo -e dir\\t?_./dir)' got '$(tla id dir)'"
+[ "$(tla id dir)" = "$(printf dir\\t?_./dir\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf dir\\t?_./dir\\n)' got '$(tla id dir)'"
end_test
begin_test "tagline dir2/ id"
make_tagline_tree
-[ "$(tla id dir2/)" = "$(echo -e dir2\\tx_dirid_)" ] || test_fail "incorrect
id returned : wanted '$(echo -e dir2\\tx_dirid_)' got '$(tla id dir2/)'"
+[ "$(tla id dir2/)" = "$(printf dir2\\tx_dirid_\\n)" ] || test_fail "incorrect
id returned : wanted '$(printf dir2\\tx_dirid_\\n)' got '$(tla id dir2/)'"
end_test
begin_test "tagline subdir file id"
make_tagline_tree
cd dir
-[ "$(tla id file)" = "$(echo -e file\\tx_fileid_)" ] || test_fail "incorrect
id returned : wanted '$(echo -e file\\tx_fileid_)' got '$(tla id file)'"
+[ "$(tla id file)" = "$(printf file\\tx_fileid_\\n)" ] || test_fail "incorrect
id returned : wanted '$(printf file\\tx_fileid_\\n)' got '$(tla id file)'"
end_test
begin_test "tagline subdir symlink id"
make_tagline_tree
cd dir2
-[ "$(tla id link)" = "$(echo -e link\\t?_./dir2/link)" ] || test_fail
"incorrect id returned : wanted '$(echo -e link\\t?_./dir2/link)' got '$(tla id
link)'"
+[ "$(tla id link)" = "$(printf link\\t?_./dir2/link\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf link\\t?_./dir2/link\\n)' got '$(tla
id link)'"
end_test
begin_test "tagline subdir . id"
make_tagline_tree
cd dir
-[ "$(tla id .)" = "$(echo -e .\\t?_./dir)" ] || test_fail "incorrect id
returned : wanted '$(echo -e .\\t?_./dir)' got '$(tla id .)'"
+[ "$(tla id .)" = "$(printf .\\t?_./dir\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf .\\t?_./dir\\n)' got '$(tla id .)'"
end_test
begin_test "tagline subdir ./ id"
make_tagline_tree
cd dir2
-[ "$(tla id ./)" = "$(echo -e .\\tx_dirid_)" ] || test_fail "incorrect id
returned : wanted '$(echo -e .\\tx_dirid_)' got '$(tla id ./)'"
+[ "$(tla id ./)" = "$(printf .\\tx_dirid_\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf .\\tx_dirid_\\n)' got '$(tla id ./)'"
end_test
begin_test "tagline subdir relpath file id"
make_tagline_tree
cd dir2
-[ "$(tla id ../dir/file)" = "$(echo -e ../dir/file\\tx_fileid_)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e ../dir/file\\tx_fileid_)'
got '$(tla id ../dir/file)'"
+[ "$(tla id ../dir/file)" = "$(printf ../dir/file\\tx_fileid_\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
../dir/file\\tx_fileid_\\n)' got '$(tla id ../dir/file)'"
end_test
begin_test "tagline subdir relpath symlink id"
make_tagline_tree
cd dir
-[ "$(tla id ../dir2/link)" = "$(echo -e ../dir2/link\\t?_./dir2/link)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e
../dir2/link\\t?_./dir2/link)' got '$(tla id link)'"
+[ "$(tla id ../dir2/link)" = "$(printf ../dir2/link\\t?_./dir2/link\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
../dir2/link\\t?_./dir2/link\\n)' got '$(tla id link)'"
end_test
begin_test "tagline subdir relpath dir id"
make_tagline_tree
cd dir2
-[ "$(tla id ../dir)" = "$(echo -e ../dir\\t?_./dir)" ] || test_fail "incorrect
id returned : wanted '$(echo -e .../dir\\t?_./dir)' got '$(tla id ../dir)'"
+[ "$(tla id ../dir)" = "$(printf ../dir\\t?_./dir\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf .../dir\\t?_./dir\\n)' got '$(tla id
../dir)'"
end_test
begin_test "tagline subdir ../dir/ id"
make_tagline_tree
cd dir
-[ "$(tla id ../dir2/)" = "$(echo -e ../dir2\\tx_dirid_)" ] || test_fail
"incorrect id returned : wanted '$(echo -e ../dir2\\tx_dirid_)' got '$(tla id
../dir2/)'"
+[ "$(tla id ../dir2/)" = "$(printf ../dir2\\tx_dirid_\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf ../dir2\\tx_dirid_\\n)' got '$(tla id
../dir2/)'"
end_test
make_explicit_tree()
@@ -328,7 +328,7 @@
begin_test "explicit file id"
make_explicit_tree
-[ "$(tla id dir/file)" = "$(echo -e dir/file\\tx_fileid_)" ] || test_fail
"incorrect id returned : wanted '$(echo -e dir/file\\tx_fileid_)' got '$(tla id
dir/file)'"
+[ "$(tla id dir/file)" = "$(printf dir/file\\tx_fileid_\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf dir/file\\tx_fileid_\\n)' got '$(tla
id dir/file)'"
end_test
begin_test "explicit symlink id"
@@ -343,13 +343,13 @@
begin_test "explicit dir/ id"
make_explicit_tree
-[ "$(tla id dir2/)" = "$(echo -e dir2\\tx_dirid_)" ] || test_fail "incorrect
id returned : wanted '$(echo -e dir2\\tx_dirid_)' got '$(tla id dir2/)'"
+[ "$(tla id dir2/)" = "$(printf dir2\\tx_dirid_\\n)" ] || test_fail "incorrect
id returned : wanted '$(printf dir2\\tx_dirid_\\n)' got '$(tla id dir2/)'"
end_test
begin_test "explicit subdir file id"
make_explicit_tree
cd dir
-[ "$(tla id file)" = "$(echo -e file\\tx_fileid_)" ] || test_fail "incorrect
id returned : wanted '$(echo -e file\\tx_fileid_)' got '$(tla id file)'"
+[ "$(tla id file)" = "$(printf file\\tx_fileid_\\n)" ] || test_fail "incorrect
id returned : wanted '$(printf file\\tx_fileid_\\n)' got '$(tla id file)'"
end_test
begin_test "explicit subdir symlink id"
@@ -367,13 +367,13 @@
begin_test "explicit subdir ./ id"
make_explicit_tree
cd dir2
-[ "$(tla id ./)" = "$(echo -e .\\tx_dirid_)" ] || test_fail "incorrect id
returned : wanted '$(echo -e .\\tx_dirid_)' got '$(tla id ./)'"
+[ "$(tla id ./)" = "$(printf .\\tx_dirid_\\n)" ] || test_fail "incorrect id
returned : wanted '$(printf .\\tx_dirid_\\n)' got '$(tla id ./)'"
end_test
begin_test "explicit subdir relpath file id"
make_explicit_tree
cd dir2
-[ "$(tla id ../dir/file)" = "$(echo -e ../dir/file\\tx_fileid_)" ] ||
test_fail "incorrect id returned : wanted '$(echo -e ../dir/file\\tx_fileid_)'
got '$(tla id ../dir/file)'"
+[ "$(tla id ../dir/file)" = "$(printf ../dir/file\\tx_fileid_\\n)" ] ||
test_fail "incorrect id returned : wanted '$(printf
../dir/file\\tx_fileid_\\n)' got '$(tla id ../dir/file)'"
end_test
begin_test "explicit subdir relpath symlink id"
@@ -391,7 +391,7 @@
begin_test "explicit subdir ../dir/ id"
make_explicit_tree
cd dir
-[ "$(tla id ../dir2/)" = "$(echo -e ../dir2\\tx_dirid_)" ] || test_fail
"incorrect id returned : wanted '$(echo -e ../dir2\\tx_dirid_)' got '$(tla id
../dir2/)'"
+[ "$(tla id ../dir2/)" = "$(printf ../dir2\\tx_dirid_\\n)" ] || test_fail
"incorrect id returned : wanted '$(printf ../dir2\\tx_dirid_\\n)' got '$(tla id
../dir2/)'"
end_test
clean_workdir
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-import-baz.sh
bazaar-1.4.2/src/baz/tests/test-import-baz.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-import-baz.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-import-baz.sh 2008-05-04
02:59:21.000000000 +0100
@@ -33,7 +33,7 @@
test -d $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world--mainline--1.0/base-0
test -f $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world--mainline--1.0/base-0/ancestry.gz || test_fail
"Missing ancestry data file"
test -f $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world--mainline--1.0/base-0/ancestry.gz.checksum ||
test_fail "Missing ancestry checksum"
-test "$(gunzip -c $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world--mainline--1.0/base-0/ancestry.gz)" = "$(echo -e 'arch
ancestry version 1\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--base-0')"
+test "$(gunzip -c $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world--mainline--1.0/base-0/ancestry.gz)" = "$(printf 'arch
ancestry version 1\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--base-0\n')"
end_test
begin_test "Import files in a directory (.)"
@@ -41,7 +41,7 @@
cd hello-world--mainline--1.0
tla import --automatic [EMAIL PROTECTED]/hello-world--mainline1--1.0
tla inventory -s | sort > ,,actual-inventory
-echo -e "README\nhello-world.c" | sort > ,,expected-inventory
+printf "README\nhello-world.c\n" | sort > ,,expected-inventory
diff -u ,,actual-inventory ,,expected-inventory
end_test
@@ -49,7 +49,7 @@
make_hello_world hello-world--mainline--1.0
tla import --automatic -d hello-world--mainline--1.0 [EMAIL
PROTECTED]/hello-world--mainline2--1.0
tla inventory -s hello-world--mainline--1.0 | sort > ,,actual-inventory
-echo -e
"hello-world--mainline--1.0/README\nhello-world--mainline--1.0/hello-world.c" |
sort > ,,expected-inventory
+printf
"hello-world--mainline--1.0/README\nhello-world--mainline--1.0/hello-world.c\n"
| sort > ,,expected-inventory
diff -u ,,actual-inventory ,,expected-inventory
end_test
@@ -60,7 +60,7 @@
touch X/Y
tla import --automatic [EMAIL PROTECTED]/hello-world--mainline3--1.0
tla inventory -sB | sort > ,,actual-inventory
-echo -e "README\nhello-world.c\nX\nX/Y" | sort > ,,expected-inventory
+printf "README\nhello-world.c\nX\nX/Y\n" | sort > ,,expected-inventory
diff -u ,,actual-inventory ,,expected-inventory
end_test
@@ -72,7 +72,7 @@
cd ..
tla import --automatic -d hello-world--mainline--1.0 [EMAIL
PROTECTED]/hello-world--mainline4--1.0
tla inventory -sB hello-world--mainline--1.0 | sort > ,,actual-inventory
-echo -e
"hello-world--mainline--1.0/README\nhello-world--mainline--1.0/hello-world.c\nhello-world--mainline--1.0/X\nhello-world--mainline--1.0/X/Y"
| sort > ,,expected-inventory
+printf
"hello-world--mainline--1.0/README\nhello-world--mainline--1.0/hello-world.c\nhello-world--mainline--1.0/X\nhello-world--mainline--1.0/X/Y\n"
| sort > ,,expected-inventory
diff -u ,,actual-inventory ,,expected-inventory
end_test
@@ -86,7 +86,7 @@
cd ..
tla import --automatic -d hello-world--mainline--1.0 [EMAIL
PROTECTED]/hello-world--mainline5--1.0
tla inventory -sB hello-world--mainline--1.0 | sort > ,,actual-inventory
-echo -e
"hello-world--mainline--1.0/README\nhello-world--mainline--1.0/hello-world.c\nhello-world--mainline--1.0/X\nhello-world--mainline--1.0/X/Y\nhello-world--mainline--1.0/X/x\nhello-world--mainline--1.0/X/x/y"
| sort > ,,expected-inventory
+printf
"hello-world--mainline--1.0/README\nhello-world--mainline--1.0/hello-world.c\nhello-world--mainline--1.0/X\nhello-world--mainline--1.0/X/Y\nhello-world--mainline--1.0/X/x\nhello-world--mainline--1.0/X/x/y\n"
| sort > ,,expected-inventory
diff -u ,,actual-inventory ,,expected-inventory
end_test
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-import.sh
bazaar-1.4.2/src/baz/tests/test-import.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-import.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-import.sh 2008-05-04 02:59:21.000000000
+0100
@@ -24,7 +24,7 @@
tla id-tagging-method explicit
tla add hello-world.c README
tla import -L 'initial import'
-test "$(tla categories [EMAIL PROTECTED])" = "$(echo -e hello-world)"
+test "$(tla categories [EMAIL PROTECTED])" = "$(echo hello-world)"
test "$(tla branches [EMAIL PROTECTED]/hello-world)" = "hello-world--mainline"
test "$(tla versions [EMAIL PROTECTED]/hello-world--mainline)" =
"hello-world--mainline--1.0"
test -d $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world/hello-world--mainline/hello-world--mainline--1.0/base-0
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-inventory.sh
bazaar-1.4.2/src/baz/tests/test-inventory.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-inventory.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-inventory.sh 2008-05-04
02:59:21.000000000 +0100
@@ -98,9 +98,9 @@
begin_test "explicit_id mvs id file not file is rename (and patch to the files
to reverse their content)"
tla get [EMAIL PROTECTED]/hello-world--mainline--1.0 hello-world
cd hello-world
-mv .arch-ids/READ{ME,}.id
-mv .arch-ids/{hello-world.c,README}.id
-mv .arch-ids/{READ,hello-world.c}.id
+mv .arch-ids/README.id .arch-ids/READ.id
+mv .arch-ids/hello-world.c.id .arch-ids/README.id
+mv .arch-ids/READ.id .arch-ids/hello-world.c.id
tla status > ,,changes && test_fail "no changes detected '$(tla diff)'"
file_matches "R.*README.*=>.*hello-world.c" ,,changes || test_fail "rename
README not detected"
file_matches "R.*hello-world.c.*=>.*README" ,,changes || test_fail "rename
hello-world not detected"
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-log.sh
bazaar-1.4.2/src/baz/tests/test-log.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-log.sh 2008-05-04 02:57:35.000000000
+0100
+++ bazaar-1.4.2/src/baz/tests/test-log.sh 2008-05-04 02:59:21.000000000
+0100
@@ -107,7 +107,7 @@
#=======================================================
begin_test "log can handle multiple revisions"
-tla get $JANEBCH foo 1>&2>/dev/null
+tla get $JANEBCH foo >/dev/null 2>&1
cd foo
tla commit -s "commit for patch-1"
tla log > ,,log-output
@@ -130,7 +130,7 @@
tla branch $JANEBCH \
$FOOBCH
-tla get $FOOBCH foo 1>&2>/dev/null
+tla get $FOOBCH foo >/dev/null 2>&1
cd foo
tla commit -s "This is my first local patch"
tla commit -s "This is my second local patch"
@@ -177,7 +177,7 @@
JANEHOME=$(tla whereis-archive [EMAIL PROTECTED])
tla register-archive -d [EMAIL PROTECTED]
-tla get $FOOBCH foo 1>&2>/dev/null
+tla get $FOOBCH foo >/dev/null 2>&1
cd foo
tla log > ,,log-output
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-merge.sh
bazaar-1.4.2/src/baz/tests/test-merge.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-merge.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-merge.sh 2008-05-04 02:59:21.000000000
+0100
@@ -222,7 +222,8 @@
cd ..
tla get [EMAIL PROTECTED]/hello-world--merge-unrecognised--1.0--patch-1 bar
cd bar
-tla apply-delta --three-way [EMAIL
PROTECTED]/hello-world--merge-unrecognised--1.0--patch-{1,2}
+tla apply-delta --three-way [EMAIL
PROTECTED]/hello-world--merge-unrecognised--1.0--patch-1 \
+ [EMAIL PROTECTED]/hello-world--merge-unrecognised--1.0--patch-2
tla lint
tla status
end_test
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-mirror.sh
bazaar-1.4.2/src/baz/tests/test-mirror.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-mirror.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-mirror.sh 2008-05-04 02:59:21.000000000
+0100
@@ -64,10 +64,10 @@
begin_test "Archive-mirror pushing with no my-id"
rm -rf ${ARCHIVEDIR}/jane-archive-mirror/hello-world--mainline--1.0
-mv ${HOME}/.arch-params/\=id{,.old}
+mv ${HOME}/.arch-params/\=id ${HOME}/.arch-params/\=id.old
tla archive-mirror [EMAIL PROTECTED]
test -d ${ARCHIVEDIR}/jane-archive-mirror/hello-world--mainline--1.0/base-0
-mv ${HOME}/.arch-params/\=id{.old,}
+mv ${HOME}/.arch-params/\=id.old ${HOME}/.arch-params/\=id
end_test
begin_test "Archive-mirror pushing copies ancestry"
@@ -79,12 +79,17 @@
begin_test "Archive-mirror pushing does not fail without ancestry"
rm -rf ${ARCHIVEDIR}/jane-archive-mirror/hello-world--mainline--1.0
-mv
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz{,.old}
-mv
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz.checksum{,.old}
+mv ${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz \
+
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz.old
+mv
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz.checksum
\
+
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz.checksum.old
test ! -f
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz
tla archive-mirror [EMAIL PROTECTED]
-mv
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz{.old,}
-mv
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz.checksum{.old,}
+mv
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz.old \
+ ${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz
+mv
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz.checksum.old
\
+
${ARCHIVEDIR}/jane-archive/hello-world--mainline--1.0/base-0/ancestry.gz.checksum
+
end_test
begin_test "Mirroring does not use the cache"
@@ -100,7 +105,7 @@
tla cache-config -d
tla register-archive -d [EMAIL PROTECTED]
tla register-archive ${CACHEDARCHIVEDIR}/jane-archive-mirror
-test "$(tla archive-meta-info [EMAIL PROTECTED]/mirror)" ==\
+test "$(tla archive-meta-info [EMAIL PROTECTED]/mirror)" =\
"[EMAIL PROTECTED]"
tla get [EMAIL PROTECTED]/hello-world--mainline--1.0--patch-1
tla register-archive -d [EMAIL PROTECTED]
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-signing.sh
bazaar-1.4.2/src/baz/tests/test-signing.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-signing.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-signing.sh 2008-05-04 02:59:21.000000000
+0100
@@ -53,47 +53,52 @@
end_test
begin_test "make-archive -m sets signing if the original is"
-cp ~/.arch-params/archives/[EMAIL PROTECTED],.old}
+cp ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
tla make-archive --mirror [EMAIL PROTECTED] ${ARCHIVEDIR}/jane-archive-mirror
[ -e ${ARCHIVEDIR}/jane-archive-mirror/=meta-info/signed-archive ] ||
test_fail "make-archive -m did not create signing flag automatically"
rm -rf $CACHEDIR/archives/[EMAIL PROTECTED]
rm -rf ${ARCHIVEDIR}/jane-archive-mirror
-mv ~/.arch-params/archives/[EMAIL PROTECTED],}
+mv ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
rm -f ~/.arch-params/=locations/[EMAIL PROTECTED]
end_test
begin_test "make-archive -m set not set signing if the original isn't"
-cp ~/.arch-params/archives/[EMAIL PROTECTED],.old}
-mv $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive{,.old}
+cp ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
+mv $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive \
+ $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive.old
tla make-archive --mirror [EMAIL PROTECTED] ${ARCHIVEDIR}/jane-archive-mirror
[ -e ${ARCHIVEDIR}/jane-archive-mirror/=meta-info/signed-archive ] &&
test_fail "make-archive -m set the signing flag incorrectly"
rm -rf $CACHEDIR/archives/[EMAIL PROTECTED]
rm -rf ${ARCHIVEDIR}/jane-archive-mirror
rm -f ~/.arch-params/=locations/[EMAIL PROTECTED]
-mv ~/.arch-params/archives/[EMAIL PROTECTED],}
-mv $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive{.old,}
+mv ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
+mv $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive.old \
+ $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive
end_test
begin_test "make-archive -M sets signing if the original is"
-cp ~/.arch-params/archives/[EMAIL PROTECTED],.old}
+cp ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
[ -e ~/.arch-params/archives/[EMAIL PROTECTED] ] && test_fail "-SOURCE false
archive registration exists"
tla make-archive --mirror-from [EMAIL PROTECTED]
${ARCHIVEDIR}/jane-archive-mirror
[ -e ~/.arch-params/archives/[EMAIL PROTECTED] ] && test_fail "-SOURCE false
archive registration exists"
[ -e ${ARCHIVEDIR}/jane-archive-mirror/=meta-info/signed-archive ] ||
test_fail "make-archive -M did not create signing flag automatically"
rm -rf $CACHEDIR/archives/[EMAIL PROTECTED]
rm -rf ${ARCHIVEDIR}/jane-archive-mirror
-mv ~/.arch-params/archives/[EMAIL PROTECTED],}
+mv ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
end_test
begin_test "make-archive -M does not set signing if the original isn't"
-cp ~/.arch-params/archives/[EMAIL PROTECTED],.old}
-mv $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive{,.old}
+cp ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
+mv $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive \
+ $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive.old
tla make-archive --mirror [EMAIL PROTECTED] ${ARCHIVEDIR}/jane-archive-mirror
[ -e ${ARCHIVEDIR}/jane-archive-mirror/=meta-info/signed-archive ] &&
test_fail "make-archive -M set the signing flag incorrectly"
rm -rf $CACHEDIR/archives/[EMAIL PROTECTED]
rm -rf ${ARCHIVEDIR}/jane-archive-mirror
-mv ~/.arch-params/archives/[EMAIL PROTECTED],}
-mv $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive{.old,}
+mv ~/.arch-params/archives/[EMAIL PROTECTED] \
+ ~/.arch-params/archives/[EMAIL PROTECTED]
+mv $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive.old \
+ $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/\=meta-info/signed-archive
end_test
@@ -331,24 +336,24 @@
end_test
begin_test "unsigned archives with when_unsigned=warn warn on read"
-cp ~/.arch-params/archives/[EMAIL PROTECTED],.old}
+cp ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
echo "when_unsigned=warn" >> ~/.arch-params/archives/[EMAIL PROTECTED] ||
test_fail "couldn't set when_unsigned"
rm -rf $CACHEDIR/archives/[EMAIL PROTECTED] || test_fail "couldn't remove the
[EMAIL PROTECTED] archive cached data"
tla get [EMAIL PROTECTED]/demo--0 2>,,error-out || test_fail "couldn't get
foo's tree"
file_matches 'WARNING: archive .* is configured as a signed archive'
,,error-out || test_fail "no warning emiitted"
-mv ~/.arch-params/archives/[EMAIL PROTECTED],}
+mv ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
end_test
begin_test "unsigned archives with when_unsigned=error error on read"
-cp ~/.arch-params/archives/[EMAIL PROTECTED],.old}
+cp ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
echo "when_unsigned=error" >> ~/.arch-params/archives/[EMAIL PROTECTED]
rm -rf $CACHEDIR/archives/[EMAIL PROTECTED]
tla get [EMAIL PROTECTED]/demo--0 && test_fail "accessed unsigned archive when
when_unsigned=error"
-mv ~/.arch-params/archives/[EMAIL PROTECTED],}
+mv ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
end_test
begin_test "cannot commit to unsigned archives with when_unsigned=error"
-cp ~/.arch-params/archives/[EMAIL PROTECTED],.old}
+cp ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
echo "when_unsigned=ignore" >> ~/.arch-params/archives/[EMAIL PROTECTED]
rm -rf $CACHEDIR/archives/[EMAIL PROTECTED]
tla get [EMAIL PROTECTED]/demo--0 demo
@@ -356,7 +361,7 @@
tla add demo/new-file-2
echo "when_unsigned=error" > ~/.arch-params/archives/[EMAIL PROTECTED]
tla commit -d demo -s 'commit 2' && test_fail "commited to unsigned archive
when when_unsigned=error"
-mv ~/.arch-params/archives/[EMAIL PROTECTED],}
+mv ~/.arch-params/archives/[EMAIL PROTECTED] ~/.arch-params/archives/[EMAIL
PROTECTED]
end_test
begin_test "change-archive --remove-signatures"
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-switch.sh
bazaar-1.4.2/src/baz/tests/test-switch.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-switch.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-switch.sh 2008-05-04 02:59:21.000000000
+0100
@@ -28,13 +28,13 @@
begin_test "switch changes tree version"
setup_switch
tla switch [EMAIL PROTECTED]/hello-world--devo--1.3
-[ "[EMAIL PROTECTED]/hello-world--devo--1.3" == $(tla tree-version) ]
+[ "[EMAIL PROTECTED]/hello-world--devo--1.3" = $(tla tree-version) ]
end_test
begin_test "switch changes tree for a revision"
setup_switch
tla switch [EMAIL PROTECTED]/hello-world--devo--1.3--base-0
-[ "[EMAIL PROTECTED]/hello-world--devo--1.3" == $(tla tree-version) ]
+[ "[EMAIL PROTECTED]/hello-world--devo--1.3" = $(tla tree-version) ]
end_test
begin_test "switch with no changes has no changes in the new version"
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-tag-baz.sh
bazaar-1.4.2/src/baz/tests/test-tag-baz.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-tag-baz.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-tag-baz.sh 2008-05-04 02:59:21.000000000
+0100
@@ -45,7 +45,7 @@
test -f foo-hello-world/README
test -f $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world--devo--1.3/base-0/ancestry.gz || test_fail "Missing
ancestry data file"
test -f $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world--devo--1.3/base-0/ancestry.gz.checksum || test_fail
"Missing ancestry checksum"
-test "$(gunzip -c $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world--devo--1.3/base-0/ancestry.gz)" = "$(echo -e 'arch
ancestry version 1\narch:patch:[EMAIL
PROTECTED]/hello-world--devo--1.3--base-0\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--base-0')"
+test "$(gunzip -c $(tla whereis-archive [EMAIL PROTECTED]|sed
s/cached://)/hello-world--devo--1.3/base-0/ancestry.gz)" = "$(printf 'arch
ancestry version 1\narch:patch:[EMAIL
PROTECTED]/hello-world--devo--1.3--base-0\narch:patch:[EMAIL
PROTECTED]/hello-world--mainline--1.0--base-0\n')"
end_test
clean_workdir
diff -urNad bazaar-1.4.2.orig/src/baz/tests/test-update.sh
bazaar-1.4.2/src/baz/tests/test-update.sh
--- bazaar-1.4.2.orig/src/baz/tests/test-update.sh 2008-05-04
02:57:35.000000000 +0100
+++ bazaar-1.4.2/src/baz/tests/test-update.sh 2008-05-04 02:59:21.000000000
+0100
@@ -77,11 +77,11 @@
echo "second" > foo
tla commit -s 'rev 2'
tla undo patch-1
-[ "$(tla tree-id)" == $fqver--patch-1 ] || test_fail "wrong tree id $(tla
tree-id)"
+[ "$(tla tree-id)" = $fqver--patch-1 ] || test_fail "wrong tree id $(tla
tree-id)"
file_matches first foo || test_fail "wrong content in foo: $(cat foo)"
tla update > ,,update-output
tla diff || test_fail "changes present after update: $(tla diff)"
-[ "$(tla tree-id)" == $fqver--patch-2 ] || test_fail "wrong tree id $(tla
tree-id)"
+[ "$(tla tree-id)" = $fqver--patch-2 ] || test_fail "wrong tree id $(tla
tree-id)"
file_matches second foo || test_fail "wrong content in foo: $(cat foo)"
end_test
signature.asc
Description: PGP signature
