From 4963d11483c1bb91d96e3690b0533adee6600d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Sko=C5=99epa?= <jakub@skorepa.info>
Date: Thu, 17 Mar 2016 16:56:18 +0100
Subject: [PATCH] Replace nodegit-kit with custom code
It caused more problems than it solved
This fixes #8
Also fixed generator crashing when article was not commited
---
package.json | 1 -
sitegin/gitInfo.js | 44 +++++++++++++++++++++++++++++++++++++++++---
sitegin/tags.js | 2 ++
3 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 5be70aa4..0db90198 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
"node-fs-extra": "^0.8.1",
"node-sass": "^3.4.2",
"nodegit": "^0.11.7",
- "nodegit-kit": "^0.8.1",
"nunjucks": "^2.3.0",
"nunjucks-date-filter": "^0.1.1",
"syntax-error": "^1.1.5",
diff --git a/sitegin/gitInfo.js b/sitegin/gitInfo.js
index d9281532..867cac52 100644
--- a/sitegin/gitInfo.js
+++ b/sitegin/gitInfo.js
@@ -4,7 +4,6 @@
*/
var nodegit = require('nodegit');
-var git = require('nodegit-kit');
var path = require('path');
var moment = require('moment');
@@ -45,12 +44,51 @@ var gitShow = function(repo, commitData) {
});
}
+var gitlog = function(repo) {
+ var map = function(repo){
+ return Promise.resolve()
+ .then(function(){
+ return function(commit){
+ var author = commit.author();
+ var sha = commit.sha();
+
+ return {
+ 'commit': sha,
+ 'author': {
+ 'name': author.name(),
+ 'email': author.email()
+ },
+ 'date': commit.date(),
+ 'message': commit.message().trim()
+ };
+ };
+ });
+ };
+
+
+ return repo.getHeadCommit()
+ .then(function(commit) {
+ return new Promise(function(resolve, reject){
+ commit.history()
+ .on('end', resolve)
+ .on('error', reject)
+ .start();
+ })
+ .then(function(commits){
+ return map(repo)
+ .then(function(log){
+ return commits.map(log);
+ });
+ });
+ });
+};
+
var getFilesHistory = function() {
var repo;
- return git.open(pathToRepo)
+ return nodegit.Repository.open(pathToRepo)
.then(function(_repo) {
repo = _repo;
- return git.log(repo)
+ return gitlog(repo)
})
.then(function(log){
var promises = [];
diff --git a/sitegin/tags.js b/sitegin/tags.js
index 3041b3c0..86390ced 100644
--- a/sitegin/tags.js
+++ b/sitegin/tags.js
@@ -40,6 +40,8 @@ module.exports = function(obj) {
obj.redirects.push(pg);
pageList.sort(function (a, b) {
+ if(a.metadata.date === undefined) return -1;
+ if(b.metadata.date === undefined) return 1;
var rhs = a.metadata.date.creation;
var lhs = b.metadata.date.creation;
return lhs > rhs ? 1 : lhs < rhs ? -1 : 0;
--
GitLab