add hook callbacks for rebase and merge operations

This will help consumers of nodegit-flow that utilize GitHooks operations.

Author: implausible

src/Feature.js

@@ -70,7 +70,14 @@ class Feature {
    * @return {Commit}   The commit created by finishing the feature
    */
   static finishFeature(repo, featureName, options = {}) {
-    const {keepBranch, isRebase, processMergeMessageCallback} = options;
+    const {
+      keepBranch,
+      isRebase,
+      preRebaseCallback = () => {},
+      processMergeMessageCallback,
+      postMergeCallback = () => {},
+      beforeRebaseFinishCallback = () => {}
+    } = options;
 
     if (!repo) {
       return Promise.reject(new Error('Repo is required'));
@@ -86,10 +93,11 @@ class Feature {
     let featureCommit;
     let cancelDevelopMerge;
     let mergeCommit;
+    let developBranchName;
     let featureBranchName;
     return Config.getConfig(repo)
       .then((config) => {
-        const developBranchName = config['gitflow.branch.develop'];
+        developBranchName = config['gitflow.branch.develop'];
         featureBranchName = config['gitflow.prefix.feature'] + featureName;
 
         return Promise.all(
@@ -113,9 +121,11 @@ class Feature {
         cancelDevelopMerge = isSameCommit || isRebase;
 
         if (!cancelDevelopMerge) {
-          return utils.Repo.merge(developBranch, featureBranch, repo, processMergeMessageCallback);
+          return utils.Repo.merge(developBranch, featureBranch, repo, processMergeMessageCallback)
+            .then(utils.InjectIntermediateCallback(postMergeCallback));
         } else if (isRebase && !isSameCommit) {
-          return utils.Repo.rebase(developBranch, featureBranch, repo);
+          return Promise.resolve(preRebaseCallback(developBranchName, featureBranchName))
+            .then(() => utils.Repo.rebase(developBranch, featureBranch, repo, beforeRebaseFinishCallback));
         }
         return Promise.resolve();
       })

src/Hotfix.js

@@ -63,7 +63,13 @@ class Hotfix {
    * @return {Commit}   The commit created by finishing the hotfix
    */
   static finishHotfix(repo, hotfixVersion, options = {}) {
-    const {keepBranch, message, processMergeMessageCallback} = options;
+    const {
+      keepBranch,
+      message,
+      processMergeMessageCallback,
+      postDevelopMergeCallback = () => {},
+      postMasterMergeCallback = () => {}
+    } = options;
 
     if (!repo) {
       return Promise.reject(new Error('Repo is required'));
@@ -116,7 +122,8 @@ class Hotfix {
 
         // Merge hotfix into develop
         if (!cancelDevelopMerge) {
-          return utils.Repo.merge(developBranch, hotfixBranch, repo, processMergeMessageCallback);
+          return utils.Repo.merge(developBranch, hotfixBranch, repo, processMergeMessageCallback)
+            .then(utils.InjectIntermediateCallback(postDevelopMergeCallback));
         }
         return Promise.resolve();
       })
@@ -127,6 +134,7 @@ class Hotfix {
         // Merge the hotfix branch into master
         if (!cancelMasterMerge) {
           return utils.Repo.merge(masterBranch, hotfixBranch, repo, processMergeMessageCallback)
+            .then(utils.InjectIntermediateCallback(postMasterMergeCallback))
             .then((oid) => utils.Tag.create(oid, tagName, message, repo));
         }
 

src/Release.js

@@ -70,7 +70,13 @@ class Release {
    * @return {Commit}   The commit created by finishing the release
    */
   static finishRelease(repo, releaseVersion, options = {}) {
-    const {keepBranch, message, processMergeMessageCallback} = options;
+    const {
+      keepBranch,
+      message,
+      processMergeMessageCallback,
+      postDevelopMergeCallback = () => {},
+      postMasterMergeCallback = () => {}
+    } = options;
 
     if (!repo) {
       return Promise.reject(new Error('Repo is required'));
@@ -123,7 +129,8 @@ class Release {
 
         // Merge release into develop
         if (!cancelDevelopMerge) {
-          return utils.Repo.merge(developBranch, releaseBranch, repo, processMergeMessageCallback);
+          return utils.Repo.merge(developBranch, releaseBranch, repo, processMergeMessageCallback)
+            .then(utils.InjectIntermediateCallback(postDevelopMergeCallback));
         }
         return Promise.resolve();
       })
@@ -134,6 +141,7 @@ class Release {
         // Merge the release branch into master
         if (!cancelMasterMerge) {
           return utils.Repo.merge(masterBranch, releaseBranch, repo, processMergeMessageCallback)
+            .then(utils.InjectIntermediateCallback(postMasterMergeCallback))
             .then((oid) => utils.Tag.create(oid, tagName, message, repo));
         }
 

src/utils/InjectIntermediateCallbackUtils.js

@@ -0,0 +1,2 @@
+module.exports =
+  (callback) => (a) => Promise.resolve(callback()).then(() => a);

src/utils/RepoUtils.js

@@ -43,8 +43,15 @@ const RepoUtils = {
       });
   },
 
-  rebase(toBranch, fromBranch, repo) {
-    return repo.rebaseBranches(fromBranch.name(), toBranch.name(), undefined, undefined)
+  rebase(toBranch, fromBranch, repo, beforeRebaseFinish) {
+    return repo.rebaseBranches(
+      fromBranch.name(),
+      toBranch.name(),
+      undefined,
+      undefined,
+      undefined,
+      beforeRebaseFinish
+    )
       .then((result) => {
         if (result.hasConflicts && result.hasConflicts()) {
           return Promise.reject(result);