projects
/
dupemerge
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document the file size indicator in --progress output
[dupemerge]
/
faster-dupemerge
diff --git
a/faster-dupemerge
b/faster-dupemerge
index fe23f8e70619443a8cc6fb3637dc6c07354b6ba5..f7334d775cea316ffee6963cb6be11f4249297eb 100755
(executable)
--- a/
faster-dupemerge
+++ b/
faster-dupemerge
@@
-155,6
+155,7
@@
hard links).
S, s - lstat(2) (see source for details)
U - unlink(2)
. - all inodes with similar attributes done
S, s - lstat(2) (see source for details)
U - unlink(2)
. - all inodes with similar attributes done
+ (123456) - current file size in bytes
--sort pass next options (up to --) to sort command
--sort pass next options (up to --) to sort command
@@
-185,7
+186,7
@@
while ($#ARGV >= 0) {
} elsif ($arg eq '--zeros') {
$collapse_zero = 1;
} elsif ($arg eq '--trust' || $arg eq '--skip-compare') {
} elsif ($arg eq '--zeros') {
$collapse_zero = 1;
} elsif ($arg eq '--trust' || $arg eq '--skip-compare') {
- $skip_compare_preference = 1;
+ $skip_compare
s = $skip_compare
_preference = 1;
} elsif ($arg =~ /^--skip-hash(?:=(\d+)([KkMmGgTt]?))?$/os) {
my ($quantity, $unit) = ($1, $2);
$unit ||= '_';
} elsif ($arg =~ /^--skip-hash(?:=(\d+)([KkMmGgTt]?))?$/os) {
my ($quantity, $unit) = ($1, $2);
$unit ||= '_';
@@
-589,6
+590,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;
@@
-598,7
+600,7
@@
while (<FIND>) {
print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;
print STDERR "weak_key=$weak_key inode=$inode name=$name\n" if $debug;
- if ($size >= $skip_hashes_threshold) {
+ if ($s
kip_hashes_threshold && $s
ize >= $skip_hashes_threshold) {
$skip_hashes = 1;
$skip_compares = 0;
} else {
$skip_hashes = 1;
$skip_compares = 0;
} else {
@@
-608,8
+610,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)";
}
}