diff options
| author | James Moger <james.moger@gitblit.com> | 2012-12-03 17:20:17 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-12-03 17:20:17 -0500 |
| commit | e5662e85681deb98e2ed65831ade3f066f29f154 (patch) | |
| tree | e6d8c23bbaa3e3d7d71eb75a8fc09177e88c5bc4 /src/com/gitblit | |
| parent | 1d9ac51db01b654f2c97d9fd3057b7b0ed716b91 (diff) | |
| download | gitblit-e5662e85681deb98e2ed65831ade3f066f29f154.tar.gz gitblit-e5662e85681deb98e2ed65831ade3f066f29f154.zip | |
Support symlink display in tree and commit pages (issue-171)
Diffstat (limited to 'src/com/gitblit')
| -rw-r--r-- | src/com/gitblit/models/PathModel.java | 4 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/pages/CommitPage.java | 10 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/pages/TreePage.java | 18 |
3 files changed, 24 insertions, 8 deletions
diff --git a/src/com/gitblit/models/PathModel.java b/src/com/gitblit/models/PathModel.java index 8692359c..84571cbb 100644 --- a/src/com/gitblit/models/PathModel.java +++ b/src/com/gitblit/models/PathModel.java @@ -48,6 +48,10 @@ public class PathModel implements Serializable, Comparable<PathModel> { this.commitId = commitId;
}
+ public boolean isSymlink() {
+ return FileMode.SYMLINK.equals(mode);
+ }
+
public boolean isSubmodule() {
return FileMode.GITLINK.equals(mode);
}
diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java index b2a8112b..17621ad0 100644 --- a/src/com/gitblit/wicket/pages/CommitPage.java +++ b/src/com/gitblit/wicket/pages/CommitPage.java @@ -169,9 +169,15 @@ public class CommitPage extends RepositoryPage { WicketUtils.newPathParameter(submodulePath, submoduleId, "")).setEnabled(hasSubmodule));
} else {
// blob
- item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class,
+ String displayPath = entry.path;
+ String path = entry.path;
+ if (entry.isSymlink()) {
+ path = JGitUtils.getStringContent(getRepository(), getCommit().getTree(), path);
+ displayPath = entry.path + " -> " + path;
+ }
+ item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class,
WicketUtils
- .newPathParameter(repositoryName, entry.commitId, entry.path)));
+ .newPathParameter(repositoryName, entry.commitId, path)));
}
// quick links
diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java index 345814f4..5396ed6c 100644 --- a/src/com/gitblit/wicket/pages/TreePage.java +++ b/src/com/gitblit/wicket/pages/TreePage.java @@ -144,25 +144,31 @@ public class TreePage extends RepositoryPage { item.add(links);
} else {
// blob link
+ String displayPath = entry.path;
+ String path = entry.path;
+ if (entry.isSymlink()) {
+ path = JGitUtils.getStringContent(getRepository(), getCommit().getTree(), path);
+ displayPath = entry.path + " -> " + path;
+ }
item.add(WicketUtils.getFileImage("pathIcon", entry.name));
item.add(new Label("pathSize", byteFormat.format(entry.size)));
- item.add(new LinkPanel("pathName", "list", entry.name, BlobPage.class,
+ item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class,
WicketUtils.newPathParameter(repositoryName, entry.commitId,
- entry.path)));
+ path)));
// links
Fragment links = new Fragment("pathLinks", "blobLinks", this);
links.add(new BookmarkablePageLink<Void>("view", BlobPage.class,
WicketUtils.newPathParameter(repositoryName, entry.commitId,
- entry.path)));
+ path)));
links.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils
- .newPathParameter(repositoryName, entry.commitId, entry.path)));
+ .newPathParameter(repositoryName, entry.commitId, path)));
links.add(new BookmarkablePageLink<Void>("blame", BlamePage.class,
WicketUtils.newPathParameter(repositoryName, entry.commitId,
- entry.path)));
+ path)));
links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
WicketUtils.newPathParameter(repositoryName, entry.commitId,
- entry.path)));
+ path)));
item.add(links);
}
}
|