Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 13:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Naoki Takezoe
2014-04-25 10:38:34 +09:00
parent a104157c9a
commit 0e5591017a
5 changed files with 34 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/app/RepositoryViewerController.scala
View File

@@ -126,19 +126,6 @@ trait RepositoryViewerControllerBase extends ControllerBase {
}
})
// TODO Share this method with WikiService
private def processTree(git: Git, id: ObjectId)(f: (String, CanonicalTreeParser) => Unit) = {
using(new RevWalk(git.getRepository)){ revWalk =>
using(new TreeWalk(git.getRepository)){ treeWalk =>
val index = treeWalk.addTree(revWalk.parseTree(id))
treeWalk.setRecursive(true)
while(treeWalk.next){
f(treeWalk.getPathString, treeWalk.getTree(index, classOf[CanonicalTreeParser]))
}
}
}
}
post("/:owner/:repository/edit/*", editorForm)(collaboratorsOnly { (form, repository) =>
val (id, path) = splitPath(repository, multiParams("splat").head)
@@ -150,7 +137,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
val headName = s"refs/heads/${id}"
val headTip = git.getRepository.resolve(s"refs/heads/${id}")
processTree(git, headTip){ (treePath, tree) =>
JGitUtil.processTree(git, headTip){ (treePath, tree) =>
if(treePath != path){
builder.add(JGitUtil.createDirCacheEntry(treePath, tree.getEntryFileMode, tree.getEntryObjectId))
}