Merge pull request #37 from luxferresum/lastTag

Show the lastTag and the noOfAdditionalCommits

Author: hjdivad

.travis.yml

@@ -1,14 +1,15 @@
 language: node_js
+node_js:
+  - "4"
+  - "6"
+  - "8"
+  - "9"
+
 sudo: false
 cache:
   directories:
     - node_modules
 
-env:
-  - NODE_VERSION=0.10
-  - NODE_VERSION=0.12
-  - NODE_VERSION=iojs
-
 branches:
   only:
     - master

index.js

@@ -149,6 +149,40 @@ function findTag(gitPath, sha) {
   return tags.length ? tags[0] : false;
 }
 
+var LAST_TAG_CACHE = {};
+
+function findLastTagCached(gitPath, sha, commitsSinceLastTag) {
+  if(!LAST_TAG_CACHE[gitPath]) {
+    LAST_TAG_CACHE[gitPath] = {};
+  }
+
+  if(!LAST_TAG_CACHE[gitPath][sha]) {
+    LAST_TAG_CACHE[gitPath][sha] = findLastTag(gitPath, sha, commitsSinceLastTag);
+  }
+
+  return LAST_TAG_CACHE[gitPath][sha];
+}
+
+function findLastTag(gitPath, sha, commitsSinceLastTag) {
+  commitsSinceLastTag = commitsSinceLastTag || 0;
+  var tag = findTag(gitPath, sha);
+  if(!tag) {
+    var commitData = getCommitData(gitPath, sha);
+    if(!commitData) {
+      return { tag: null, commitsSinceLastTag: Infinity };
+    }
+    return commitData.parents
+      .map(parent => findLastTag(gitPath, parent, commitsSinceLastTag + 1))
+      .reduce((a,b) => {
+        return a.commitsSinceLastTag < b.commitsSinceLastTag ? a : b;
+      }, { commitsSinceLastTag: Infinity });
+  }
+  return {
+    tag: tag,
+    commitsSinceLastTag: commitsSinceLastTag
+  };
+}
+
 function findUnpackedTags(gitPath, sha) {
   var unpackedTags = [];
   var tags = findLooseRefsForType(gitPath, 'tags');
@@ -179,7 +213,9 @@ module.exports = function(gitPath) {
     author: null,
     authorDate: null,
     commitMessage: null,
-    root: null
+    root: null,
+    lastTag: null,
+    commitsSinceLastTag: 0,
   };
 
   if (!gitPathInfo) { return result; }
@@ -228,6 +264,10 @@ module.exports = function(gitPath) {
       if (tag) {
         result.tag = tag;
       }
+
+      var lastTagInfo = findLastTagCached(gitPathInfo.commonGitDir, result.sha);
+      result.lastTag = lastTagInfo.tag;
+      result.commitsSinceLastTag = lastTagInfo.commitsSinceLastTag;
     }
   } catch (e) {
     if (!module.exports._suppressErrors) {
@@ -263,7 +303,6 @@ function getCommitData(gitPath, sha) {
           case 'object':
           case 'type':
           case 'tree':
-          case 'parent':
             //ignore these for now
             break;
           case 'author':
@@ -275,6 +314,9 @@ function getCommitData(gitPath, sha) {
               data[part + 'Date'] = parseDate(parts[2]);
             }
             break;
+          case 'parent':
+            data.parents = section.split('\n').map(p => p.split(' ')[1]);
+            break;
           default:
             //should just be the commit message left
             data.commitMessage = section;

package.json

@@ -27,5 +27,8 @@
   "devDependencies": {
     "mocha": "^1.21.4",
     "mocha-jshint": "^1.1.0"
+  },
+  "engines": {
+    "node": ">= 4.0"
   }
 }

tests/fixtures/tag-on-parent-before-merge/dot-git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

tests/fixtures/tag-on-parent-before-merge/dot-git/index

@@ -0,0 +1 @@
+b60d665ae0978a7b46e2447f4c13d7909997f56c

tests/fixtures/tag-on-parent-before-merge/dot-git/objects/b6/0d665ae0978a7b46e2447f4c13d7909997f56c

@@ -0,0 +1 @@
+4f5c726a1528fdfb1ec7c9537e4b1b2dbaacbcc4

tests/fixtures/tag-on-parent-before-merge/dot-git/refs/heads/master

@@ -0,0 +1 @@
+ref: refs/heads/master