From 03cf606dcb29a9e541ee462005dd0d0e4709dadd Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 15 Mar 2020 11:29:41 -0700 Subject: drop some parens Signed-off-by: Sean Whitton --- lib/App/annex_review_unused.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/App/annex_review_unused.pm b/lib/App/annex_review_unused.pm index 22e7a56..2527193 100644 --- a/lib/App/annex_review_unused.pm +++ b/lib/App/annex_review_unused.pm @@ -110,9 +110,9 @@ sub main { unless ($just_print) { # truncate log output if necessary to ensure user's # terminal does not scroll - my (undef, $height) = GetTerminalSize(); - splice @log_lines, (($height - 5) - @log_lines) - if @log_lines > ($height - 5); + my (undef, $height) = GetTerminalSize; + splice @log_lines, $height - (5 + @log_lines) + if 5 + @log_lines > $height; } print "\n"; say for @log_lines; @@ -122,7 +122,7 @@ sub main { # before prompting, clear out stdin, to avoid # registered a keypress more than once ReadMode 4; - 1 while defined ReadKey(-1); + 1 while defined ReadKey -1; my @opts = ('y', 'n'); push @opts, 'o' if $contentlocation; @@ -137,7 +137,7 @@ sub main { ReadMode 0; # respond to C-c - exit 0 if ord($response) == 3; + exit 0 if ord $response == 3; say $response; $response = lc($response); -- cgit v1.2.3 From 8fc6a67b991df9989a939784e6f2c95ea3e09af3 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 18 Mar 2020 12:49:10 -0700 Subject: annex-to-annex-dropunused: Fix attempt to call wrong main() routine Signed-off-by: Sean Whitton --- Changes | 2 ++ bin/annex-to-annex-dropunused | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 7d72e95..6eb888b 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for Git::Annex {{$NEXT}} + - annex-to-annex-dropunused: Fix attempt to call wrong main() + routine. 0.003 2020-03-11 14:35:04-07:00 America/Phoenix - annex-to-annex: Fix path passed to git-annex-find(1) when diff --git a/bin/annex-to-annex-dropunused b/bin/annex-to-annex-dropunused index bbbea80..c09cdc5 100755 --- a/bin/annex-to-annex-dropunused +++ b/bin/annex-to-annex-dropunused @@ -41,4 +41,4 @@ git-annex-dropunused(1), annex-to-annex(1), annex-to-annex-reinject(1) =cut use App::annex_to_annex_dropunused; -exit App::annex_to_annex->main; +exit App::annex_to_annex_dropunused->main; -- cgit v1.2.3 From aa6212d85c9319022b3bddeebc9ec8cb3ce999c6 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 18 Mar 2020 12:49:43 -0700 Subject: annex-to-annex-reinject: Add missing import of File::Temp Signed-off-by: Sean Whitton --- Changes | 1 + lib/App/annex_to_annex_reinject.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/Changes b/Changes index 6eb888b..c4e751d 100644 --- a/Changes +++ b/Changes @@ -3,6 +3,7 @@ Revision history for Git::Annex {{$NEXT}} - annex-to-annex-dropunused: Fix attempt to call wrong main() routine. + - annex-to-annex-reinject: Add missing import of File::Temp. 0.003 2020-03-11 14:35:04-07:00 America/Phoenix - annex-to-annex: Fix path passed to git-annex-find(1) when diff --git a/lib/App/annex_to_annex_reinject.pm b/lib/App/annex_to_annex_reinject.pm index 5a0296f..e28e3c5 100644 --- a/lib/App/annex_to_annex_reinject.pm +++ b/lib/App/annex_to_annex_reinject.pm @@ -29,6 +29,7 @@ use File::Path qw(rmtree); use File::Spec::Functions qw(rel2abs); use File::Find; use Try::Tiny; +use File::Temp qw(tempdir); exit main() unless caller; -- cgit v1.2.3 From 2373c17235f356d04af5abbaafd018ec5b483ac3 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 18 Mar 2020 17:08:32 -0700 Subject: bump version Signed-off-by: Sean Whitton --- dist.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist.ini b/dist.ini index a85f87c..deb765e 100644 --- a/dist.ini +++ b/dist.ini @@ -4,7 +4,7 @@ license = GPL_3 copyright_holder = Sean Whitton copyright_year = 2019-2020 -version = 0.003 +version = 0.004 [PkgVersion] [PodWeaver] -- cgit v1.2.3 From c504f3db57bde35394b836f8fccddfe8de7b9f2b Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 18 Mar 2020 17:19:15 -0700 Subject: v0.004 - annex-to-annex-dropunused: Fix attempt to call wrong main() routine. - annex-to-annex-reinject: Add missing import of File::Temp. Signed-off-by: Sean Whitton --- Changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes b/Changes index c4e751d..b27b32f 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for Git::Annex {{$NEXT}} + +0.004 2020-03-18 17:08:57-07:00 America/Phoenix - annex-to-annex-dropunused: Fix attempt to call wrong main() routine. - annex-to-annex-reinject: Add missing import of File::Temp. -- cgit v1.2.3 From a8b379bc42ff868e00f49b4c38adaf53538e987d Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 18 Mar 2020 17:19:47 -0700 Subject: changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a11a9eb..6be59c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgit-annex-perl (0.004-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Sean Whitton Wed, 18 Mar 2020 17:19:44 -0700 + libgit-annex-perl (0.003-1) unstable; urgency=medium * New upstream release. -- cgit v1.2.3 From 51132c73cacd2ad962028bae72a62667f713579a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 18 Mar 2020 17:30:51 -0700 Subject: finalise changelog for 0.004-1 upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6be59c8..d75509a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libgit-annex-perl (0.004-1) UNRELEASED; urgency=medium +libgit-annex-perl (0.004-1) unstable; urgency=medium * New upstream release. - -- Sean Whitton Wed, 18 Mar 2020 17:19:44 -0700 + -- Sean Whitton Wed, 18 Mar 2020 17:30:48 -0700 libgit-annex-perl (0.003-1) unstable; urgency=medium -- cgit v1.2.3 From fd3989e1fba704e8cece4ff68c14814d272bdc75 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 22 Mar 2020 09:38:52 -0700 Subject: annex-review-unused: Add missing prompt_yn subroutine Signed-off-by: Sean Whitton --- Changes | 1 + lib/App/annex_review_unused.pm | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/Changes b/Changes index b27b32f..fd88f5d 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,7 @@ Revision history for Git::Annex {{$NEXT}} + - annex-review-unused: Add missing prompt_yn subroutine. 0.004 2020-03-18 17:08:57-07:00 America/Phoenix - annex-to-annex-dropunused: Fix attempt to call wrong main() diff --git a/lib/App/annex_review_unused.pm b/lib/App/annex_review_unused.pm index 2527193..340c17f 100644 --- a/lib/App/annex_review_unused.pm +++ b/lib/App/annex_review_unused.pm @@ -192,6 +192,19 @@ sub _say_bullet { _say_bold(" • ", @_) } sub _say_spaced_bullet { _say_bold("\n", " • ", @_, "\n") } +sub prompt_yn { + my $prompt = shift; + local $| = 1; + my $response; + while (1) { + print colored(['bold'], "$prompt "); + chomp(my $response = ); + return 1 if lc($response) eq "y"; + return 0 if lc($response) eq "n"; + say "invalid response"; + } +} + sub exit { $exit_main = shift // 0; goto EXIT_MAIN } 1; -- cgit v1.2.3 From fbbf46846a2b1879438f823360efde8c67743f73 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 22 Mar 2020 09:39:45 -0700 Subject: annex-review-unused: Always pass --force to 'git annex dropunused' Signed-off-by: Sean Whitton --- Changes | 2 ++ lib/App/annex_review_unused.pm | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changes b/Changes index fd88f5d..ecab379 100644 --- a/Changes +++ b/Changes @@ -2,6 +2,8 @@ Revision history for Git::Annex {{$NEXT}} - annex-review-unused: Add missing prompt_yn subroutine. + - annex-review-unused: Always pass --force to 'git annex dropunused'. + Previously it couldn't be passed at all, which is much less useful. 0.004 2020-03-18 17:08:57-07:00 America/Phoenix - annex-to-annex-dropunused: Fix attempt to call wrong main() diff --git a/lib/App/annex_review_unused.pm b/lib/App/annex_review_unused.pm index 340c17f..5c5e5a7 100644 --- a/lib/App/annex_review_unused.pm +++ b/lib/App/annex_review_unused.pm @@ -170,10 +170,9 @@ sub main { } if (@to_drop) { - _say_spaced_bullet("Will dropunused" - . (exists $dropunused_args{force} ? " with --force:" : ":")); + _say_spaced_bullet("Will dropunused with --force:"); say "@to_drop\n"; - $annex->annex->dropunused(\%dropunused_args, @to_drop) + $annex->annex->dropunused(\%dropunused_args, "--force", @to_drop) if prompt_yn("Go ahead with this?"); } -- cgit v1.2.3 From 767057768a49e73f523939c2f43da0f65f684638 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 11:49:13 -0700 Subject: bump version Signed-off-by: Sean Whitton --- dist.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist.ini b/dist.ini index deb765e..b7d27d0 100644 --- a/dist.ini +++ b/dist.ini @@ -4,7 +4,7 @@ license = GPL_3 copyright_holder = Sean Whitton copyright_year = 2019-2020 -version = 0.004 +version = 0.005 [PkgVersion] [PodWeaver] -- cgit v1.2.3 From 9b579adba92e8b01ff31542ef69b4cad735115f9 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 11:55:29 -0700 Subject: prefix prompt_yn with an underscore Signed-off-by: Sean Whitton --- lib/App/annex_review_unused.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/App/annex_review_unused.pm b/lib/App/annex_review_unused.pm index 5c5e5a7..eae6cd0 100644 --- a/lib/App/annex_review_unused.pm +++ b/lib/App/annex_review_unused.pm @@ -173,7 +173,7 @@ sub main { _say_spaced_bullet("Will dropunused with --force:"); say "@to_drop\n"; $annex->annex->dropunused(\%dropunused_args, "--force", @to_drop) - if prompt_yn("Go ahead with this?"); + if _prompt_yn("Go ahead with this?"); } # exit value represents whether or not there are any unused files left @@ -191,7 +191,7 @@ sub _say_bullet { _say_bold(" • ", @_) } sub _say_spaced_bullet { _say_bold("\n", " • ", @_, "\n") } -sub prompt_yn { +sub _prompt_yn { my $prompt = shift; local $| = 1; my $response; -- cgit v1.2.3 From 9c43d14b9e1f670404f8b5b121632edc0bee373e Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 11:57:23 -0700 Subject: v0.005 - annex-review-unused: Add missing prompt_yn subroutine. - annex-review-unused: Always pass --force to 'git annex dropunused'. Previously it couldn't be passed at all, which is much less useful. Signed-off-by: Sean Whitton --- Changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes b/Changes index ecab379..7837fcd 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for Git::Annex {{$NEXT}} + +0.005 2020-03-23 11:55:48-07:00 America/Phoenix - annex-review-unused: Add missing prompt_yn subroutine. - annex-review-unused: Always pass --force to 'git annex dropunused'. Previously it couldn't be passed at all, which is much less useful. -- cgit v1.2.3 From 5bf786eff41c90e83748cd3ce91951759d722876 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 11:57:49 -0700 Subject: changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index d75509a..0814020 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgit-annex-perl (0.005-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Sean Whitton Mon, 23 Mar 2020 11:57:44 -0700 + libgit-annex-perl (0.004-1) unstable; urgency=medium * New upstream release. -- cgit v1.2.3 From 0af20403e80fe271cc5069308f6e1d36406decdc Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 12:03:36 -0700 Subject: finalise changelog for 0.005-1 upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0814020..21fc93b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libgit-annex-perl (0.005-1) UNRELEASED; urgency=medium +libgit-annex-perl (0.005-1) unstable; urgency=medium * New upstream release. - -- Sean Whitton Mon, 23 Mar 2020 11:57:44 -0700 + -- Sean Whitton Mon, 23 Mar 2020 12:03:32 -0700 libgit-annex-perl (0.004-1) unstable; urgency=medium -- cgit v1.2.3 From ba87ebd4ffed0667d0f8600fe54d005e056710b8 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 17:01:30 -0700 Subject: annex-review-unused: Check whether unused files still exist earlier Signed-off-by: Sean Whitton --- Changes | 2 ++ lib/App/annex_review_unused.pm | 46 ++++++++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/Changes b/Changes index 7837fcd..a68a8f1 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for Git::Annex {{$NEXT}} + - annex-review-unused: Check whether unused files still exist earlier. + Avoids misleading output when --just-print is supplied. 0.005 2020-03-23 11:55:48-07:00 America/Phoenix - annex-review-unused: Add missing prompt_yn subroutine. diff --git a/lib/App/annex_review_unused.pm b/lib/App/annex_review_unused.pm index eae6cd0..4e6bb47 100644 --- a/lib/App/annex_review_unused.pm +++ b/lib/App/annex_review_unused.pm @@ -67,7 +67,28 @@ sub main { $unused_opts{used_refspec} = $used_refspec_arg if $used_refspec_arg; my @to_drop; - my @unused_files = @{ $annex->unused(%unused_opts, log => 1) }; + my @unused_files = grep { + # check the unused file still exists i.e. has not been dropped + # already (in the case of reviewing unused files at a remote, + # just check that it's not been dropped according to the local + # git-annex branch by using readpresentkey rather than + # checkpresentkey) + + my $ret = $_->{contentlocation} + = $annex->abs_contentlocation($_->{key}); + + if ($from_arg) { + #<<< + try { + $annex->annex->readpresentkey($_->{key}, $uuid); + } catch { + $ret = 0; + }; + #>>> + } + + $ret; + } $annex->unused(%unused_opts, log => 1)->@*; exit unless @unused_files; if ($just_print) { _say_spaced_bullet("There are unused files you can drop with" @@ -77,27 +98,8 @@ sub main { } my $i = 0; UNUSED: while ($i < @unused_files) { - my $unused_file = $unused_files[$i]; - - # check the unused file still exists i.e. has not been dropped - # already (in the case of reviewing unused files at a remote, just - # check that it's not been dropped according to the local - # git-annex branch by using readpresentkey rather than - # checkpresentkey) - my $contentlocation = $annex->abs_contentlocation($unused_file->{key}); - if ($from_arg) { - #<<< - try { - $annex->annex->readpresentkey($unused_file->{key}, $uuid); - } catch { - splice @unused_files, $i, 1; - next UNUSED; - }; - #>>> - } elsif (!$contentlocation) { - splice @unused_files, $i, 1; - next UNUSED; - } + my $unused_file = $unused_files[$i]; + my $contentlocation = $unused_file->{contentlocation}; system qw(clear -x) unless $just_print; _say_bold("unused file #" . $unused_file->{number} . ":"); -- cgit v1.2.3 From ce6f40bde2492c6d6f7b33b7098712456c198269 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 17:01:41 -0700 Subject: add some parens to avoid perltidy inserting a spurious space Signed-off-by: Sean Whitton --- lib/App/annex_review_unused.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/App/annex_review_unused.pm b/lib/App/annex_review_unused.pm index 4e6bb47..dd2ed23 100644 --- a/lib/App/annex_review_unused.pm +++ b/lib/App/annex_review_unused.pm @@ -124,7 +124,7 @@ sub main { # before prompting, clear out stdin, to avoid # registered a keypress more than once ReadMode 4; - 1 while defined ReadKey -1; + 1 while defined ReadKey(-1); my @opts = ('y', 'n'); push @opts, 'o' if $contentlocation; -- cgit v1.2.3 From 15f16879f4400a7edabfc5fe22807bb195c860b3 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 17:02:19 -0700 Subject: bump version Signed-off-by: Sean Whitton --- dist.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist.ini b/dist.ini index b7d27d0..1d52ed8 100644 --- a/dist.ini +++ b/dist.ini @@ -4,7 +4,7 @@ license = GPL_3 copyright_holder = Sean Whitton copyright_year = 2019-2020 -version = 0.005 +version = 0.006 [PkgVersion] [PodWeaver] -- cgit v1.2.3 From e5d36bfcae4b6d52747ea7815a08ed8392bcd07c Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 17:03:11 -0700 Subject: v0.006 - annex-review-unused: Check whether unused files still exist earlier. Avoids misleading output when --just-print is supplied. Signed-off-by: Sean Whitton --- Changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changes b/Changes index a68a8f1..a7995b0 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,8 @@ Revision history for Git::Annex {{$NEXT}} + +0.006 2020-03-23 17:02:28-07:00 America/Phoenix - annex-review-unused: Check whether unused files still exist earlier. Avoids misleading output when --just-print is supplied. -- cgit v1.2.3 From 52cbb20ae16750640673d07ec5fe1d77a1f57960 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 23 Mar 2020 17:03:36 -0700 Subject: changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 21fc93b..428637e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libgit-annex-perl (0.006-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Sean Whitton Mon, 23 Mar 2020 17:03:32 -0700 + libgit-annex-perl (0.005-1) unstable; urgency=medium * New upstream release. -- cgit v1.2.3 From d8cb539465e002f77f4766b03942344c2491b3ae Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 24 Mar 2020 11:12:25 -0700 Subject: finalise changelog for 0.006-1 upload --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 428637e..648af51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libgit-annex-perl (0.006-1) UNRELEASED; urgency=medium +libgit-annex-perl (0.006-1) unstable; urgency=medium * New upstream release. - -- Sean Whitton Mon, 23 Mar 2020 17:03:32 -0700 + -- Sean Whitton Tue, 24 Mar 2020 11:12:23 -0700 libgit-annex-perl (0.005-1) unstable; urgency=medium -- cgit v1.2.3