simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fetch-version now Just Works[TM]. diff sort of works - it diffs all files

Browse source 
in a commit, but in the special case of the wiki I can make the simplifying
assumption that there is only one file in a commit. Still, should fix this.
This commit is contained in:
Simon Brooke 2015-01-11 10:31:25 +00:00
parent cabf7c70b3
commit b0619a58d0
1 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/smeagol/history.clj
View file

@ -5,7 +5,7 @@
(:import [org.eclipse.jgit.api Git] (:import [org.eclipse.jgit.api Git]
[org.eclipse.jgit.lib Repository ObjectId] [org.eclipse.jgit.lib Repository ObjectId]
[org.eclipse.jgit.revwalk RevCommit RevTree RevWalk] [org.eclipse.jgit.revwalk RevCommit RevTree RevWalk]
[org.eclipse.jgit.treewalk AbstractTreeIterator CanonicalTreeParser] [org.eclipse.jgit.treewalk TreeWalk AbstractTreeIterator CanonicalTreeParser]
[org.eclipse.jgit.treewalk.filter PathFilter] [org.eclipse.jgit.treewalk.filter PathFilter]
[org.eclipse.jgit.diff DiffEntry DiffFormatter])) [org.eclipse.jgit.diff DiffEntry DiffFormatter]))
@ -84,19 +84,34 @@
(.format formatter %) (.format formatter %)
%) %)
(.call (.call
(.setPathFilter (.setOutputStream
(.setNewTree (.setPathFilter
(.setOldTree (.setNewTree
(.diff git-r) (.setOldTree (.diff git-r) old-parse)
old-parse) new-parse)
new-parse) (PathFilter/create file-path))
(PathFilter/create file-path)))) out)))
(.toString out) (.toString out))))
)))
(defn fetch-version (defn fetch-version
"Return (as a String) the text of this `version` of the file at this "Return (as a String) the text of this `version` of the file at this
`file-path` in the git directory at this `git-directory-path`." `file-path` in the git directory at this `git-directory-path`.
Based on JGit Cookbook ReadFileFromCommit."
[^String git-directory-path ^String file-path ^String version] [^String git-directory-path ^String file-path ^String version]
"TODO: Doesn't work yet") (let [git-r (git/load-repo git-directory-path)
repo (.getRepository git-r)
walk (i/new-rev-walk git-r)
commit (i/bound-commit git-r walk (ObjectId/fromString version))
tree (.parseTree walk (.getId (.getTree commit)))
tw (TreeWalk. repo)
out (java.io.ByteArrayOutputStream.)]
(.addTree tw tree)
(.setRecursive tw true)
(.setFilter tw (PathFilter/create file-path))
(if (not (.next tw))
(throw (IllegalStateException.
(str "Did not find expected file '" file-path "'"))))
(.copyTo (.open repo (.getObjectId tw 0)) out)
(.toString out)))