test-convert-mtn: test descriptions with quotes

tests/test-convert-mtn

@@ -1,89 +1,89 b''
 #!/bin/sh
 
 "$TESTDIR/hghave" mtn || exit 80
 
 # Monotone directory is called .monotone on *nix and monotone
 # on Windows. Having a variable here ease test patching.
 mtndir=.monotone
 echo "[extensions]" >> $HGRCPATH
 echo "convert=" >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 
 HOME=`pwd`/do_not_use_HOME_mtn; export HOME
 # Windows version of monotone home
 APPDATA=$HOME; export APPDATA
 
 echo % tedious monotone keys configuration
 # The /dev/null redirection is necessary under Windows, or
 # it complains about home directory permissions
 mtn --quiet genkey [e-mail] 1>/dev/null 2>&1 <<EOF
 passphrase
 passphrase
 EOF
 cat >> $HOME/$mtndir/monotonerc <<EOF
 function get_passphrase(keypair_id)
     return "passphrase"
 end
 EOF
 
 echo % create monotone repository
 mtn db init --db=repo.mtn
 mtn --db=repo.mtn --branch=com.selenic.test setup workingdir
 cd workingdir
 echo a > a
 mkdir dir
 echo b > dir/b
 python -c 'file("bin", "wb").write("a\\x00b")'
 echo c > c
 mtn add a dir/b c bin
 mtn ci -m initialize
 echo % update monotone working directory
 mtn mv a dir/a
 echo a >> dir/a
 echo b >> dir/b
 mtn drop c
 python -c 'file("bin", "wb").write("b\\x00c")'
 mtn ci -m update1
 cd ..
 
 echo % convert once
 hg convert -s mtn repo.mtn
 
 cd workingdir
 echo e > e
 mtn add e
 mtn drop dir/b
 mtn mv bin bin2
-mtn ci -m update2
+mtn ci -m 'update2 "with" quotes'
 # Test directory move
 mtn mv dir dir2
 mtn ci -m movedir
 # Test directory removal with empty directory
 mkdir dir2/dir
 mkdir dir2/dir/subdir
 echo f > dir2/dir/subdir/f
 mkdir dir2/dir/emptydir
 mtn add -R dir2/dir
 mtn ci -m emptydir
 mtn drop -R dir2/dir
 mtn ci -m dropdirectory
 cd ..
 
 echo % convert incrementally
 hg convert -s mtn repo.mtn
 
 glog()
 {
     hg glog --template '#rev# "#desc|firstline#" files: #files#\n' "$@"
 }
 
 cd repo.mtn-hg
 hg up -C
 glog
 echo % manifest
 hg manifest
 echo % contents
 cat dir2/a
 test -d dir2/dir && echo 'removed dir2/dir is still there!'
 exit 0
 

tests/test-convert-mtn.out

@@ -1,72 +1,72 b''
 % tedious monotone keys configuration
 % create monotone repository
 mtn: adding a to workspace manifest
 mtn: adding bin to workspace manifest
 mtn: adding c to workspace manifest
 mtn: adding dir to workspace manifest
 mtn: adding dir/b to workspace manifest
 mtn: beginning commit on branch 'com.selenic.test'
 mtn: committed revision 803ef0bf815e35b951dbd4310acd1e45e675016e
 % update monotone working directory
 mtn: skipping dir, already accounted for in workspace
 mtn: renaming a to dir/a in workspace manifest
 mtn: dropping c from workspace manifest
 mtn: beginning commit on branch 'com.selenic.test'
 mtn: committed revision 4daf60753d6fe21a06ce5f716303fe55fd6d3a56
 % convert once
 assuming destination repo.mtn-hg
 initializing destination repo.mtn-hg repository
 scanning source...
 sorting...
 converting...
 1 initialize
 0 update1
 mtn: adding e to workspace manifest
 mtn: dropping dir/b from workspace manifest
 mtn: renaming bin to bin2 in workspace manifest
 mtn: beginning commit on branch 'com.selenic.test'
 mtn: committed revision 6c6977a6ef609ec80e40779f89dbd2772c96de62
 mtn: renaming dir to dir2 in workspace manifest
 mtn: beginning commit on branch 'com.selenic.test'
 mtn: committed revision 5de5abe7c15eae70cf3acdda23c9c319ea50c1af
 mtn: adding dir2/dir to workspace manifest
 mtn: adding dir2/dir/emptydir to workspace manifest
 mtn: adding dir2/dir/subdir to workspace manifest
 mtn: adding dir2/dir/subdir/f to workspace manifest
 mtn: beginning commit on branch 'com.selenic.test'
 mtn: committed revision 27a423be1e406595cc57f50f42a8790fa0a93d8e
 mtn: dropping dir2/dir/subdir/f from workspace manifest
 mtn: dropping dir2/dir/subdir from workspace manifest
 mtn: dropping dir2/dir/emptydir from workspace manifest
 mtn: dropping dir2/dir from workspace manifest
 mtn: beginning commit on branch 'com.selenic.test'
 mtn: committed revision ba57ba5ac63178529d37fa8a2a1a012fc0e42047
 % convert incrementally
 assuming destination repo.mtn-hg
 scanning source...
 sorting...
 converting...
-3 update2
+3 update2 "with" quotes
 2 movedir
 1 emptydir
 0 dropdirectory
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  5 "dropdirectory" files: dir2/dir/subdir/f
 |
 o  4 "emptydir" files: dir2/dir/subdir/f
 |
 o  3 "movedir" files: dir/a dir2/a
 |
-o  2 "update2" files: bin bin2 dir/b e
+o  2 "update2 "with" quotes" files: bin bin2 dir/b e
 |
 o  1 "update1" files: a bin c dir/a dir/b
 |
 o  0 "initialize" files: a bin c dir/b
 
 % manifest
 bin2
 dir2/a
 e
 % contents
 a
 a