@gitkraken/core-gitlens 0.5.116 → 0.7.0

package/dist/git/utils/pausedOperationStatus.utils.js

@@ -1,156 +1,93 @@
+//#region ../git/src/utils/pausedOperationStatus.utils.ts
 /**
- * Gets the ref for the incoming side of a conflict:
- * - rebase: REBASE_HEAD (the commit being applied)
- * - revert: parent of REVERT_HEAD (git's "theirs" in a revert is the state before the reverted commit)
- * - cherry-pick/merge: the operation-specific HEAD (CHERRY_PICK_HEAD, MERGE_HEAD)
- */
-export function getConflictIncomingRef(status) {
-    if (status.type === 'rebase')
-        return status.steps.current.commit?.ref ?? status.HEAD.ref;
-    if (status.type === 'revert')
-        return `${status.HEAD.ref}^`;
-    return status.HEAD.ref;
+* Gets the ref for the incoming side of a conflict:
+* - rebase: REBASE_HEAD (the commit being applied)
+* - revert: parent of REVERT_HEAD (git's "theirs" in a revert is the state before the reverted commit)
+* - cherry-pick/merge: the operation-specific HEAD (CHERRY_PICK_HEAD, MERGE_HEAD)
+*/
+function getConflictIncomingRef(status) {
+	if (status.type === "rebase") return status.steps.current.commit?.ref ?? status.HEAD.ref;
+	if (status.type === "revert") return `${status.HEAD.ref}^`;
+	return status.HEAD.ref;
 }
 /**
- * Gets the reference representing the "current" (ours/HEAD) side of the operation
- * For rebase, falls back to `onto` when no branch/tag points at the onto commit
- */
-export function getConflictCurrentRef(status) {
-    if (status.type === 'rebase')
-        return status.current ?? status.onto;
-    return status.current;
-}
-/** `name` is the Title Case form for buttons/actions; `prose` is the sentence form ("Cherry-pick paused"). */
-export const pausedOperationStatusStringsByType = {
-    'cherry-pick': {
-        name: 'Cherry Pick',
-        prose: 'Cherry-pick',
-        label: 'Cherry picking',
-        conflicts: 'Resolve conflicts to continue cherry picking',
-        directionality: 'into',
-    },
-    merge: {
-        name: 'Merge',
-        prose: 'Merge',
-        label: 'Merging',
-        conflicts: 'Resolve conflicts to continue merging',
-        directionality: 'into',
-    },
-    rebase: {
-        name: 'Rebase',
-        prose: 'Rebase',
-        label: 'Rebasing',
-        conflicts: 'Resolve conflicts to continue rebasing',
-        directionality: 'onto',
-        pending: 'Pending rebase of',
-    },
-    revert: {
-        name: 'Revert',
-        prose: 'Revert',
-        label: 'Reverting',
-        conflicts: 'Resolve conflicts to continue reverting',
-        directionality: 'in',
-    },
-};
-/** Codicon per variant — shared so the bar and the WIP badge can't drift. */
-export const pausedOperationVariantIcons = {
-    conflicts: 'warning',
-    pending: 'circle-outline',
-    ready: 'check',
-};
-/** Unresolved conflicts outrank a rebase that hasn't reached its first step — neither can continue, but only conflicts are actionable. */
-export function getPausedOperationVariant(status, hasConflicts) {
-    if (hasConflicts)
-        return 'conflicts';
-    if (status.type === 'rebase' && status.steps.total === 0)
-        return 'pending';
-    return 'ready';
+* Gets the reference representing the "current" (ours/HEAD) side of the operation
+* For rebase, falls back to `onto` when no branch/tag points at the onto commit
+*/
+function getConflictCurrentRef(status) {
+	if (status.type === "rebase") return status.current ?? status.onto;
+	return status.current;
 }
 /**
- * Resolves the correct file paths for each side of a merge conflict diff when the file may have been renamed.
- *
- * Conflict files from `git status` don't carry `originalPath`, so we use diff status (from
- * `git diff --name-status -M`) to detect renames between the merge-base and each branch.
- *
- * Note: The diff status must NOT use a pathspec filter, because git applies pathspecs before
- * rename detection — so `git diff -M BASE HEAD -- new.ts` returns `A new.ts` instead of `R old.ts new.ts`
- * when the file was renamed from `old.ts`.
- *
- * @param currentFiles - Diff status from merge-base to my ref (e.g. merge-base..HEAD for current changes)
- * @param incomingFiles - Diff status from merge-base to the other ref (e.g. merge-base..incoming for current changes)
- * @param filePath - The file's current path in the working tree
- * @returns The resolved LHS path (at merge-base) and RHS path (at myRef)
- */
-export function resolveConflictFilePaths(currentFiles, incomingFiles, filePath) {
-    // Check if the file was renamed between merge-base and my side
-    const currentRename = currentFiles?.find(f => (f.status === 'R' || f.status === 'C') && f.path === filePath && f.originalPath);
-    if (currentRename?.originalPath) {
-        // My side renamed: merge-base has the original name, my side has the new name
-        return { lhsPath: currentRename.originalPath, rhsPath: filePath };
-    }
-    // Check if the other side renamed the file
-    if (incomingFiles != null) {
-        const incomingRename = incomingFiles.find(f => (f.status === 'R' || f.status === 'C') && f.path === filePath && f.originalPath);
-        if (incomingRename?.originalPath) {
-            // Other side renamed: merge-base AND my side both have the original name
-            return { lhsPath: incomingRename.originalPath, rhsPath: incomingRename.originalPath };
-        }
-    }
-    // Fallback: git's rename detection can fail when the diff is large or the content similarity is
-    // below the threshold. Look for the add+delete pattern that indicates an undetected rename.
-    // Check if my side has an undetected rename (filePath added on my side, original path deleted)
-    if (currentFiles != null) {
-        const originalPath = findUndetectedRename(currentFiles, incomingFiles, filePath);
-        if (originalPath != null) {
-            return { lhsPath: originalPath, rhsPath: filePath };
-        }
-    }
-    // Check if other side has an undetected rename (filePath added on other side, original path deleted)
-    if (incomingFiles != null && currentFiles != null) {
-        const originalPath = findUndetectedRename(incomingFiles, currentFiles, filePath);
-        if (originalPath != null) {
-            return { lhsPath: originalPath, rhsPath: originalPath };
-        }
-    }
-    // No rename detected
-    return { lhsPath: filePath, rhsPath: filePath };
+* Resolves the correct file paths for each side of a merge conflict diff when the file may have been renamed.
+*
+* Conflict files from `git status` don't carry `originalPath`, so we use diff status (from
+* `git diff --name-status -M`) to detect renames between the merge-base and each branch.
+*
+* Note: The diff status must NOT use a pathspec filter, because git applies pathspecs before
+* rename detection — so `git diff -M BASE HEAD -- new.ts` returns `A new.ts` instead of `R old.ts new.ts`
+* when the file was renamed from `old.ts`.
+*
+* @param currentFiles - Diff status from merge-base to my ref (e.g. merge-base..HEAD for current changes)
+* @param incomingFiles - Diff status from merge-base to the other ref (e.g. merge-base..incoming for current changes)
+* @param filePath - The file's current path in the working tree
+* @returns The resolved LHS path (at merge-base) and RHS path (at myRef)
+*/
+function resolveConflictFilePaths(currentFiles, incomingFiles, filePath) {
+	const currentRename = currentFiles?.find((f) => (f.status === "R" || f.status === "C") && f.path === filePath && f.originalPath);
+	if (currentRename?.originalPath) return {
+		lhsPath: currentRename.originalPath,
+		rhsPath: filePath
+	};
+	if (incomingFiles != null) {
+		const incomingRename = incomingFiles.find((f) => (f.status === "R" || f.status === "C") && f.path === filePath && f.originalPath);
+		if (incomingRename?.originalPath) return {
+			lhsPath: incomingRename.originalPath,
+			rhsPath: incomingRename.originalPath
+		};
+	}
+	if (currentFiles != null) {
+		const originalPath = findUndetectedRename(currentFiles, incomingFiles, filePath);
+		if (originalPath != null) return {
+			lhsPath: originalPath,
+			rhsPath: filePath
+		};
+	}
+	if (incomingFiles != null && currentFiles != null) {
+		const originalPath = findUndetectedRename(incomingFiles, currentFiles, filePath);
+		if (originalPath != null) return {
+			lhsPath: originalPath,
+			rhsPath: originalPath
+		};
+	}
+	return {
+		lhsPath: filePath,
+		rhsPath: filePath
+	};
 }
 /**
- * Looks for an undetected rename in a diff: `filePath` was added on `sideFiles` and
- * a corresponding path was deleted on `sideFiles` while being present in `otherSideFiles`.
- *
- * Git's `-M` rename detection can fail when there are many files (exceeding `diff.renameLimit`)
- * or when content similarity is below the threshold. In those cases, git reports the rename as
- * separate `A` (add) and `D` (delete) entries. This function matches those pairs.
- *
- * @returns The original (deleted) path, or undefined if no match.
- */
+* Looks for an undetected rename in a diff: `filePath` was added on `sideFiles` and
+* a corresponding path was deleted on `sideFiles` while being present in `otherSideFiles`.
+*
+* Git's `-M` rename detection can fail when there are many files (exceeding `diff.renameLimit`)
+* or when content similarity is below the threshold. In those cases, git reports the rename as
+* separate `A` (add) and `D` (delete) entries. This function matches those pairs.
+*
+* @returns The original (deleted) path, or undefined if no match.
+*/
 function findUndetectedRename(sideFiles, otherSideFiles, filePath) {
-    // Verify filePath was added on this side (not renamed — that was already checked)
-    if (!sideFiles.some(f => f.status === 'A' && f.path === filePath))
-        return undefined;
-    // Find a deleted file on this side that the other side also references.
-    // Use path-suffix matching to disambiguate: renames that add a directory prefix (e.g. monorepo
-    // migrations moving `src/x.ts` → `packages/utils/src/x.ts`) produce a pair where one path
-    // is a suffix of the other at a directory boundary.
-    const fileName = filePath.substring(filePath.lastIndexOf('/') + 1);
-    let fallbackMatch;
-    for (const deleted of sideFiles) {
-        if (deleted.status !== 'D')
-            continue;
-        // The other side must have an entry for the deleted path (confirming it's a real file both sides know about)
-        if (otherSideFiles != null && !otherSideFiles.some(f => f.path === deleted.path))
-            continue;
-        // Prefer suffix match (strong signal): one path ends with the other at a directory boundary
-        if (filePath.endsWith(`/${deleted.path}`) || deleted.path.endsWith(`/${filePath}`)) {
-            return deleted.path;
-        }
-        // Only consider same-basename files as a weaker fallback (catches renames where directory
-        // structure changed significantly, e.g. `src/git/parsers/x.ts` → `packages/cli/src/parsers/x.ts`)
-        if (fallbackMatch == null && deleted.path.substring(deleted.path.lastIndexOf('/') + 1) === fileName) {
-            fallbackMatch = deleted.path;
-        }
-    }
-    return fallbackMatch;
+	if (!sideFiles.some((f) => f.status === "A" && f.path === filePath)) return void 0;
+	const fileName = filePath.substring(filePath.lastIndexOf("/") + 1);
+	let fallbackMatch;
+	for (const deleted of sideFiles) {
+		if (deleted.status !== "D") continue;
+		if (otherSideFiles != null && !otherSideFiles.some((f) => f.path === deleted.path)) continue;
+		if (filePath.endsWith(`/${deleted.path}`) || deleted.path.endsWith(`/${filePath}`)) return deleted.path;
+		if (fallbackMatch == null && deleted.path.substring(deleted.path.lastIndexOf("/") + 1) === fileName) fallbackMatch = deleted.path;
+	}
+	return fallbackMatch;
 }
+//#endregion
+export { getConflictCurrentRef, getConflictIncomingRef, resolveConflictFilePaths };
+
 //# sourceMappingURL=pausedOperationStatus.utils.js.map

package/dist/git/utils/pausedOperationStatus.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"pausedOperationStatus.utils.js","sourceRoot":"","sources":["../../../src/git/utils/pausedOperationStatus.utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pausedOperationStatus.utils.js","names":[],"sources":["../../../../git/src/utils/pausedOperationStatus.utils.ts"],"sourcesContent":["import type { GitFile } from '../models/file.js';\nimport type { GitPausedOperationStatus } from '../models/pausedOperationStatus.js';\nimport type { GitReference } from '../models/reference.js';\n\n/**\n * Gets the ref for the incoming side of a conflict:\n * - rebase: REBASE_HEAD (the commit being applied)\n * - revert: parent of REVERT_HEAD (git's \"theirs\" in a revert is the state before the reverted commit)\n * - cherry-pick/merge: the operation-specific HEAD (CHERRY_PICK_HEAD, MERGE_HEAD)\n */\nexport function getConflictIncomingRef(status: GitPausedOperationStatus): string | undefined {\n\tif (status.type === 'rebase') return status.steps.current.commit?.ref ?? status.HEAD.ref;\n\tif (status.type === 'revert') return `${status.HEAD.ref}^`;\n\treturn status.HEAD.ref;\n}\n\n/**\n * Gets the reference representing the \"current\" (ours/HEAD) side of the operation\n * For rebase, falls back to `onto` when no branch/tag points at the onto commit\n */\nexport function getConflictCurrentRef(status: GitPausedOperationStatus): GitReference | undefined {\n\tif (status.type === 'rebase') return status.current ?? status.onto;\n\treturn status.current;\n}\n\n/**\n * Resolves the correct file paths for each side of a merge conflict diff when the file may have been renamed.\n *\n * Conflict files from `git status` don't carry `originalPath`, so we use diff status (from\n * `git diff --name-status -M`) to detect renames between the merge-base and each branch.\n *\n * Note: The diff status must NOT use a pathspec filter, because git applies pathspecs before\n * rename detection — so `git diff -M BASE HEAD -- new.ts` returns `A new.ts` instead of `R old.ts new.ts`\n * when the file was renamed from `old.ts`.\n *\n * @param currentFiles - Diff status from merge-base to my ref (e.g. merge-base..HEAD for current changes)\n * @param incomingFiles - Diff status from merge-base to the other ref (e.g. merge-base..incoming for current changes)\n * @param filePath - The file's current path in the working tree\n * @returns The resolved LHS path (at merge-base) and RHS path (at myRef)\n */\nexport function resolveConflictFilePaths(\n\tcurrentFiles: GitFile[] | undefined,\n\tincomingFiles: GitFile[] | undefined,\n\tfilePath: string,\n): { lhsPath: string; rhsPath: string } {\n\t// Check if the file was renamed between merge-base and my side\n\tconst currentRename = currentFiles?.find(\n\t\tf => (f.status === 'R' || f.status === 'C') && f.path === filePath && f.originalPath,\n\t);\n\tif (currentRename?.originalPath) {\n\t\t// My side renamed: merge-base has the original name, my side has the new name\n\t\treturn { lhsPath: currentRename.originalPath, rhsPath: filePath };\n\t}\n\n\t// Check if the other side renamed the file\n\tif (incomingFiles != null) {\n\t\tconst incomingRename = incomingFiles.find(\n\t\t\tf => (f.status === 'R' || f.status === 'C') && f.path === filePath && f.originalPath,\n\t\t);\n\t\tif (incomingRename?.originalPath) {\n\t\t\t// Other side renamed: merge-base AND my side both have the original name\n\t\t\treturn { lhsPath: incomingRename.originalPath, rhsPath: incomingRename.originalPath };\n\t\t}\n\t}\n\n\t// Fallback: git's rename detection can fail when the diff is large or the content similarity is\n\t// below the threshold. Look for the add+delete pattern that indicates an undetected rename.\n\n\t// Check if my side has an undetected rename (filePath added on my side, original path deleted)\n\tif (currentFiles != null) {\n\t\tconst originalPath = findUndetectedRename(currentFiles, incomingFiles, filePath);\n\t\tif (originalPath != null) {\n\t\t\treturn { lhsPath: originalPath, rhsPath: filePath };\n\t\t}\n\t}\n\n\t// Check if other side has an undetected rename (filePath added on other side, original path deleted)\n\tif (incomingFiles != null && currentFiles != null) {\n\t\tconst originalPath = findUndetectedRename(incomingFiles, currentFiles, filePath);\n\t\tif (originalPath != null) {\n\t\t\treturn { lhsPath: originalPath, rhsPath: originalPath };\n\t\t}\n\t}\n\n\t// No rename detected\n\treturn { lhsPath: filePath, rhsPath: filePath };\n}\n\n/**\n * Looks for an undetected rename in a diff: `filePath` was added on `sideFiles` and\n * a corresponding path was deleted on `sideFiles` while being present in `otherSideFiles`.\n *\n * Git's `-M` rename detection can fail when there are many files (exceeding `diff.renameLimit`)\n * or when content similarity is below the threshold. In those cases, git reports the rename as\n * separate `A` (add) and `D` (delete) entries. This function matches those pairs.\n *\n * @returns The original (deleted) path, or undefined if no match.\n */\nfunction findUndetectedRename(\n\tsideFiles: GitFile[],\n\totherSideFiles: GitFile[] | undefined,\n\tfilePath: string,\n): string | undefined {\n\t// Verify filePath was added on this side (not renamed — that was already checked)\n\tif (!sideFiles.some(f => f.status === 'A' && f.path === filePath)) return undefined;\n\n\t// Find a deleted file on this side that the other side also references.\n\t// Use path-suffix matching to disambiguate: renames that add a directory prefix (e.g. monorepo\n\t// migrations moving `src/x.ts` → `packages/utils/src/x.ts`) produce a pair where one path\n\t// is a suffix of the other at a directory boundary.\n\tconst fileName = filePath.substring(filePath.lastIndexOf('/') + 1);\n\tlet fallbackMatch: string | undefined;\n\tfor (const deleted of sideFiles) {\n\t\tif (deleted.status !== 'D') continue;\n\n\t\t// The other side must have an entry for the deleted path (confirming it's a real file both sides know about)\n\t\tif (otherSideFiles != null && !otherSideFiles.some(f => f.path === deleted.path)) continue;\n\n\t\t// Prefer suffix match (strong signal): one path ends with the other at a directory boundary\n\t\tif (filePath.endsWith(`/${deleted.path}`) || deleted.path.endsWith(`/${filePath}`)) {\n\t\t\treturn deleted.path;\n\t\t}\n\n\t\t// Only consider same-basename files as a weaker fallback (catches renames where directory\n\t\t// structure changed significantly, e.g. `src/git/parsers/x.ts` → `packages/cli/src/parsers/x.ts`)\n\t\tif (fallbackMatch == null && deleted.path.substring(deleted.path.lastIndexOf('/') + 1) === fileName) {\n\t\t\tfallbackMatch = deleted.path;\n\t\t}\n\t}\n\n\treturn fallbackMatch;\n}\n"],"mappings":";;;;;;;AAUA,SAAgB,uBAAuB,QAAsD;CAC5F,IAAI,OAAO,SAAS,UAAU,OAAO,OAAO,MAAM,QAAQ,QAAQ,OAAO,OAAO,KAAK;CACrF,IAAI,OAAO,SAAS,UAAU,OAAO,GAAG,OAAO,KAAK,IAAI;CACxD,OAAO,OAAO,KAAK;AACpB;;;;;AAMA,SAAgB,sBAAsB,QAA4D;CACjG,IAAI,OAAO,SAAS,UAAU,OAAO,OAAO,WAAW,OAAO;CAC9D,OAAO,OAAO;AACf;;;;;;;;;;;;;;;;AAiBA,SAAgB,yBACf,cACA,eACA,UACuC;CAEvC,MAAM,gBAAgB,cAAc,MACnC,OAAM,EAAE,WAAW,OAAO,EAAE,WAAW,QAAQ,EAAE,SAAS,YAAY,EAAE,YACzE;CACA,IAAI,eAAe,cAElB,OAAO;EAAE,SAAS,cAAc;EAAc,SAAS;CAAS;CAIjE,IAAI,iBAAiB,MAAM;EAC1B,MAAM,iBAAiB,cAAc,MACpC,OAAM,EAAE,WAAW,OAAO,EAAE,WAAW,QAAQ,EAAE,SAAS,YAAY,EAAE,YACzE;EACA,IAAI,gBAAgB,cAEnB,OAAO;GAAE,SAAS,eAAe;GAAc,SAAS,eAAe;EAAa;CAEtF;CAMA,IAAI,gBAAgB,MAAM;EACzB,MAAM,eAAe,qBAAqB,cAAc,eAAe,QAAQ;EAC/E,IAAI,gBAAgB,MACnB,OAAO;GAAE,SAAS;GAAc,SAAS;EAAS;CAEpD;CAGA,IAAI,iBAAiB,QAAQ,gBAAgB,MAAM;EAClD,MAAM,eAAe,qBAAqB,eAAe,cAAc,QAAQ;EAC/E,IAAI,gBAAgB,MACnB,OAAO;GAAE,SAAS;GAAc,SAAS;EAAa;CAExD;CAGA,OAAO;EAAE,SAAS;EAAU,SAAS;CAAS;AAC/C;;;;;;;;;;;AAYA,SAAS,qBACR,WACA,gBACA,UACqB;CAErB,IAAI,CAAC,UAAU,MAAK,MAAK,EAAE,WAAW,OAAO,EAAE,SAAS,QAAQ,GAAG,OAAO,KAAA;CAM1E,MAAM,WAAW,SAAS,UAAU,SAAS,YAAY,GAAG,IAAI,CAAC;CACjE,IAAI;CACJ,KAAK,MAAM,WAAW,WAAW;EAChC,IAAI,QAAQ,WAAW,KAAK;EAG5B,IAAI,kBAAkB,QAAQ,CAAC,eAAe,MAAK,MAAK,EAAE,SAAS,QAAQ,IAAI,GAAG;EAGlF,IAAI,SAAS,SAAS,IAAI,QAAQ,MAAM,KAAK,QAAQ,KAAK,SAAS,IAAI,UAAU,GAChF,OAAO,QAAQ;EAKhB,IAAI,iBAAiB,QAAQ,QAAQ,KAAK,UAAU,QAAQ,KAAK,YAAY,GAAG,IAAI,CAAC,MAAM,UAC1F,gBAAgB,QAAQ;CAE1B;CAEA,OAAO;AACR"}

package/dist/git/utils/pullRequest.utils.d.ts

@@ -1,11 +1,12 @@
-import type { PullRequest, PullRequestComparisonRefs, PullRequestRefs, PullRequestRepositoryIdentityDescriptor, PullRequestShape, PullRequestSorting, PullRequestStackInfo } from '../models/pullRequest.js';
+import { PullRequest, PullRequestComparisonRefs, PullRequestRefs, PullRequestRepositoryIdentityDescriptor, PullRequestShape, PullRequestSorting, PullRequestStackInfo } from "../models/pullRequest.js";
+//#region ../git/src/utils/pullRequest.utils.d.ts
 /** How many pull requests a merge action affects — unstacked is always 1; a stacked merge lands either
  *  just this layer and everything below it (`position`), or the whole stack (`wholeStack`). The one
  *  source every merge-confirmation and merge-action label counts from, so they can't drift apart.
  *  Takes only the two fields it needs (not the full {@link PullRequestStackInfo}) since callers on the
  *  webview side carry narrower serialized stack shapes. */
 export declare function getStackedMergeCount(stack: Pick<PullRequestStackInfo, 'position' | 'size'> | undefined, options?: {
-    wholeStack?: boolean;
+  wholeStack?: boolean;
 }): number;
 /**
  * A comparator for one sort key over normalized pull requests, or `undefined` when the field isn't derivable
@@ -18,9 +19,9 @@ export declare function getStackedMergeCount(stack: Pick<PullRequestStackInfo, '
  */
 export declare function getPullRequestComparator(sort: PullRequestSorting): ((a: PullRequestShape, b: PullRequestShape) => number) | undefined;
 export interface PullRequestUrlIdentity<TProvider extends string = string> {
-    provider?: TProvider;
-    ownerAndRepo?: string;
-    prNumber: string;
+  provider?: TProvider;
+  ownerAndRepo?: string;
+  prNumber: string;
 }
 export declare function getComparisonRefsForPullRequest(repoPath: string, prRefs: PullRequestRefs): PullRequestComparisonRefs;
 export declare function getPullRequestIdentityFromMaybeUrl(search: string): PullRequestUrlIdentity | undefined;
@@ -32,4 +33,5 @@ export declare function getPullRequestNumberFromUrl(url: string): string | undef
 export declare function getRepositoryIdentityForPullRequest(pr: PullRequest, headRepo?: boolean): PullRequestRepositoryIdentityDescriptor;
 export declare function isMaybeNonSpecificPullRequestSearchUrl(search: string): boolean;
 export declare function serializePullRequest(value: PullRequest): PullRequestShape;
+//#endregion
 //# sourceMappingURL=pullRequest.utils.d.ts.map