Skip to content

Commit 8962b72

Browse files
committed
Commitdiff and fix for issue #1 improved; switched to GitBlit 1.6.2
* Commitdiff: see https://code.google.com/p/gitblit/issues/detail?id=450 * Issue #1: in some cases, there were still problems reloading the plugin. Now tries better to shutdown properly, and does more on re-start to get rid of stale Wicket objects. * GitBlit 1.6.2 includes three bug fixes.
1 parent 845b8b7 commit 8962b72

16 files changed

+3915
-63
lines changed

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,7 @@ If you want to lock the GitBlit plugin to allow only logged-in users to browse,
178178
* I do _not_ know how well GitBlit scales. It does not seem to be clusterable: according to its author, James Moger,
179179
"[Gitblit is heavily filesystem based and does not support clustering.](https://groups.google.com/forum/#!topic/gitblit/Puc_3o-zTd0)"
180180
Additionally, he gives "[Small workgroups that require centralized repositories.](http://gitblit.com/faq.html#H15)" as the target
181-
audience. I run this plugin for such a group, and it appears to work mostly fine. Only the "commitdiff" links on even moderately sized
182-
commits are bothersome: although patches are generated very quickly, the "commitdiff", which is basically just a nicely laid out patch
183-
display in the UI, takes ages and is taxing on the client browser if the diff is long (say, a few 10,000 lines). That would be GitBlit
184-
[bug 450](https://code.google.com/p/gitblit/issues/detail?id=450).
181+
audience. I run this plugin for such a group, and it appears to work fine.
185182

186183
* GitBlit 1.6.0 has a bug that will make the "raw" links fail for repositories in nested directories under `$GERRIT_SITE/git`. It works
187184
for repositories located directly in that directory. This bug has been fixed in GitBlit 1.6.1.

pom.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
<artifactId>gitblit-plugin</artifactId>
2121
<description>GitBlit for Gerrit integrated as a plugin</description>
2222
<name>Gerrit - GitBlit Plugin</name>
23-
<version>2.9.1.161.2-SNAPSHOT</version><!-- Gerrit API version followed by collapsed GitBlit version, followed by plugin version -->
23+
<version>2.9.1.162.1-SNAPSHOT</version><!-- Gerrit API version followed by collapsed GitBlit version, followed by plugin version -->
2424
<licenses>
2525
<license>
2626
<name>Apache License 2.0</name>
@@ -30,7 +30,7 @@ limitations under the License.
3030
<properties>
3131
<Gerrit-ApiType>plugin</Gerrit-ApiType>
3232
<Gerrit-ApiVersion>2.9.1</Gerrit-ApiVersion>
33-
<GitBlit-Version>1.6.1</GitBlit-Version>
33+
<GitBlit-Version>1.6.2</GitBlit-Version>
3434
<Wicket-Version>1.4.21</Wicket-Version>
3535
<Dagger-Version>1.1.0</Dagger-Version>
3636
<Gerrit-ReloadMode>restart</Gerrit-ReloadMode>
@@ -218,6 +218,14 @@ limitations under the License.
218218
There's one class in there that we need: com/gitblit/Translation.class. We supply that one
219219
in our own Gerrit-GitBlit plugin bundle.
220220
-->
221+
<exclude>com/gitblit/utils/GitBlitDiffFormatter.class</exclude>
222+
<exclude>com/gitblit/utils/DiffUtils.class</exclude>
223+
<exclude>com/gitblit/utils/DiffUtils$*.class</exclude>
224+
<exclude>com/gitblit/wicket/pages/CommitDiffPage.class</exclude>
225+
<exclude>com/gitblit/wicket/pages/CommitDiffPage$*.class</exclude>
226+
<exclude>com/gitblit/wicket/pages/ComparePage.class</exclude>
227+
<exclude>com/gitblit/wicket/pages/ComparePage$*.class</exclude>
228+
<exclude>gitblit.css</exclude>
221229
</excludes>
222230
</filter>
223231
<filter>

src/main/java/com/gitblit/servlet/GerritGitBlitAuthenticatedRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public GerritGitBlitAuthenticatedRequest(HttpServletRequest req) {
1616

1717
@Override
1818
public void setUser(UserModel user) {
19-
// Make this operation accessible publicly,in particular to the WrappedSyndicationFilter
19+
// Make this operation accessible publicly, in particular to the WrappedSyndicationFilter
2020
super.setUser(user);
2121
}
2222

0 commit comments

Comments
 (0)