@gitkraken/core-gitlens 0.1.0 → 0.3.0

package/src/git-cli/parsers/refParser.ts

@@ -1,52 +1,51 @@
 import type { FilteredGitFeatures } from '../../git/features.js';
+import type { RefRecord } from '../../git/models/reference.js';
 import { maybeStopWatch } from '../../utils/stopwatch.js';
 import { iterateByDelimiter } from '../../utils/string.js';
 import type { ExtractAll } from '../../utils/types.js';
 import type { Parser } from './logParser.js';
 
-const branchMapping = {
-	current: `%(HEAD)`, // HEAD indicator (current branch)
-	name: `%(refname)`, // Full reference name
-	upstream: `%(upstream)`, // Upstream branch, if any
-	upstreamTracking: `%(upstream:track)`, // Tracking status
-	sha: `%(objectname)`, // SHA
-	date: `%(committerdate:iso8601)`, // Date
+/**
+ * Unified `for-each-ref` mapping covering branches, remotes, and tags in a single pass.
+ * Fields inapplicable to a given ref-type come back as empty strings from git.
+ *
+ * NOTE: When adding a new field that is gated on a git feature flag, mirror the entry in
+ * `refMappingSupportsWorktreePath` (and any future variants) — both maps MUST stay aligned
+ * so callers can switch parsers based on `git.supported('git:for-each-ref')` without losing
+ * field positions.
+ */
+const refMapping = {
+	current: `%(HEAD)`,
+	name: `%(refname)`,
+	objectname: `%(objectname)`,
+	peeledObjectname: `%(*objectname)`,
+	upstream: `%(upstream)`,
+	upstreamTracking: `%(upstream:track)`,
+	committerDate: `%(committerdate:iso8601)`,
+	creatorDate: `%(creatordate:iso8601)`,
+	authorDate: `%(authordate:iso8601)`,
+	subject: `%(subject)`,
 	worktreePath: undefined,
 };
 
-const branchMappingSupportsWorktreePath = {
-	...branchMapping,
-	worktreePath: '%(worktreepath)', // Worktree path
+const refMappingSupportsWorktreePath = {
+	...refMapping,
+	worktreePath: '%(worktreepath)',
 };
 
-type BranchParser = Parser<typeof branchMapping> | Parser<typeof branchMappingSupportsWorktreePath>;
+type RefParser = Parser<RefRecord>;
 
-let _branchParser: BranchParser | undefined;
-let _branchParserWithWorktree: BranchParser | undefined;
-export function getBranchParser(supportedFeatures: FilteredGitFeatures<'git:for-each-ref'>[]): BranchParser {
+let _refParser: RefParser | undefined;
+let _refParserWithWorktree: RefParser | undefined;
+
+export function getRefParser(supportedFeatures: FilteredGitFeatures<'git:for-each-ref'>[]): RefParser {
 	if (supportedFeatures.includes('git:for-each-ref:worktreePath')) {
-		_branchParserWithWorktree ??= createRefParser(branchMappingSupportsWorktreePath);
-		return _branchParserWithWorktree;
+		_refParserWithWorktree ??= createRefParser(refMappingSupportsWorktreePath);
+		return _refParserWithWorktree;
 	}
-	_branchParser ??= createRefParser(branchMapping);
-	return _branchParser;
-}
-
-const tagMapping = {
-	name: `%(refname)`, // Full reference name
-	tagSha: `%(objectname)`, // sha of the tag
-	sha: `%(*objectname)`, // sha of the commit the tag points to, if any
-	date: `%(creatordate:iso8601)`, // date the tag was created
-	commitDate: `%(authordate:iso8601)`, // author date of the commit the tag points to
-	message: `%(subject)`, // message
-};
-
-type TagParser = Parser<typeof tagMapping>;
-let _tagParser: TagParser | undefined;
 
-export function getTagParser(): TagParser {
-	_tagParser ??= createRefParser(tagMapping);
-	return _tagParser;
+	_refParser ??= createRefParser(refMapping);
+	return _refParser;
 }
 
 const recordSep = '\x1E'; // ASCII Record Separator character

package/src/git-cli/providers/blame.ts

@@ -234,6 +234,7 @@ export class BlameGitSubProvider implements GitBlameSubProvider {
 			let blameLine = blame.lines[editorLine];
 			if (blameLine == null) {
 				if (blame.lines.length !== editorLine) return undefined;
+
 				blameLine = blame.lines[editorLine - 1];
 			}
 
@@ -393,7 +394,7 @@ export class BlameGitSubProvider implements GitBlameSubProvider {
 		const { root, file, params, stdin } = await this.buildBlameArgs(repoPath, fileName, options);
 
 		try {
-			return await this.git.exec({ cwd: root, stdin: stdin }, ...params, '--', file);
+			return await this.git.run({ cwd: root, stdin: stdin }, ...params, '--', file);
 		} catch (ex) {
 			// Since `-c blame.ignoreRevsFile=` doesn't work (despite what the docs suggest),
 			// detect the error and throw a more helpful one