ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-16 18:48:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adds parent sha parsing

Browse Source
This commit is contained in:
Eric Amodio
2017-03-15 12:06:54 -04:00
parent 2ef6c37c89
commit 9c2269b9f1
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/git/enrichers/logParserEnricher.ts
View File

@@ -13,6 +13,8 @@ interface ILogEntry {
committer?: string; committer?: string;
committerDate?: string; committerDate?: string;
parentSha?: string;
fileName?: string; fileName?: string;
originalFileName?: string; originalFileName?: string;
fileStatuses?: { status: GitFileStatus, fileName: string, originalFileName: string }[]; fileStatuses?: { status: GitFileStatus, fileName: string, originalFileName: string }[];
@@ -70,6 +72,10 @@ export class GitLogParserEnricher implements IGitEnricher<IGitLog> {
// entry.committerDate = lineParts.slice(1).join(' ').trim(); // entry.committerDate = lineParts.slice(1).join(' ').trim();
// break; // break;
case 'parent':
entry.parentSha = lineParts.slice(1).join(' ').trim();
break;
case 'summary': case 'summary':
entry.summary = lineParts.slice(1).join(' ').trim(); entry.summary = lineParts.slice(1).join(' ').trim();
while (++position < lines.length) { while (++position < lines.length) {
@@ -209,8 +215,10 @@ export class GitLogParserEnricher implements IGitEnricher<IGitLog> {
if (recentCommit) { if (recentCommit) {
recentCommit.previousSha = commit.sha; recentCommit.previousSha = commit.sha;
// If the commit sha's match (merge commit), just forward it along // If the commit sha's match (merge commit), just forward it along
commit.nextSha = commit.sha !== recentCommit.sha ? recentCommit.sha : recentCommit.nextSha; commit.nextSha = commit.sha !== recentCommit.sha ? recentCommit.sha : recentCommit.nextSha;
// Only add a filename if this is a file log // Only add a filename if this is a file log
if (type === 'file') { if (type === 'file') {
recentCommit.previousFileName = commit.originalFileName || commit.fileName; recentCommit.previousFileName = commit.originalFileName || commit.fileName;

2
src/git/git.ts
View File

@@ -13,7 +13,7 @@ export * from './enrichers/logParserEnricher';
let git: IGit; let git: IGit;
const UncommittedRegex = /^[0]+$/; const UncommittedRegex = /^[0]+$/;
const DefaultLogParams = [`log`, `--name-status`, `--full-history`, `-m`, `--date=iso8601-strict`, `--format=%H -%nauthor %an%nauthor-date %ai%ncommitter %cn%ncommitter-date %ci%nsummary %B%nfilename ?`]; const DefaultLogParams = [`log`, `--name-status`, `--full-history`, `-m`, `--date=iso8601-strict`, `--format=%H -%nauthor %an%nauthor-date %ai%ncommitter %cn%ncommitter-date %ci%nparent %P%nsummary %B%nfilename ?`];
async function gitCommand(cwd: string, ...args: any[]) { async function gitCommand(cwd: string, ...args: any[]) {
try { try {