From d9563ea5516e8e786debf223e10ec11695aee9d7 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 9 Feb 2017 01:37:03 +0000 Subject: [PATCH] repobrowse: shorten internal names We'll still be keeping "repobrowse" for the public API for use with .psgi files, but shortening the name means less typing and we may have command-line tools, too. --- MANIFEST | 36 +++++++++---------- .../{RepobrowseBase.pm => RepoBase.pm} | 4 +-- .../{RepobrowseConfig.pm => RepoConfig.pm} | 2 +- .../{RepobrowseGit.pm => RepoGit.pm} | 4 +-- .../{RepobrowseGitAtom.pm => RepoGitAtom.pm} | 6 ++-- .../{RepobrowseGitBlob.pm => RepoGitBlob.pm} | 6 ++-- ...epobrowseGitCommit.pm => RepoGitCommit.pm} | 12 +++---- .../{RepobrowseGitDiff.pm => RepoGitDiff.pm} | 8 ++--- ...eGitDiffCommon.pm => RepoGitDiffCommon.pm} | 4 +-- ...rowseGitFallback.pm => RepoGitFallback.pm} | 6 ++-- .../{RepobrowseGitLog.pm => RepoGitLog.pm} | 8 ++--- ...{RepobrowseGitPatch.pm => RepoGitPatch.pm} | 6 ++-- ...{RepobrowseGitPlain.pm => RepoGitPlain.pm} | 8 ++--- ...{RepobrowseGitQuery.pm => RepoGitQuery.pm} | 2 +- ...rowseGitSnapshot.pm => RepoGitSnapshot.pm} | 6 ++-- ...obrowseGitSummary.pm => RepoGitSummary.pm} | 4 +-- .../{RepobrowseGitTag.pm => RepoGitTag.pm} | 6 ++-- .../{RepobrowseGitTree.pm => RepoGitTree.pm} | 6 ++-- .../{RepobrowseRoot.pm => RepoRoot.pm} | 4 +-- lib/PublicInbox/Repobrowse.pm | 14 ++++---- t/repobrowse_git.t | 2 +- 21 files changed, 77 insertions(+), 77 deletions(-) rename lib/PublicInbox/{RepobrowseBase.pm => RepoBase.pm} (97%) rename lib/PublicInbox/{RepobrowseConfig.pm => RepoConfig.pm} (98%) rename lib/PublicInbox/{RepobrowseGit.pm => RepoGit.pm} (94%) rename lib/PublicInbox/{RepobrowseGitAtom.pm => RepoGitAtom.pm} (96%) rename lib/PublicInbox/{RepobrowseGitBlob.pm => RepoGitBlob.pm} (93%) rename lib/PublicInbox/{RepobrowseGitCommit.pm => RepoGitCommit.pm} (94%) rename lib/PublicInbox/{RepobrowseGitDiff.pm => RepoGitDiff.pm} (92%) rename lib/PublicInbox/{RepobrowseGitDiffCommon.pm => RepoGitDiffCommon.pm} (98%) rename lib/PublicInbox/{RepobrowseGitFallback.pm => RepoGitFallback.pm} (80%) rename lib/PublicInbox/{RepobrowseGitLog.pm => RepoGitLog.pm} (94%) rename lib/PublicInbox/{RepobrowseGitPatch.pm => RepoGitPatch.pm} (88%) rename lib/PublicInbox/{RepobrowseGitPlain.pm => RepoGitPlain.pm} (93%) rename lib/PublicInbox/{RepobrowseGitQuery.pm => RepoGitQuery.pm} (96%) rename lib/PublicInbox/{RepobrowseGitSnapshot.pm => RepoGitSnapshot.pm} (95%) rename lib/PublicInbox/{RepobrowseGitSummary.pm => RepoGitSummary.pm} (97%) rename lib/PublicInbox/{RepobrowseGitTag.pm => RepoGitTag.pm} (97%) rename lib/PublicInbox/{RepobrowseGitTree.pm => RepoGitTree.pm} (97%) rename lib/PublicInbox/{RepobrowseRoot.pm => RepoRoot.pm} (96%) diff --git a/MANIFEST b/MANIFEST index d0223c655..a59d9dcc2 100644 --- a/MANIFEST +++ b/MANIFEST @@ -80,27 +80,27 @@ lib/PublicInbox/NewsWWW.pm lib/PublicInbox/ParentPipe.pm lib/PublicInbox/ProcessPipe.pm lib/PublicInbox/Qspawn.pm +lib/PublicInbox/RepoBase.pm +lib/PublicInbox/RepoConfig.pm +lib/PublicInbox/RepoGit.pm +lib/PublicInbox/RepoGitAtom.pm +lib/PublicInbox/RepoGitBlob.pm +lib/PublicInbox/RepoGitCommit.pm +lib/PublicInbox/RepoGitDiff.pm +lib/PublicInbox/RepoGitDiffCommon.pm +lib/PublicInbox/RepoGitFallback.pm +lib/PublicInbox/RepoGitLog.pm +lib/PublicInbox/RepoGitPatch.pm +lib/PublicInbox/RepoGitPlain.pm +lib/PublicInbox/RepoGitQuery.pm lib/PublicInbox/RepoGitSearch.pm lib/PublicInbox/RepoGitSearchIdx.pm +lib/PublicInbox/RepoGitSnapshot.pm +lib/PublicInbox/RepoGitSummary.pm +lib/PublicInbox/RepoGitTag.pm +lib/PublicInbox/RepoGitTree.pm +lib/PublicInbox/RepoRoot.pm lib/PublicInbox/Repobrowse.pm -lib/PublicInbox/RepobrowseBase.pm -lib/PublicInbox/RepobrowseConfig.pm -lib/PublicInbox/RepobrowseGit.pm -lib/PublicInbox/RepobrowseGitAtom.pm -lib/PublicInbox/RepobrowseGitBlob.pm -lib/PublicInbox/RepobrowseGitCommit.pm -lib/PublicInbox/RepobrowseGitDiff.pm -lib/PublicInbox/RepobrowseGitDiffCommon.pm -lib/PublicInbox/RepobrowseGitFallback.pm -lib/PublicInbox/RepobrowseGitLog.pm -lib/PublicInbox/RepobrowseGitPatch.pm -lib/PublicInbox/RepobrowseGitPlain.pm -lib/PublicInbox/RepobrowseGitQuery.pm -lib/PublicInbox/RepobrowseGitSnapshot.pm -lib/PublicInbox/RepobrowseGitSummary.pm -lib/PublicInbox/RepobrowseGitTag.pm -lib/PublicInbox/RepobrowseGitTree.pm -lib/PublicInbox/RepobrowseRoot.pm lib/PublicInbox/SaPlugin/ListMirror.pm lib/PublicInbox/Search.pm lib/PublicInbox/SearchIdx.pm diff --git a/lib/PublicInbox/RepobrowseBase.pm b/lib/PublicInbox/RepoBase.pm similarity index 97% rename from lib/PublicInbox/RepobrowseBase.pm rename to lib/PublicInbox/RepoBase.pm index 44f422df3..e60677d65 100644 --- a/lib/PublicInbox/RepobrowseBase.pm +++ b/lib/PublicInbox/RepoBase.pm @@ -1,9 +1,9 @@ # Copyright (C) 2015 all contributors # License: AGPL-3.0+ -package PublicInbox::RepobrowseBase; +package PublicInbox::RepoBase; use strict; use warnings; -require PublicInbox::RepobrowseGitQuery; +require PublicInbox::RepoGitQuery; use PublicInbox::Hval; our %MIME_TYPE_WHITELIST = ('application/pdf' => 1); diff --git a/lib/PublicInbox/RepobrowseConfig.pm b/lib/PublicInbox/RepoConfig.pm similarity index 98% rename from lib/PublicInbox/RepobrowseConfig.pm rename to lib/PublicInbox/RepoConfig.pm index a08c6cecd..323468525 100644 --- a/lib/PublicInbox/RepobrowseConfig.pm +++ b/lib/PublicInbox/RepoConfig.pm @@ -1,6 +1,6 @@ # Copyright (C) 2015 all contributors # License: AGPL-3.0+ -package PublicInbox::RepobrowseConfig; +package PublicInbox::RepoConfig; use strict; use warnings; use PublicInbox::Inbox; diff --git a/lib/PublicInbox/RepobrowseGit.pm b/lib/PublicInbox/RepoGit.pm similarity index 94% rename from lib/PublicInbox/RepobrowseGit.pm rename to lib/PublicInbox/RepoGit.pm index eb79e5634..f7bf0b9d5 100644 --- a/lib/PublicInbox/RepobrowseGit.pm +++ b/lib/PublicInbox/RepoGit.pm @@ -1,8 +1,8 @@ # Copyright (C) 2015 all contributors # License: AGPL-3.0+ (https://www.gnu.org/licenses/agpl-3.0.txt) -# common functions used by other RepobrowseGit* modules -package PublicInbox::RepobrowseGit; +# common functions used by other RepoGit* modules +package PublicInbox::RepoGit; use strict; use warnings; use base qw(Exporter); diff --git a/lib/PublicInbox/RepobrowseGitAtom.pm b/lib/PublicInbox/RepoGitAtom.pm similarity index 96% rename from lib/PublicInbox/RepobrowseGitAtom.pm rename to lib/PublicInbox/RepoGitAtom.pm index 65b723c4c..a9f401261 100644 --- a/lib/PublicInbox/RepobrowseGitAtom.pm +++ b/lib/PublicInbox/RepoGitAtom.pm @@ -2,11 +2,11 @@ # License: AGPL-3.0+ # show log as an Atom feed -package PublicInbox::RepobrowseGitAtom; +package PublicInbox::RepoGitAtom; use strict; use warnings; use PublicInbox::Hval qw(utf8_html); -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use PublicInbox::Qspawn; use constant DATEFMT => '%Y-%m-%dT%H:%M:%SZ'; @@ -139,7 +139,7 @@ sub call_git_atom { my $git = $repo_info->{git}; my $env = $req->{env}; - my $q =$req->{'q'} = PublicInbox::RepobrowseGitQuery->new($env); + my $q =$req->{'q'} = PublicInbox::RepoGitQuery->new($env); my $h = $q->{h}; my $read_log = sub { my $cmd = $git->cmd(qw(log --no-notes --no-color diff --git a/lib/PublicInbox/RepobrowseGitBlob.pm b/lib/PublicInbox/RepoGitBlob.pm similarity index 93% rename from lib/PublicInbox/RepobrowseGitBlob.pm rename to lib/PublicInbox/RepoGitBlob.pm index a11c457ce..586b4acc4 100644 --- a/lib/PublicInbox/RepobrowseGitBlob.pm +++ b/lib/PublicInbox/RepoGitBlob.pm @@ -2,17 +2,17 @@ # License: AGPL-3.0+ # Show a blob as-is -package PublicInbox::RepobrowseGitBlob; +package PublicInbox::RepoGitBlob; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use base qw(Exporter); our @EXPORT = qw(git_blob_mime_type git_blob_stream_response); sub call_git_blob { my ($self, $req) = @_; my $git = $req->{repo_info}->{git}; - my $q = PublicInbox::RepobrowseGitQuery->new($req->{env}); + my $q = PublicInbox::RepoGitQuery->new($req->{env}); my $id = $q->{id}; $id eq '' and $id = 'HEAD'; $id .= ":$req->{expath}"; diff --git a/lib/PublicInbox/RepobrowseGitCommit.pm b/lib/PublicInbox/RepoGitCommit.pm similarity index 94% rename from lib/PublicInbox/RepobrowseGitCommit.pm rename to lib/PublicInbox/RepoGitCommit.pm index 6eadd2e54..e98c3c181 100644 --- a/lib/PublicInbox/RepobrowseGitCommit.pm +++ b/lib/PublicInbox/RepoGitCommit.pm @@ -11,13 +11,13 @@ # punish the common case with extra bytes if somebody uses 'D' or 'P' # in filenames. -package PublicInbox::RepobrowseGitCommit; +package PublicInbox::RepoGitCommit; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use PublicInbox::Hval qw(utf8_html to_attr); -use PublicInbox::RepobrowseGit qw(git_unquote git_commit_title); -use PublicInbox::RepobrowseGitDiffCommon; +use PublicInbox::RepoGit qw(git_unquote git_commit_title); +use PublicInbox::RepoGitDiffCommon; use PublicInbox::Qspawn; use constant GIT_FMT => '--pretty=format:'.join('%n', @@ -116,10 +116,10 @@ sub git_commit_sed ($$) { } } -sub call_git_commit { # RepobrowseBase calls this +sub call_git_commit { # RepoBase calls this my ($self, $req) = @_; my $env = $req->{env}; - my $q = PublicInbox::RepobrowseGitQuery->new($env); + my $q = PublicInbox::RepoGitQuery->new($env); my $id = $q->{id}; $id eq '' and $id = 'HEAD'; diff --git a/lib/PublicInbox/RepobrowseGitDiff.pm b/lib/PublicInbox/RepoGitDiff.pm similarity index 92% rename from lib/PublicInbox/RepobrowseGitDiff.pm rename to lib/PublicInbox/RepoGitDiff.pm index e2b7179fb..bb71e7385 100644 --- a/lib/PublicInbox/RepobrowseGitDiff.pm +++ b/lib/PublicInbox/RepoGitDiff.pm @@ -6,12 +6,12 @@ # # We probably will not link to this outright because it's expensive, # but exists to preserve URL compatibility with cgit. -package PublicInbox::RepobrowseGitDiff; +package PublicInbox::RepoGitDiff; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use PublicInbox::Hval qw(utf8_html); -use PublicInbox::RepobrowseGitDiffCommon; +use PublicInbox::RepoGitDiffCommon; use PublicInbox::Qspawn; sub git_diff_sed ($$) { @@ -35,7 +35,7 @@ sub git_diff_sed ($$) { sub call_git_diff { my ($self, $req) = @_; my $env = $req->{env}; - my $q = PublicInbox::RepobrowseGitQuery->new($env); + my $q = PublicInbox::RepoGitQuery->new($env); my $id = $q->{id}; my $id2 = $q->{id2}; diff --git a/lib/PublicInbox/RepobrowseGitDiffCommon.pm b/lib/PublicInbox/RepoGitDiffCommon.pm similarity index 98% rename from lib/PublicInbox/RepobrowseGitDiffCommon.pm rename to lib/PublicInbox/RepoGitDiffCommon.pm index 968ca7a7c..0604f9dd4 100644 --- a/lib/PublicInbox/RepobrowseGitDiffCommon.pm +++ b/lib/PublicInbox/RepoGitDiffCommon.pm @@ -2,10 +2,10 @@ # License: AGPL-3.0+ # common git diff-related code -package PublicInbox::RepobrowseGitDiffCommon; +package PublicInbox::RepoGitDiffCommon; use strict; use warnings; -use PublicInbox::RepobrowseGit qw/git_unquote git_commit_title/; +use PublicInbox::RepoGit qw/git_unquote git_commit_title/; use PublicInbox::Hval qw/utf8_html to_attr/; use base qw/Exporter/; our @EXPORT = qw/git_diff_sed_init git_diff_sed_close git_diff_sed_run diff --git a/lib/PublicInbox/RepobrowseGitFallback.pm b/lib/PublicInbox/RepoGitFallback.pm similarity index 80% rename from lib/PublicInbox/RepobrowseGitFallback.pm rename to lib/PublicInbox/RepoGitFallback.pm index 386401392..5ce469be2 100644 --- a/lib/PublicInbox/RepobrowseGitFallback.pm +++ b/lib/PublicInbox/RepoGitFallback.pm @@ -3,13 +3,13 @@ # when no endpoints match, fallback to this and serve a static file # This can serve Smart HTTP in the future. -package PublicInbox::RepobrowseGitFallback; +package PublicInbox::RepoGitFallback; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use PublicInbox::GitHTTPBackend; -# overrides PublicInbox::RepobrowseBase::call +# overrides PublicInbox::RepoBase::call sub call { my ($self, undef, $req) = @_; my $expath = $req->{expath}; diff --git a/lib/PublicInbox/RepobrowseGitLog.pm b/lib/PublicInbox/RepoGitLog.pm similarity index 94% rename from lib/PublicInbox/RepobrowseGitLog.pm rename to lib/PublicInbox/RepoGitLog.pm index 85593cb85..9cfa526e7 100644 --- a/lib/PublicInbox/RepobrowseGitLog.pm +++ b/lib/PublicInbox/RepoGitLog.pm @@ -2,12 +2,12 @@ # License: AGPL-3.0+ # show the log view -package PublicInbox::RepobrowseGitLog; +package PublicInbox::RepoGitLog; use strict; use warnings; use PublicInbox::Hval qw(utf8_html); -use base qw(PublicInbox::RepobrowseBase); -use PublicInbox::RepobrowseGit qw(git_dec_links git_commit_title); +use base qw(PublicInbox::RepoBase); +use PublicInbox::RepoGit qw(git_dec_links git_commit_title); use PublicInbox::Qspawn; # cannot rely on --date=format-local:... yet, it is too new (September 2015) use constant STATES => qw(h p D ai an s b); @@ -126,7 +126,7 @@ sub call_git_log { $max = int($max); $max = 50 if $max == 0; my $env = $req->{env}; - my $q = $req->{'q'} = PublicInbox::RepobrowseGitQuery->new($env); + my $q = $req->{'q'} = PublicInbox::RepoGitQuery->new($env); my $h = $q->{h}; $h eq '' and $h = 'HEAD'; my $git = $repo_info->{git}; diff --git a/lib/PublicInbox/RepobrowseGitPatch.pm b/lib/PublicInbox/RepoGitPatch.pm similarity index 88% rename from lib/PublicInbox/RepobrowseGitPatch.pm rename to lib/PublicInbox/RepoGitPatch.pm index 5ae768e8f..e9227b6fe 100644 --- a/lib/PublicInbox/RepobrowseGitPatch.pm +++ b/lib/PublicInbox/RepoGitPatch.pm @@ -3,10 +3,10 @@ # shows the /patch/ endpoint for git repositories # usage: /repo.git/patch?id=COMMIT_ID -package PublicInbox::RepobrowseGitPatch; +package PublicInbox::RepoGitPatch; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use PublicInbox::Qspawn; # try to be educational and show the command-line used in the signature @@ -17,7 +17,7 @@ sub call_git_patch { my ($self, $req) = @_; my $git = $req->{repo_info}->{git}; my $env = $req->{env}; - my $q = PublicInbox::RepobrowseGitQuery->new($env); + my $q = PublicInbox::RepoGitQuery->new($env); my $id = $q->{id}; $id =~ /\A[\w-]+([~\^][~\^\d])*\z/ or $id = 'HEAD'; diff --git a/lib/PublicInbox/RepobrowseGitPlain.pm b/lib/PublicInbox/RepoGitPlain.pm similarity index 93% rename from lib/PublicInbox/RepobrowseGitPlain.pm rename to lib/PublicInbox/RepoGitPlain.pm index 24cc70b04..2ba24e08f 100644 --- a/lib/PublicInbox/RepobrowseGitPlain.pm +++ b/lib/PublicInbox/RepoGitPlain.pm @@ -1,17 +1,17 @@ # Copyright (C) 2015-2016 all contributors # License: AGPL-3.0+ -package PublicInbox::RepobrowseGitPlain; +package PublicInbox::RepoGitPlain; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); -use PublicInbox::RepobrowseGitBlob; +use base qw(PublicInbox::RepoBase); +use PublicInbox::RepoGitBlob; use PublicInbox::Hval qw(utf8_html); use PublicInbox::Qspawn; sub call_git_plain { my ($self, $req) = @_; my $git = $req->{repo_info}->{git}; - my $q = PublicInbox::RepobrowseGitQuery->new($req->{env}); + my $q = PublicInbox::RepoGitQuery->new($req->{env}); my $id = $q->{id}; $id eq '' and $id = 'HEAD'; $id .= ":$req->{expath}"; diff --git a/lib/PublicInbox/RepobrowseGitQuery.pm b/lib/PublicInbox/RepoGitQuery.pm similarity index 96% rename from lib/PublicInbox/RepobrowseGitQuery.pm rename to lib/PublicInbox/RepoGitQuery.pm index 1140f6faf..638a13160 100644 --- a/lib/PublicInbox/RepobrowseGitQuery.pm +++ b/lib/PublicInbox/RepoGitQuery.pm @@ -2,7 +2,7 @@ # License: AGPL-3.0+ # query parameter management for repobrowse -package PublicInbox::RepobrowseGitQuery; +package PublicInbox::RepoGitQuery; use strict; use warnings; use PublicInbox::Hval; diff --git a/lib/PublicInbox/RepobrowseGitSnapshot.pm b/lib/PublicInbox/RepoGitSnapshot.pm similarity index 95% rename from lib/PublicInbox/RepobrowseGitSnapshot.pm rename to lib/PublicInbox/RepoGitSnapshot.pm index 450fdad6e..e05ad80cd 100644 --- a/lib/PublicInbox/RepobrowseGitSnapshot.pm +++ b/lib/PublicInbox/RepoGitSnapshot.pm @@ -5,10 +5,10 @@ # Mainly for compatibility reasons with cgit, I'm unsure if # showing this in a repository viewer is a good idea. -package PublicInbox::RepobrowseGitSnapshot; +package PublicInbox::RepoGitSnapshot; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use PublicInbox::Git; use PublicInbox::Qspawn; our $SUFFIX; @@ -33,7 +33,7 @@ our %FMT_TYPES = ( 'zip' => 'application/x-zip', ); -sub call_git_snapshot ($$) { # invoked by PublicInbox::RepobrowseBase::call +sub call_git_snapshot ($$) { # invoked by PublicInbox::RepoBase::call my ($self, $req) = @_; my @extra = @{$req->{extra}}; diff --git a/lib/PublicInbox/RepobrowseGitSummary.pm b/lib/PublicInbox/RepoGitSummary.pm similarity index 97% rename from lib/PublicInbox/RepobrowseGitSummary.pm rename to lib/PublicInbox/RepoGitSummary.pm index e7739ecde..e9e1458b3 100644 --- a/lib/PublicInbox/RepobrowseGitSummary.pm +++ b/lib/PublicInbox/RepoGitSummary.pm @@ -2,11 +2,11 @@ # License: AGPL-3.0+ # The main summary/landing page of a git repository viewer -package PublicInbox::RepobrowseGitSummary; +package PublicInbox::RepoGitSummary; use strict; use warnings; use PublicInbox::Hval qw(utf8_html); -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use PublicInbox::Qspawn; sub call_git_summary { diff --git a/lib/PublicInbox/RepobrowseGitTag.pm b/lib/PublicInbox/RepoGitTag.pm similarity index 97% rename from lib/PublicInbox/RepobrowseGitTag.pm rename to lib/PublicInbox/RepoGitTag.pm index 1d26eab05..96835b2cd 100644 --- a/lib/PublicInbox/RepobrowseGitTag.pm +++ b/lib/PublicInbox/RepoGitTag.pm @@ -2,10 +2,10 @@ # License: AGPL-3.0+ # shows the /tag/ endpoint for git repositories -package PublicInbox::RepobrowseGitTag; +package PublicInbox::RepoGitTag; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use POSIX qw(strftime); use PublicInbox::Hval qw(utf8_html); use PublicInbox::Qspawn; @@ -19,7 +19,7 @@ my %cmd_map = ( # type => action sub call_git_tag { my ($self, $req) = @_; - my $q = PublicInbox::RepobrowseGitQuery->new($req->{env}); + my $q = PublicInbox::RepoGitQuery->new($req->{env}); my $h = $q->{h}; $h eq '' and return git_tag_list($self, $req); sub { diff --git a/lib/PublicInbox/RepobrowseGitTree.pm b/lib/PublicInbox/RepoGitTree.pm similarity index 97% rename from lib/PublicInbox/RepobrowseGitTree.pm rename to lib/PublicInbox/RepoGitTree.pm index c242fd1a8..4a68cf69c 100644 --- a/lib/PublicInbox/RepobrowseGitTree.pm +++ b/lib/PublicInbox/RepoGitTree.pm @@ -1,9 +1,9 @@ # Copyright (C) 2015 all contributors # License: AGPL-3.0+ -package PublicInbox::RepobrowseGitTree; +package PublicInbox::RepoGitTree; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use PublicInbox::Hval qw(utf8_html); use PublicInbox::Qspawn; @@ -21,7 +21,7 @@ sub call_git_tree { my ($self, $req) = @_; my @extra = @{$req->{extra}}; my $git = $req->{repo_info}->{git}; - my $q = PublicInbox::RepobrowseGitQuery->new($req->{env}); + my $q = PublicInbox::RepoGitQuery->new($req->{env}); my $id = $q->{id}; if ($id eq '') { chomp($id = $git->qx(qw(rev-parse --short=10 HEAD))); diff --git a/lib/PublicInbox/RepobrowseRoot.pm b/lib/PublicInbox/RepoRoot.pm similarity index 96% rename from lib/PublicInbox/RepobrowseRoot.pm rename to lib/PublicInbox/RepoRoot.pm index fda964377..9ab25b977 100644 --- a/lib/PublicInbox/RepobrowseRoot.pm +++ b/lib/PublicInbox/RepoRoot.pm @@ -2,10 +2,10 @@ # License: AGPL-3.0+ # displays the root '/' where all the projects lie -package PublicInbox::RepobrowseRoot; +package PublicInbox::RepoRoot; use strict; use warnings; -use base qw(PublicInbox::RepobrowseBase); +use base qw(PublicInbox::RepoBase); use PublicInbox::Hval qw(utf8_html); sub call { diff --git a/lib/PublicInbox/Repobrowse.pm b/lib/PublicInbox/Repobrowse.pm index 1050ed502..87e122780 100644 --- a/lib/PublicInbox/Repobrowse.pm +++ b/lib/PublicInbox/Repobrowse.pm @@ -21,7 +21,7 @@ package PublicInbox::Repobrowse; use strict; use warnings; use URI::Escape qw(uri_escape_utf8 uri_unescape); -use PublicInbox::RepobrowseConfig; +use PublicInbox::RepoConfig; my %CMD = map { lc($_) => $_ } qw(Log Commit Tree Patch Blob Plain Tag Atom Diff Snapshot); @@ -30,7 +30,7 @@ my %LOADED; sub new { my ($class, $rconfig) = @_; - $rconfig ||= PublicInbox::RepobrowseConfig->new; + $rconfig ||= PublicInbox::RepoConfig->new; bless { rconfig => $rconfig }, $class; } @@ -80,8 +80,8 @@ sub no_tslash { sub root_index { my ($self) = @_; - my $mod = load_once('PublicInbox::RepobrowseRoot'); - $mod->new->call($self->{rconfig}); # RepobrowseRoot::call + my $mod = load_once('PublicInbox::RepoRoot'); + $mod->new->call($self->{rconfig}); # RepoRoot::call } sub call { @@ -97,7 +97,7 @@ sub call { return $self->root_index($self) unless length($repo_path); - my $rconfig = $self->{rconfig}; # RepobrowseConfig + my $rconfig = $self->{rconfig}; # RepoConfig my $repo_info; until ($repo_info = $rconfig->lookup($repo_path)) { my $p = shift @extra or last; @@ -141,14 +141,14 @@ sub call { return no_tslash($env) if ($tslash && $NO_TSLASH{$mod}); $req->{tslash} = $tslash; - $mod = load_once("PublicInbox::Repobrowse$vcs$mod"); + $mod = load_once("PublicInbox::Repo$vcs$mod"); $vcs = load_once("PublicInbox::$vcs"); # $repo_info->{git} ||= PublicInbox::Git->new(...) $repo_info->{$vcs_lc} ||= $vcs->new($repo_info->{path}); $req->{expath} = join('/', @extra); - my $rv = eval { $mod->new->call($cmd, $req) }; # RepobrowseBase::call + my $rv = eval { $mod->new->call($cmd, $req) }; # RepoBase::call $rv || r404(); } diff --git a/t/repobrowse_git.t b/t/repobrowse_git.t index 6ae7475bb..0ac977f34 100644 --- a/t/repobrowse_git.t +++ b/t/repobrowse_git.t @@ -3,7 +3,7 @@ use strict; use warnings; use Test::More; -use PublicInbox::RepobrowseGit qw(git_unquote); +use PublicInbox::RepoGit qw(git_unquote); is("foo\nbar", git_unquote('"foo\\nbar"'), 'unquoted newline'); is("Eléanor", git_unquote('"El\\303\\251anor"'), 'unquoted octal'); -- 2.47.3