From: Tomas Doran Date: Sun, 24 Jan 2010 15:02:35 +0000 (+0000) Subject: Change everything round to be /ref/ instead of /commit/ as this makes more sense X-Git-Tag: 0.000006_01~1^2~23 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2980657b3a81921f42d9ae577d42226746a720fa;p=catagits%2FGitalist.git Change everything round to be /ref/ instead of /commit/ as this makes more sense --- diff --git a/lib/Gitalist/Controller/Fragment/Commit.pm b/lib/Gitalist/Controller/Fragment/Ref.pm similarity index 96% rename from lib/Gitalist/Controller/Fragment/Commit.pm rename to lib/Gitalist/Controller/Fragment/Ref.pm index ae1d3b2..310c12c 100644 --- a/lib/Gitalist/Controller/Fragment/Commit.pm +++ b/lib/Gitalist/Controller/Fragment/Ref.pm @@ -1,9 +1,9 @@ -package Gitalist::Controller::Fragment::Commit; +package Gitalist::Controller::Fragment::Ref; use Moose; use namespace::autoclean; BEGIN { extends 'Gitalist::Controller' } -with 'Gitalist::URIStructure::Commit'; +with 'Gitalist::URIStructure::Ref'; sub base : Chained('/fragment/repository/find') PathPart('') CaptureArgs(0) {} diff --git a/lib/Gitalist/Controller/Commit.pm b/lib/Gitalist/Controller/Ref.pm similarity index 95% rename from lib/Gitalist/Controller/Commit.pm rename to lib/Gitalist/Controller/Ref.pm index 1165bea..3abbf55 100644 --- a/lib/Gitalist/Controller/Commit.pm +++ b/lib/Gitalist/Controller/Ref.pm @@ -1,10 +1,10 @@ -package Gitalist::Controller::Commit; +package Gitalist::Controller::Ref; use Moose; use namespace::autoclean; BEGIN { extends 'Gitalist::Controller' } -with 'Gitalist::URIStructure::Commit'; +with 'Gitalist::URIStructure::Ref'; sub base : Chained('/repository/find') PathPart('') CaptureArgs(0) {} diff --git a/lib/Gitalist/URIStructure/Commit.pm b/lib/Gitalist/URIStructure/Ref.pm similarity index 97% rename from lib/Gitalist/URIStructure/Commit.pm rename to lib/Gitalist/URIStructure/Ref.pm index bf2d5ea..dae28c4 100644 --- a/lib/Gitalist/URIStructure/Commit.pm +++ b/lib/Gitalist/URIStructure/Ref.pm @@ -1,4 +1,4 @@ -package Gitalist::URIStructure::Commit; +package Gitalist::URIStructure::Ref; use MooseX::MethodAttributes::Role; use Moose::Autobox; use namespace::autoclean; diff --git a/root/_diff.tt2 b/root/_diff.tt2 index 34618bf..f67dcb6 100644 --- a/root/_diff.tt2 +++ b/root/_diff.tt2 @@ -2,8 +2,8 @@ [% FOREACH item IN diff %]
diff --git [%# FIXME %] - [% item.a %][% item %] - [% item.b %] + [% item.a %][% item %] + [% item.b %]
[% item.index %] diff --git a/root/_diff_tree.tt2 b/root/_diff_tree.tt2 index afcc1db..0b1d8af 100644 --- a/root/_diff_tree.tt2 +++ b/root/_diff_tree.tt2 @@ -32,9 +32,9 @@ %] - [% IF !line.is_new %]diff[% END %] - blob - [% IF !line.is_new %]history[% END %] + [% IF !line.is_new %]diff[% END %] + blob + [% IF !line.is_new %]history[% END %] [% END %] diff --git a/root/commit/diff_plain.tt2 b/root/commit/diff_plain.tt2 deleted file mode 100644 index 9473814..0000000 --- a/root/commit/diff_plain.tt2 +++ /dev/null @@ -1,3 +0,0 @@ -
-[% subinclude('/fragment/commit/diff_plain', c.req.captures) %]
-
diff --git a/root/commit/history.tt2 b/root/commit/history.tt2 deleted file mode 100644 index e580ead..0000000 --- a/root/commit/history.tt2 +++ /dev/null @@ -1,3 +0,0 @@ -[% INCLUDE 'nav/actions.tt2' object = commit %] - -[% subinclude('/fragment/commit/history', c.req.captures, c.req.args.to_path) %] diff --git a/root/fragment/collectionofrepositories.tt2 b/root/fragment/collectionofrepositories.tt2 index 3f8d754..6062e24 100644 --- a/root/fragment/collectionofrepositories.tt2 +++ b/root/fragment/collectionofrepositories.tt2 @@ -9,7 +9,7 @@ summary | shortlog | log - | tree + | tree [% END %] diff --git a/root/fragment/commit/blame.tt2 b/root/fragment/ref/blame.tt2 similarity index 75% rename from root/fragment/commit/blame.tt2 rename to root/fragment/ref/blame.tt2 index d5db5f6..47fc8f7 100644 --- a/root/fragment/commit/blame.tt2 +++ b/root/fragment/ref/blame.tt2 @@ -7,13 +7,13 @@ styleinfo = " style='border-top: solid 3px #" _ linecolour _ ";'"; -%] [% info.commit.author %] [% info.commit.author_dt.ymd %] - [% linecolour %] + [% linecolour %] [%- ELSE -%] [%- END -%] - [% info.meta.lineno %] + [% info.meta.lineno %] 
[% blame_lines.${loop.index} %]
[% lastsha1 = info.commit.sha1 %] diff --git a/root/fragment/commit/blob.tt2 b/root/fragment/ref/blob.tt2 similarity index 100% rename from root/fragment/commit/blob.tt2 rename to root/fragment/ref/blob.tt2 diff --git a/root/fragment/commit/commit.tt2 b/root/fragment/ref/commit.tt2 similarity index 79% rename from root/fragment/commit/commit.tt2 rename to root/fragment/ref/commit.tt2 index c23283a..cc0ee50 100644 --- a/root/fragment/commit/commit.tt2 +++ b/root/fragment/ref/commit.tt2 @@ -16,14 +16,14 @@
[% Commit.sha1 %]
tree
[% Commit.tree_sha1 %] - tree + tree
[% FOREACH parent IN Commit.parents %]
parent
[% parent.sha1 %] - commit - diff + commit + diff
[% END %] diff --git a/root/fragment/commit/diff_fancy.tt2 b/root/fragment/ref/diff_fancy.tt2 similarity index 100% rename from root/fragment/commit/diff_fancy.tt2 rename to root/fragment/ref/diff_fancy.tt2 diff --git a/root/fragment/commit/diff_plain.tt2 b/root/fragment/ref/diff_plain.tt2 similarity index 100% rename from root/fragment/commit/diff_plain.tt2 rename to root/fragment/ref/diff_plain.tt2 diff --git a/root/fragment/commit/history.tt2 b/root/fragment/ref/history.tt2 similarity index 100% rename from root/fragment/commit/history.tt2 rename to root/fragment/ref/history.tt2 diff --git a/root/fragment/commit/tree.tt2 b/root/fragment/ref/tree.tt2 similarity index 62% rename from root/fragment/commit/tree.tt2 rename to root/fragment/ref/tree.tt2 index fc3c695..b3f7a69 100644 --- a/root/fragment/commit/tree.tt2 +++ b/root/fragment/ref/tree.tt2 @@ -19,7 +19,7 @@ [% item.modestr %] [%- action_type = item.type == 'tree' ? 'tree' : 'blob'; - action_for_link = item.type == 'tree' ? '/commit/tree' : '/commit/blob'; + action_for_link = item.type == 'tree' ? '/ref/tree' : '/ref/blob'; blob_or_tree_link = c.uri_for_action(action_for_link, c.req.captures, c.req.args.to_path(item.file)) -%] @@ -28,12 +28,12 @@ [% theact %] [% IF item.type == 'blob' %] - blob - blame + blob + blame [% END %] - history + history [% IF item.type == 'blob' %] - raw + raw [% END %] diff --git a/root/fragment/repository/heads.tt2 b/root/fragment/repository/heads.tt2 index a2ca50e..a05a2ed 100644 --- a/root/fragment/repository/heads.tt2 +++ b/root/fragment/repository/heads.tt2 @@ -21,9 +21,9 @@ [% time_since(head.last_change) %] [% head.name %] [%# FIXME %] - shortlog - log - tree + shortlog + log + tree [% END %] diff --git a/root/fragment/repository/longlog.tt2 b/root/fragment/repository/longlog.tt2 index adf9557..c4f8cec 100644 --- a/root/fragment/repository/longlog.tt2 +++ b/root/fragment/repository/longlog.tt2 @@ -22,9 +22,9 @@ [% time_since(line.authored_time) %]
- commit - | commitdiff - | tree + commit + | commitdiff + | tree
diff --git a/root/fragment/repository/shortlog.tt2 b/root/fragment/repository/shortlog.tt2 index 6008dbd..c6549c4 100644 --- a/root/fragment/repository/shortlog.tt2 +++ b/root/fragment/repository/shortlog.tt2 @@ -31,9 +31,9 @@ [%# INCLUDE '_refs.tt2' object = line %] - commit - commitdiff - tree + commit + commitdiff + tree [% END %] diff --git a/root/nav/actions.tt2 b/root/nav/actions.tt2 index aa3fa0e..2778685 100644 --- a/root/nav/actions.tt2 +++ b/root/nav/actions.tt2 @@ -5,16 +5,16 @@ log [% IF Commit %] § - commit • - commitdiff • - tree + commit • + commitdiff • + tree [% END %] [% IF filename %] § - blob • - raw • - blame • - history • + blob • + raw • + blame • + history • HEAD [% END %]
[% INCLUDE 'inc/chroma_hash.tt2' sha1 = object.sha1 %]
diff --git a/root/nav/path.tt2 b/root/nav/path.tt2 index de01987..96c85de 100644 --- a/root/nav/path.tt2 +++ b/root/nav/path.tt2 @@ -1,7 +1,7 @@
- [% Repository.name %] + [% Repository.name %] [% FOREACH part IN filename.split('/') %] [% path = loop.first ? part : path _ '/' _ part %] - / [% part %] + / [% part %] [% END %]
diff --git a/root/nav/search.tt2 b/root/nav/search.tt2 index b0a7b59..868fc52 100644 --- a/root/nav/search.tt2 +++ b/root/nav/search.tt2 @@ -14,4 +14,4 @@ -[% END %] \ No newline at end of file +[% END %] diff --git a/root/commit/blame.tt2 b/root/ref/blame.tt2 similarity index 87% rename from root/commit/blame.tt2 rename to root/ref/blame.tt2 index 868b73e..d1a25a4 100644 --- a/root/commit/blame.tt2 +++ b/root/ref/blame.tt2 @@ -29,7 +29,7 @@ - [% subinclude('/fragment/commit/blame', c.req.captures, c.req.arguments.to_path ) %] + [% subinclude('/fragment/ref/blame', c.req.captures, c.req.arguments.to_path ) %] diff --git a/root/commit/blob.tt2 b/root/ref/blob.tt2 similarity index 73% rename from root/commit/blob.tt2 rename to root/ref/blob.tt2 index 994b9d7..29a3b7b 100644 --- a/root/commit/blob.tt2 +++ b/root/ref/blob.tt2 @@ -9,6 +9,6 @@ [% END %] [% INCLUDE 'nav/path.tt2' %]
- 
[% subinclude('/fragment/commit/blob', c.req.captures, c.req.args.to_path) %]
+ 
[% subinclude('/fragment/ref/blob', c.req.captures, c.req.args.to_path) %]
diff --git a/root/commit/commit.tt2 b/root/ref/commit.tt2 similarity index 55% rename from root/commit/commit.tt2 rename to root/ref/commit.tt2 index 20b1cca..423d13f 100644 --- a/root/commit/commit.tt2 +++ b/root/ref/commit.tt2 @@ -1,5 +1,5 @@ [% INCLUDE 'nav/actions.tt2' object = commit %]
- [% subinclude('/fragment/commit/commit', c.req.captures) %] + [% subinclude('/fragment/ref/commit', c.req.captures) %]
diff --git a/root/commit/diff_fancy.tt2 b/root/ref/diff_fancy.tt2 similarity index 82% rename from root/commit/diff_fancy.tt2 rename to root/ref/diff_fancy.tt2 index a2ce0bd..bdecf06 100644 --- a/root/commit/diff_fancy.tt2 +++ b/root/ref/diff_fancy.tt2 @@ -10,5 +10,5 @@ - [% subinclude('/fragment/commit/diff_fancy', c.req.captures c.req.args.to_path) %] + [% subinclude('/fragment/ref/diff_fancy', c.req.captures c.req.args.to_path) %] diff --git a/root/ref/diff_plain.tt2 b/root/ref/diff_plain.tt2 new file mode 100644 index 0000000..2d01f98 --- /dev/null +++ b/root/ref/diff_plain.tt2 @@ -0,0 +1,3 @@ +
+[% subinclude('/fragment/ref/diff_plain', c.req.captures) %]
+
diff --git a/root/ref/history.tt2 b/root/ref/history.tt2 new file mode 100644 index 0000000..3ee6374 --- /dev/null +++ b/root/ref/history.tt2 @@ -0,0 +1,3 @@ +[% INCLUDE 'nav/actions.tt2' object = commit %] + +[% subinclude('/fragment/ref/history', c.req.captures, c.req.args.to_path) %] diff --git a/root/commit/shortlog.tt2 b/root/ref/shortlog.tt2 similarity index 100% rename from root/commit/shortlog.tt2 rename to root/ref/shortlog.tt2 diff --git a/root/commit/tree.tt2 b/root/ref/tree.tt2 similarity index 81% rename from root/commit/tree.tt2 rename to root/ref/tree.tt2 index 806fced..4c055f6 100644 --- a/root/commit/tree.tt2 +++ b/root/ref/tree.tt2 @@ -10,6 +10,6 @@ INCLUDE 'nav/path.tt2' filename = path; END; - subinclude('/fragment/commit/tree', c.req.captures); + subinclude('/fragment/ref/tree', c.req.captures); %] diff --git a/root/repository/search.tt2 b/root/repository/search.tt2 index 9c003ce..2f43c79 100644 --- a/root/repository/search.tt2 +++ b/root/repository/search.tt2 @@ -3,7 +3,7 @@ [%# XXX Nabbed the HTML below from gitweb's log action. %] [% FOREACH result IN results %]
- + [% result.authored_time %] [% short_cmt(result.comment) | html %] @@ -11,9 +11,9 @@
- commit - | commitdiff - | tree + commit + | commitdiff + | tree
[% result.author.name | html %] [% line.authored_time %]
diff --git a/root/search.tt2 b/root/search.tt2 index a9437ed..06d845c 100644 --- a/root/search.tt2 +++ b/root/search.tt2 @@ -1 +1 @@ -search \ No newline at end of file +search