(refs #13)Commit from AceEditor is available.

2025-11-01 02:56:08 +01:00 · 2014-04-24 21:49:30 +09:00
parent 3721b328a6
commit ad244adbfa
5 changed files with 79 additions and 38 deletions
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -1,8 +1,9 @@
 package app

+import _root_.util.JGitUtil.CommitInfo
 import util.Directory._
 import util.Implicits._
-import util.ControlUtil._
+import _root_.util.ControlUtil._
 import _root_.util._
 import service._
 import org.scalatra._
@@ -14,6 +15,7 @@ import org.eclipse.jgit.treewalk._
 import java.util.zip.{ZipEntry, ZipOutputStream}
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.dircache.DirCache
+import org.eclipse.jgit.revwalk.RevWalk

 class RepositoryViewerController extends RepositoryViewerControllerBase
  with RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator
@@ -24,11 +26,12 @@ class RepositoryViewerController extends RepositoryViewerControllerBase
 trait RepositoryViewerControllerBase extends ControllerBase {
  self: RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator =>

-  case class EditorForm(content: String, message: Option[String])
+  case class EditorForm(content: String, message: Option[String], charset: String)

  val editorForm = mapping(
    "content" -> trim(label("Content", text())),
-    "message" -> trim(label("Messgae", optional(text())))
+    "message" -> trim(label("Messgae", optional(text()))),
+    "charset" -> trim(label("Charset", text()))
  )(EditorForm.apply)

  /**
@@ -108,14 +111,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        val content = if(viewer == "other"){
          if(bytes.isDefined && FileUtil.isText(bytes.get)){
            // text
-            JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray))
+            JGitUtil.ContentInfo("text", Some(StringUtil.convertFromByteArray(bytes.get)), Some(StringUtil.detectEncoding(bytes.get)))
          } else {
            // binary
-            JGitUtil.ContentInfo("binary", None)
+            JGitUtil.ContentInfo("binary", None, None)
          }
        } else {
          // image or large
-          JGitUtil.ContentInfo(viewer, None)
+          JGitUtil.ContentInfo(viewer, None, None)
        }

        repo.html.editor(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
@@ -123,22 +126,63 @@ 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)
-//    val loginAccount = context.loginAccount.get
-//
-//    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-//      val builder  = DirCache.newInCore.builder()
-//      val inserter = git.getRepository.newObjectInserter()
-//      val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
-//
-//      builder.add(JGitUtil.createDirCacheEntry(path, FileMode.REGULAR_FILE,
-//        inserter.insert(Constants.OBJ_BLOB, form.content.getBytes("UTF-8")))) // TODO charset auto detection
-//      builder.finish()
-//
-//      JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
-//        loginAccount.fullName, loginAccount.mailAddress, form.message.getOrElse(s"Update ${path.split("/").last}"))
-//    }
+    val (id, path) = splitPath(repository, multiParams("splat").head)
+
+    LockUtil.lock(s"${repository.owner}/${repository.name}"){
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+        val loginAccount = context.loginAccount.get
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headName = s"refs/heads/${id}"
+        val headTip  = git.getRepository.resolve(s"refs/heads/${id}")
+
+        processTree(git, headTip){ (treePath, tree) =>
+          if(treePath != path){
+            builder.add(JGitUtil.createDirCacheEntry(treePath, tree.getEntryFileMode, tree.getEntryObjectId))
+          }
+        }
+
+        builder.add(JGitUtil.createDirCacheEntry(path, FileMode.REGULAR_FILE,
+          inserter.insert(Constants.OBJ_BLOB, form.content.getBytes(form.charset))))
+        builder.finish()
+
+        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
+          loginAccount.fullName, loginAccount.mailAddress, form.message.getOrElse(s"Update ${path.split("/").last}"))
+
+        inserter.flush()
+        inserter.release()
+
+        // update refs
+        val refUpdate = git.getRepository.updateRef(headName)
+        refUpdate.setNewObjectId(commitId)
+        refUpdate.setForceUpdate(false)
+        refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+        //refUpdate.setRefLogMessage("merged", true)
+        refUpdate.update()
+
+        // record activity
+        recordPushActivity(repository.owner, repository.name, loginAccount.userName, id,
+          List(new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))))
+
+        // TODO invoke hook
+
+        redirect(s"/${repository.owner}/${repository.name}/blob/${id}/${path}")
+      }
+    }
  })

  /**
@@ -178,14 +222,14 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          val content = if(viewer == "other"){
            if(bytes.isDefined && FileUtil.isText(bytes.get)){
              // text
-              JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray))
+              JGitUtil.ContentInfo("text", Some(StringUtil.convertFromByteArray(bytes.get)), Some(StringUtil.detectEncoding(bytes.get)))
            } else {
              // binary
-              JGitUtil.ContentInfo("binary", None)
+              JGitUtil.ContentInfo("binary", None, None)
            }
          } else {
            // image or large
-            JGitUtil.ContentInfo(viewer, None)
+            JGitUtil.ContentInfo(viewer, None, None)
          }

          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit),
--- a/src/main/scala/service/WikiService.scala
+++ b/src/main/scala/service/WikiService.scala
@@ -262,7 +262,7 @@ trait WikiService {
              message
            })

-          Some(newHeadId)
+          Some(newHeadId.getName)
        } else None
      }
    }
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -92,8 +92,9 @@ object JGitUtil {
   *
   * @param viewType "image", "large" or "other"
   * @param content the string content
+   * @param charset the character encoding
   */
-  case class ContentInfo(viewType: String, content: Option[String])
+  case class ContentInfo(viewType: String, content: Option[String], charset: Option[String])

  /**
   * The tag data.
@@ -480,7 +481,7 @@ object JGitUtil {
  }

  def createNewCommit(git: Git, inserter: ObjectInserter, headId: AnyObjectId, treeId: AnyObjectId,
-                              fullName: String, mailAddress: String, message: String): String = {
+                              fullName: String, mailAddress: String, message: String): ObjectId = {
    val newCommit = new CommitBuilder()
    newCommit.setCommitter(new PersonIdent(fullName, mailAddress))
    newCommit.setAuthor(new PersonIdent(fullName, mailAddress))
@@ -498,7 +499,7 @@ object JGitUtil {
    refUpdate.setNewObjectId(newHeadId)
    refUpdate.update()

-    newHeadId.getName
+    newHeadId
  }

  /**
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -29,11 +29,6 @@
          <span class="muted">@datetime(latestCommit.time)</span>
          <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
        </div>
-        @if(hasWritePermission){
-          <div class="btn-group pull-right">
-            <a class="btn btn-mini btn-danger" href="@url(repository)/delete/@encodeRefName(branch)/@pathList.mkString("/")">Delete</a>
-          </div>
-        }
        <div class="btn-group pull-right">
          @if(hasWritePermission){
            <a class="btn btn-mini" href="@url(repository)/edit/@encodeRefName(branch)/@pathList.mkString("/")">Edit</a>
--- a/src/main/twirl/repo/editor.scala.html
+++ b/src/main/twirl/repo/editor.scala.html
@@ -60,6 +60,7 @@
        <div style="text-align: right;">
          <a href="@url(repository)/blob/@encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-danger">Cancel</a>
          <input type="submit" id="commit" class="btn btn-success" value="Commit changes"/>
+          <input type="hidden" id="charset" name="charset" value="@content.charset"/>
          <input type="hidden" id="content" name="content" value=""/>
        </div>
      </div>