Feature: Provide an option to view history log for all branches (DonJayamanne#144)

* removed duplicate code

* added options (all branches, current branch) to select git log mode

* removed unrequired description in mode selection

* fixed broken multi-repository scenario

Author: ajaygm

src/helpers/gitHistory.ts

@@ -9,10 +9,16 @@ const LOG_ENTRY_SEPARATOR = '95E9659B-27DC-43C4-A717-D75969757EA5';
 const STATS_SEPARATOR = parser.STATS_SEPARATOR;
 const LOG_FORMAT = `--format="%n${LOG_ENTRY_SEPARATOR}%nrefs=%d%ncommit=%H%ncommitAbbrev=%h%ntree=%T%ntreeAbbrev=%t%nparents=%P%nparentsAbbrev=%p%nauthor=%an <%ae> %at%ncommitter=%cn <%ce> %ct%nsubject=%s%nbody=%b%n%nnotes=%N%n${STATS_SEPARATOR}%n"`;
 
-export async function getLogEntries(rootDir: string, pageIndex: number = 0, pageSize: number = 100): Promise<LogEntry[]> {
-    const args = ['log', LOG_FORMAT, '--date-order', '--decorate=full', `--skip=${pageIndex * pageSize}`, `--max-count=${pageSize}`, '--numstat', '--'];
-    // This is how you can view the log across all branches
-    // args = ['log', LOG_FORMAT, '--date-order', '--decorate=full', `--skip=${pageIndex * pageSize}`, `--max-count=${pageSize}`, '--all', '--']
+export async function getLogEntries(rootDir: string, branchName: string, pageIndex: number = 0, pageSize: number = 100): Promise<LogEntry[]> {
+
+    let args: string[];
+    if (branchName && branchName.length > 0) {
+        args = ['log', LOG_FORMAT, '--date-order', '--decorate=full', `--skip=${pageIndex * pageSize}`, `--max-count=${pageSize}`, '--numstat', '--'];
+    }
+    else {
+        args = ['log', LOG_FORMAT, '--date-order', '--decorate=full', `--skip=${pageIndex * pageSize}`, `--max-count=${pageSize}`, '--all', '--numstat', '--'];
+    }
+
     const gitPath = await getGitPath();
     return new Promise<LogEntry[]>((resolve, reject) => {
         const options = { cwd: rootDir };
@@ -71,7 +77,7 @@ export async function getLogEntries(rootDir: string, pageIndex: number = 0, page
             error += data;
         });
 
-        ls.on('error', function(error) {
+        ls.on('error', function (error) {
             logger.logError(error);
             reject(error);
             return;

src/helpers/logParser.ts

@@ -229,10 +229,6 @@ export function parseLogEntry(lines: string[]): LogEntry | null {
             logEntry.committer = parseAuthCommitter(line.substring(prefixLengths.committer));
             return;
         }
-        if (line.indexOf(prefixes.committer) === 0) {
-            logEntry.committer = parseAuthCommitter(line.substring(prefixLengths.committer));
-            return;
-        }
         if (line.indexOf(prefixes.subject) === 0) {
             logEntry.subject = line.substring(prefixLengths.subject).trim();
             return;

src/logViewer/logViewer.ts

@@ -27,10 +27,10 @@ class TextDocumentContentProvider implements vscode.TextDocumentContentProvider
     public async provideTextDocumentContent(uri: vscode.Uri, token: vscode.CancellationToken): Promise<string> {
         try {
             let branchName = this.getBranchFromURI(uri);
-            if ( this.html.hasOwnProperty(branchName) ) {
+            if (this.html.hasOwnProperty(branchName)) {
                 return this.html[branchName];
             }
-            const entries = await gitHistory.getLogEntries(gitRepoPath, pageIndex, pageSize);
+            const entries = await gitHistory.getLogEntries(gitRepoPath, branchName, pageIndex, pageSize);
             canGoPrevious = pageIndex > 0;
             canGoNext = entries.length === pageSize;
             this.entries = entries;
@@ -53,14 +53,18 @@ class TextDocumentContentProvider implements vscode.TextDocumentContentProvider
     }
 
     private clearCache(name: string) {
-        if ( this.html.hasOwnProperty(name) ) {
+        if (this.html.hasOwnProperty(name)) {
             delete this.html[name];
         }
     }
 
     private getBranchFromURI(uri: vscode.Uri): string {
-        let re = uri.query.match(/branch=([a-z0-9_\-.]+)/i);
-        return (re) ? re[1] : 'master';
+        if (uri.query.length > 0) {
+            let re = uri.query.match(/branch=([a-z0-9_\-.]+)/i);
+            return (re) ? re[1] : 'master';
+        } else {
+            return '';
+        }
     }
 
     private getStyleSheetPath(resourceName: string): string {
@@ -115,6 +119,16 @@ export function activate(context: vscode.ExtensionContext) {
     let registration = vscode.workspace.registerTextDocumentContentProvider(gitHistorySchema, provider);
 
     let disposable = vscode.commands.registerCommand('git.viewHistory', async (fileUri?: vscode.Uri) => {
+        const itemPickList: vscode.QuickPickItem[] = [];
+        itemPickList.push({ label: 'Current branch', description: '' });
+        itemPickList.push({ label: 'All branches', description: '' });
+        let modeChoice = await vscode.window.showQuickPick(itemPickList, { placeHolder: 'Show history for...', matchOnDescription: true });
+
+        let title: string;
+        if (modeChoice === undefined) {
+            return;
+        }
+
         let fileName = '';
         let branchName = 'master';
 
@@ -138,8 +152,16 @@ export function activate(context: vscode.ExtensionContext) {
         pageIndex = 0;
         canGoPrevious = false;
         canGoNext = true;
-        previewUri = vscode.Uri.parse(gitHistorySchema + '://authority/git-history?branch=' + encodeURI(branchName) );
-        return vscode.commands.executeCommand('vscode.previewHtml', previewUri, vscode.ViewColumn.One, 'Git History (' + branchName + ')').then((success) => {
+
+        if (modeChoice.label === 'All branches') {
+            previewUri = vscode.Uri.parse(gitHistorySchema + '://authority/git-history');
+            title = 'Git History (all branches)';
+        }
+        else {
+            previewUri = vscode.Uri.parse(gitHistorySchema + '://authority/git-history?branch=' + encodeURI(branchName));
+            title = 'Git History (' + branchName + ')';
+        }
+        return vscode.commands.executeCommand('vscode.previewHtml', previewUri, vscode.ViewColumn.One, title).then((success) => {
             provider.update(previewUri);
         }, (reason) => {
             vscode.window.showErrorMessage(reason);