projects
/
dupemerge
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't report size in --progress unless it changes
[dupemerge]
/
faster-dupemerge
diff --git
a/faster-dupemerge
b/faster-dupemerge
index 714d47404d193cdbbf8480e84cb68c00e6ea8d9b..232c6bd3474958f8bd097187b23ec87457104a29 100755
(executable)
--- a/
faster-dupemerge
+++ b/
faster-dupemerge
@@
-541,7
+541,7
@@
candidate_file:
if ($link_done) {
delete $inode_to_file_name{$to_inode}->{$to_file};
if ($link_done) {
delete $inode_to_file_name{$to_inode}->{$to_file};
- $inode_to_file_name{$from_inode}->{$to_file} = undef;
+ $inode_to_file_name{$from_inode}->{$to_file} = undef
unless ($dry_run)
;
$hash_to_inode{$digest} = [ $from_inode ];
$hard_links++;
$hash_to_inode{$digest} = [ $from_inode ];
$hard_links++;
@@
-589,6
+589,7
@@
end_merge:
}
my $last_time = 0;
}
my $last_time = 0;
+my $last_size = 0;
while (<FIND>) {
my ($weak_key, $size, $dev, $ino, $name) = m/^((\d+) \d+ \d+ \d+ -?[\d.]+) (\d+) (\d+) (.+)\0$/so;
while (<FIND>) {
my ($weak_key, $size, $dev, $ino, $name) = m/^((\d+) \d+ \d+ \d+ -?[\d.]+) (\d+) (\d+) (.+)\0$/so;
@@
-608,8
+609,9
@@
while (<FIND>) {
if ($progress) {
my $this_time = time();
if ($progress) {
my $this_time = time();
- if ($this_time != $last_time) {
+ if ($this_time != $last_time
&& $size != $last_size
) {
$last_time = $this_time;
$last_time = $this_time;
+ $last_size = $size;
print STDERR "($size)";
}
}
print STDERR "($size)";
}
}