Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 14:05:44 +01:00
Code Issues Packages Projects Releases Activity

fix double escaping

Browse Source
This commit is contained in:
Sebastian Sdorra
2013-12-27 15:50:34 +01:00
parent e4902f093e
commit 8c002e38da
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java
View File

@@ -40,7 +40,6 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.io.Closeables;
import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -252,10 +251,10 @@ public class GitRepositoryViewer
//~--- fields -------------------------------------------------------------
/** Field description */
private Iterable<ChangesetModel> changesets;
private final Iterable<ChangesetModel> changesets;
/** Field description */
private String name;
private final String name;
}
@@ -299,12 +298,15 @@ public class GitRepositoryViewer
try
{
ChangesetPagingResult cpr = service.getLogCommand().setBranch(
name).setPagingLimit(
CHANGESET_PER_BRANCH).getChangesets();
Iterable<ChangesetModel> changesets = Iterables.transform(cpr,
new Function<Changeset,
ChangesetModel>()
//J-
ChangesetPagingResult cpr = service.getLogCommand()
.setDisableEscaping(true)
.setBranch(name)
.setPagingLimit(CHANGESET_PER_BRANCH)
.getChangesets();
Iterable<ChangesetModel> changesets =
Iterables.transform(cpr, new Function<Changeset,ChangesetModel>()
{
@Override
@@ -313,6 +315,7 @@ public class GitRepositoryViewer
return new ChangesetModel(changeset);
}
});
//J+
model = new BranchModel(name, changesets);
}
@@ -327,7 +330,7 @@ public class GitRepositoryViewer
//~--- fields -------------------------------------------------------------
/** Field description */
private RepositoryService service;
private final RepositoryService service;
}
@@ -369,7 +372,7 @@ public class GitRepositoryViewer
//~--- fields -------------------------------------------------------------
/** Field description */
private Iterable<BranchModel> branches;
private final Iterable<BranchModel> branches;
}
@@ -440,15 +443,15 @@ public class GitRepositoryViewer
//~--- fields -------------------------------------------------------------
/** Field description */
private Changeset changeset;
private final Changeset changeset;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private RepositoryServiceFactory repositoryServiceFactory;
private final RepositoryServiceFactory repositoryServiceFactory;
/** Field description */
private TemplateEngineFactory templateEngineFactory;
private final TemplateEngineFactory templateEngineFactory;
}