[feature] Search for commit messages.

Author: batprat

modules/git_functions.js

@@ -37,9 +37,17 @@ let git = {
     mergeIntoCurrent,
     abortMerge,
     testGit,
-    searchForHash
+    searchForHash,
+    searchForCommitMessage
 };
 
+function searchForCommitMessage({req, res, repo}) {
+    return logRepo({ req, res, repo, options: {
+        searchFor: 'commitmessage',
+        searchTerm: req.body.text
+    } });
+}
+
 function searchForHash({req, res, repo}) {
     return logRepo({req, res, repo, options: {
         searchFor: 'hash',
@@ -568,37 +576,36 @@ git log -n 100 --format=format:'<commit><hash>%H</hash><author_name>%an</author_
 log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
 
 */
-    let term = null;
-    if(options) {
-        switch(options.searchFor) {
-            case 'hash': {
-                term = {}
-                break;
-            }
-        }
-    }
     let randomSeperator = utils.getRandomSeparator();
     // let logFormat = `--format=format:%H${randomSeperator}%an${randomSeperator}%ae${randomSeperator}%aD${randomSeperator}%s${randomSeperator}%P`;
 
     let logFormat = `--format=format:%d%n%H%n%an%n%ae%n%aD%n%P%n%s%n${randomSeperator}`;
 
+    let commitsInOnePageCount = 100;
+
     let logArgs = ['log', logFormat];
 
     if(options) {
         if(options.searchFor == 'hash') {
             logArgs.push('-1', options.searchTerm);
         }
+
+        if(options.searchFor == 'commitmessage') {
+            logArgs.push('--grep='+ decodeURIComponent(options.searchTerm) +'', '-i', '-n ' + commitsInOnePageCount);
+        }
     }
     else {
-        logArgs.push('-n 100', '--branches', '--tags');
+        logArgs.push('-n ' + commitsInOnePageCount, '--branches', '--tags');
     }
 
     let page = req.query && req.query.page ? req.query.page : 1;
 
     if(page > 1) {
-      logArgs.push('--skip=' + ((page - 1) * 100));
+      logArgs.push('--skip=' + ((page - 1) * commitsInOnePageCount));
     }
 
+    console.log(logArgs);
+
     const child = spawn('git', logArgs, {
         cwd: _getCwd(repo),
         stdio: [0, 'pipe', 'pipe']

public/js/app/webgit-home/repo-detail/repo-detail.component.js

@@ -143,32 +143,78 @@
                 return;
 
                 function mainSearch() {
-                    console.log(vm.mainSearchInp);
-
                     var searchText = vm.mainSearchInp;
 
                     if(typeof searchText == 'undefined' || searchText.length == 0 || (searchText = searchText.trim()).length == 0) {
                         restoreCommits();
                         return;
                     }
 
-                    var shaRegex = /\b[0-9a-f]{5,40}\b/;
+                    clearGraph();
+                    var promise = null;
 
+                    var shaRegex = /\b[0-9a-f]{5,40}\b/;
                     if(shaRegex.test(searchText)) {
                         // it is probably an SHA.
-                        repoDetailService.searchForHash(searchText).then(function(commits) {
+                        promise = repoDetailService.searchForHash(searchText).then(function(commits) {
                             vm.commitDetails = null;
                             parseCommits(commits);
                             vm.commits = commits;
                             resetCommitMap();
-                            if(commits.length > 0) {
-                                $timeout(loadGraph);
+                            return vm.commits;
+                        });
+                    }
+
+                    // search in commit messages.
+
+                    if(promise) {
+                        promise.then(searchByCommitMessage);
+                    }
+                    else {
+                        searchByCommitMessage();
+                    }
+
+                    function searchByCommitMessage() {
+                        return repoDetailService.searchForCommitMessage(searchText).then(function(commits) {
+                            parseCommits(commits);
+                            if(promise) {
+                                vm.commits = vm.commits || [];
+                            }
+                            else {
+                                vm.commits = [];
                             }
+    
+                            resetTempCommits();
+    
+                            // Array.prototype.push.apply(vm.commits, commits);
+                            vm.commits = addUniqueCommits(vm.commits, commits);
+    
+                            resetCommitMap();
                             return vm.commits;
                         });
                     }
                 }
 
+
+                /**
+                 * Adds commits2 to commits1. Skips duplicates. Does not modify, returns new array.
+                 */
+                function addUniqueCommits(commits1, commits2) {
+                    var commits1Copy = commits1.slice(0);
+
+                    var hashes = commits1.map(function(c) {
+                        return c.hash;
+                    });
+
+                    var uniqueCommits = commits2.filter(function(c) {
+                        return hashes.indexOf(c.hash) == -1;
+                    });
+
+                    Array.prototype.push.apply(commits1Copy, uniqueCommits);
+
+                    return commits1Copy;
+                }
+
                 /**
                  * Stores commits in `commitsBackup` and `commitMapBackup`. Restore using `restoreCommits`
                 */
@@ -192,16 +238,9 @@
                     graphBackup = null;
                     graphBackup = new Image();
                     graphBackup.src = canvas.toDataURL("image/png");
-                    // graphBackup = document.createElement('canvas');
-                    // graphBackup.width = canvas.width;
-                    // graphBackup.height = canvas.height;
-
-                    //var graphBackupCtx = graphBackup.getContext('2D');
-                    //graphBackupCtx.drawImage(canvas, 0, 0);
                 }
 
                 function restoreGraph() {
-                    // $('#graph-container').append('<canvas id="log-graph"></canvas>');
                     var canvas = document.getElementById('log-graph');
                     canvas.width = graphBackup.width;
                     canvas.height = graphBackup.height;
@@ -215,6 +254,18 @@
                     ctx.drawImage(graphBackup, 0, 0);
                 }
 
+                function clearGraph() {
+                    var canvas = document.getElementById('log-graph');
+                    if(!canvas) {
+                        return;
+                    }
+                    var ctx = canvas.getContext('2d');
+
+                    ctx.clearRect(0, 0, canvas.width, canvas.height);
+                    canvas.width = 0;
+                    canvas.height = 0;
+                }
+
                 function abortMerge() {
                     return repoDetailService.abortMerge().then(function(d) {
                         if(!d.errorCode) {
@@ -1307,9 +1358,16 @@
         this.mergeIntoCurrent = mergeIntoCurrent;
         this.abortMerge = abortMerge;
         this.searchForHash = searchForHash;
+        this.searchForCommitMessage = searchForCommitMessage;
 
         return;
 
+        function searchForCommitMessage(searchText) {
+            return $http.post('/repo/' + repoName + '/searchforcommitmessage', {text: window.encodeURIComponent(searchText)}).then(function(res) {
+                return res.data;
+            });
+        }
+
         function searchForHash(hash) {
             return $http.post('/repo/' + repoName + '/searchforhash', {hash: hash}).then(function(res) {
                 return res.data;

routes/repo.js

@@ -217,4 +217,10 @@ router.post('/:id/searchforhash', (req, res) => {
     git.searchForHash({repo, req, res});
 });
 
+router.post('/:id/searchforcommitmessage', (req, res) => {
+    let repo = req.params.id;
+
+    git.searchForCommitMessage({repo, req, res});
+});
+
 module.exports = router;