From 503f163446bf4ba8a8cd0f521a24e5ef1e6c872e Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 9 Feb 2006 01:17:01 +0000 Subject: [PATCH] Decided against shortening the output of --itemize-changes. --- log.c | 3 +- testsuite/devices.test | 24 ++++---- testsuite/itemize.test | 134 ++++++++++++++++++++--------------------- 3 files changed, 81 insertions(+), 80 deletions(-) diff --git a/log.c b/log.c index 743cf934..72a28370 100644 --- a/log.c +++ b/log.c @@ -608,7 +608,8 @@ static void log_formatted(enum logcode code, char *format, char *op, n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; - n[8] = '\0'; + n[8] = '.'; + n[9] = '\0'; if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { char ch = iflags & ITEM_IS_NEW ? '+' : '?'; diff --git a/testsuite/devices.test b/testsuite/devices.test index 84a746cc..84086d4b 100644 --- a/testsuite/devices.test +++ b/testsuite/devices.test @@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/block2" $RSYNC -ai "$fromdir/block" "$todir/block2" \ | tee "$outfile" cat <"$chkfile" -cD++++++ block +cD+++++++ block EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed" $RSYNC -ai "$fromdir/block2" "$todir/block" \ | tee "$outfile" cat <"$chkfile" -cD++++++ block2 +cD+++++++ block2 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed" @@ -58,7 +58,7 @@ sleep 1 $RSYNC -Di "$fromdir/block3" "$todir/block" \ | tee "$outfile" cat <"$chkfile" -cD..T... block3 +cD..T.... block3 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" @@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -.d..t... ./ -cD..t... block -cD...... block2 -cD++++++ block3 -hD++++++ block2.5 => block3 -cD++++++ char -cD++++++ char2 -cD++++++ char3 -cS++++++ fifo +.d..t.... ./ +cD..t.... block +cD....... block2 +cD+++++++ block3 +hD+++++++ block2.5 => block3 +cD+++++++ char +cD+++++++ char2 +cD+++++++ char3 +cS+++++++ fifo EOT if test ! -b "$fromdir/block2.5"; then sed -e '/block2\.5/d' \ diff --git a/testsuite/itemize.test b/testsuite/itemize.test index 82fa4fcf..c77ace5f 100644 --- a/testsuite/itemize.test +++ b/testsuite/itemize.test @@ -29,14 +29,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/extra" $RSYNC -iplr "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -cd++++++ bar/ -cd++++++ bar/baz/ ->f++++++ bar/baz/rsync -cd++++++ foo/ ->f++++++ foo/config1 ->f++++++ foo/config2 ->f++++++ foo/extra -cL++++++ foo/sym -> ../bar/baz/rsync +cd+++++++ bar/ +cd+++++++ bar/baz/ +>f+++++++ bar/baz/rsync +cd+++++++ foo/ +>f+++++++ foo/config1 +>f+++++++ foo/config2 +>f+++++++ foo/extra +cL+++++++ foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed" @@ -48,10 +48,10 @@ chmod 601 "$fromdir/foo/config2" $RSYNC -iplrH "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" ->f..T... bar/baz/rsync ->f..T... foo/config1 ->f.sTp.. foo/config2 -hf..T... foo/extra => foo/config1 +>f..T.... bar/baz/rsync +>f..T.... foo/config1 +>f.sTp... foo/config2 +hf..T.... foo/extra => foo/config1 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed" @@ -68,11 +68,11 @@ chmod 777 "$todir/bar/baz/rsync" $RSYNC -iplrtc "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.f..tp.. bar/baz/rsync -.d..t... foo/ -.f..t... foo/config1 ->fcstp.. foo/config2 -cL..T... foo/sym -> ../bar/baz/rsync +.f..tp... bar/baz/rsync +.d..t.... foo/ +.f..t.... foo/config1 +>fcstp... foo/config2 +cL..T.... foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" @@ -97,15 +97,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -.d ./ -.d bar/ -.d bar/baz/ -.f...p.. bar/baz/rsync -.d foo/ -.f foo/config1 ->f..t... foo/config2 -hf foo/extra -.L foo/sym -> ../bar/baz/rsync +.d ./ +.d bar/ +.d bar/baz/ +.f...p... bar/baz/rsync +.d foo/ +.f foo/config1 +>f..t.... foo/config2 +hf foo/extra +.L foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed" @@ -124,8 +124,8 @@ touch "$todir/foo/config2" $RSYNC -iplrtH "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.f...p.. foo/config1 ->f..t... foo/config2 +.f...p... foo/config1 +>f..t.... foo/config2 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed" @@ -134,15 +134,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -.d..t... ./ -cd++++++ bar/ -cd++++++ bar/baz/ -cf bar/baz/rsync -cd++++++ foo/ -cf foo/config1 -cf foo/config2 -hf foo/extra => foo/config1 -cL..T... foo/sym -> ../bar/baz/rsync +.d..t.... ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +cf bar/baz/rsync +cd+++++++ foo/ +cf foo/config1 +cf foo/config2 +hf foo/extra => foo/config1 +cL..T.... foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed" @@ -150,11 +150,11 @@ rm -rf "$todir" $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.d..t... ./ -cd++++++ bar/ -cd++++++ bar/baz/ -cd++++++ foo/ -hf foo/extra => foo/config1 +.d..t.... ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +cd+++++++ foo/ +hf foo/extra => foo/config1 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed" @@ -181,15 +181,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -.d..t... ./ -cd++++++ bar/ -cd++++++ bar/baz/ -hf bar/baz/rsync -cd++++++ foo/ -hf foo/config1 -hf foo/config2 -hf foo/extra => foo/config1 -hL foo/sym -> ../bar/baz/rsync +.d..t.... ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +hf bar/baz/rsync +cd+++++++ foo/ +hf foo/config1 +hf foo/config2 +hf foo/extra => foo/config1 +hL foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed" @@ -197,10 +197,10 @@ rm -rf "$todir" $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.d..t... ./ -cd++++++ bar/ -cd++++++ bar/baz/ -cd++++++ foo/ +.d..t.... ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +cd+++++++ foo/ EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed" @@ -228,14 +228,14 @@ filter_outfile # TODO fix really-old problem when combining -H with --compare-dest: # missing output for foo/extra hard-link (and it might not be updated)! cat <"$chkfile" -.d..t... ./ -cd++++++ bar/ -cd++++++ bar/baz/ -.f bar/baz/rsync -cd++++++ foo/ -.f foo/config1 -.f foo/config2 -.L foo/sym -> ../bar/baz/rsync +.d..t.... ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +.f bar/baz/rsync +cd+++++++ foo/ +.f foo/config1 +.f foo/config2 +.L foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed" @@ -243,10 +243,10 @@ rm -rf "$todir" $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.d..t... ./ -cd++++++ bar/ -cd++++++ bar/baz/ -cd++++++ foo/ +.d..t.... ./ +cd+++++++ bar/ +cd+++++++ bar/baz/ +cd+++++++ foo/ EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed" -- 2.34.1