Skip to content

L
liblongpath-rsync
Commit 503f1634 authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

Decided against shortening the output of --itemize-changes.

parent f17e769e
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 80 deletions
log.c
View file @ 503f1634
......@@ -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 ? '+' : '?';
......
testsuite/devices.test
View file @ 503f1634
......@@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/block2"
$RSYNC -ai "$fromdir/block" "$todir/block2" \
| tee "$outfile"
cat <<EOT >"$chkfile"
cD++++++ block
cD+++++++ block
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
$RSYNC -ai "$fromdir/block2" "$todir/block" \
| tee "$outfile"
cat <<EOT >"$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 <<EOT >"$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 <<EOT >"$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' \
......
testsuite/itemize.test
View file @ 503f1634
......@@ -29,14 +29,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/extra"
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$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 <<EOT >"$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 <<EOT >"$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 <<EOT >"$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 <<EOT >"$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 <<EOT >"$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 <<EOT >"$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 <<EOT >"$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 <<EOT >"$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 <<EOT >"$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 <<EOT >"$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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment