]> Sergey Matveev's repositories - public-inbox.git/commitdiff
Merge remote-tracking branch 'origin/purge'
authorEric Wong <e@80x24.org>
Thu, 31 Jan 2019 21:08:48 +0000 (21:08 +0000)
committerEric Wong <e@80x24.org>
Thu, 31 Jan 2019 21:08:48 +0000 (21:08 +0000)
* origin/purge:
  implement public-inbox-purge tool
  v2writable: read epoch on purge
  v2writable: cleanup processes when done
  v2writable: purge ignores non-existent git epoch directories
  v2writable: ->purge returns undef on no-op
  import: purge: reap fast-export process
  hoist out resolve_repo_dir from -index

1  2 
MANIFEST
script/public-inbox-index

diff --cc MANIFEST
Simple merge
index 2ae92757cac6607ec9c6658df3c221c5900dcddb,32121f6d9a5650edc566803e41107d339f8978e6..5adb6e741eff8f2578a780bd40738cd7c42ee7a6
@@@ -9,12 -9,13 +9,13 @@@
  use strict;
  use warnings;
  use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
- use Cwd 'abs_path';
  my $usage = "public-inbox-index REPO_DIR";
  use PublicInbox::Config;
+ use PublicInbox::Admin qw(resolve_repo_dir);
  my $config = eval { PublicInbox::Config->new } || eval {
        warn "public-inbox unconfigured for serving, indexing anyways...\n";
 -      {}
 +      undef;
  };
  eval { require PublicInbox::SearchIdx };
  if ($@) {