renovate 40.0.0-next.4 → 40.0.0-next.41

package/dist/util/git/index.js

@@ -119,7 +119,7 @@ async function getDefaultBranch(git) {
     // see https://stackoverflow.com/a/62352647/3005034
     try {
         let res = await git.raw(['rev-parse', '--abbrev-ref', 'origin/HEAD']);
-        // istanbul ignore if
+        /* v8 ignore start -- TODO: add test */
         if (!res) {
             logger_1.logger.debug('Could not determine default branch using git rev-parse');
             const headPrefix = 'HEAD branch: ';
@@ -129,9 +129,11 @@ async function getDefaultBranch(git) {
                 .find((line) => line.startsWith(headPrefix))
                 .replace(headPrefix, '');
         }
+        /* v8 ignore stop */
         return res.replace('origin/', '').trim();
+        /* v8 ignore start -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -139,13 +141,13 @@ async function getDefaultBranch(git) {
         if (err.message.startsWith('fatal: ref refs/remotes/origin/HEAD is not a symbolic ref')) {
             throw new Error(error_messages_1.REPOSITORY_EMPTY);
         }
-        // istanbul ignore if
         if (err.message.includes("fatal: ambiguous argument 'origin/HEAD'")) {
             logger_1.logger.warn({ err }, 'Error getting default branch');
             throw new Error(error_messages_1.TEMPORARY_ERROR);
         }
         throw err;
     }
+    /* v8 ignore stop */
 }
 let config = {};
 // TODO: can be undefined
@@ -159,18 +161,19 @@ async function validateGitVersion() {
     const globalGit = (0, simple_git_1.simpleGit)();
     try {
         const { major, minor, patch, installed } = await globalGit.version();
-        // istanbul ignore if
+        /* v8 ignore next 4 -- TODO: add test */
         if (!installed) {
             logger_1.logger.error('Git not installed');
             return false;
         }
         version = `${major}.${minor}.${patch}`;
+        /* v8 ignore next 4 */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         logger_1.logger.error({ err }, 'Error fetching git version');
         return false;
     }
-    // istanbul ignore if
+    /* v8 ignore next 7 -- TODO: add test */
     if (!(version && semver_1.default.gte(version, exports.GIT_MINIMUM_VERSION))) {
         logger_1.logger.error({ detectedVersion: version, minimumVersion: exports.GIT_MINIMUM_VERSION }, 'Git version needs upgrading');
         return false;
@@ -198,8 +201,9 @@ async function fetchBranchCommits() {
                 sha;
         });
         logger_1.logger.trace({ branchCommits: config.branchCommits }, 'branch commits');
+        /* v8 ignore next 11 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -235,7 +239,7 @@ async function resetToBranch(branchName) {
     await git.raw(['reset', '--hard', 'origin/' + branchName]);
     await git.raw(['clean', '-fd']);
 }
-// istanbul ignore next
+/* v8 ignore next 4 -- TODO: add test */
 async function resetToCommit(commit) {
     logger_1.logger.debug(`resetToCommit(${commit})`);
     await git.raw(['reset', '--hard', commit]);
@@ -247,8 +251,7 @@ async function cleanLocalBranches() {
     const existingBranches = (await git.raw(['branch']))
         .split(regex_1.newlineRegex)
         .map((branch) => branch.trim())
-        .filter((branch) => branch.length)
-        .filter((branch) => !branch.startsWith('* '));
+        .filter((branch) => branch.length > 0 && !branch.startsWith('* '));
     logger_1.logger.debug({ existingBranches });
     for (const branchName of existingBranches) {
         await deleteLocalBranch(branchName);
@@ -268,7 +271,7 @@ function setGitAuthor(gitAuthor) {
 }
 async function writeGitAuthor() {
     const { gitAuthorName, gitAuthorEmail, writeGitDone } = config;
-    // istanbul ignore if
+    /* v8 ignore next 3 -- TODO: add test */
     if (writeGitDone) {
         return;
     }
@@ -282,8 +285,9 @@ async function writeGitAuthor() {
             logger_1.logger.debug(`Setting git author email: ${gitAuthorEmail}`);
             await git.addConfig('user.email', gitAuthorEmail);
         }
+        /* v8 ignore next 11 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -308,8 +312,9 @@ async function getSubmodules() {
             .trim()
             .split((0, regex_1.regEx)(/[\n\s]/))
             .filter((_e, i) => i % 2);
+        /* v8 ignore next 4 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         logger_1.logger.warn({ err }, 'Error getting submodules');
         return [];
     }
@@ -340,13 +345,13 @@ function isCloned() {
 }
 async function syncGit() {
     if (gitInitialized) {
-        // istanbul ignore if
+        /* v8 ignore next 3 -- TODO: add test */
         if (process.env.RENOVATE_X_CLEAR_HOOKS) {
             await git.raw(['config', 'core.hooksPath', '/dev/null']);
         }
         return;
     }
-    // istanbul ignore if: failsafe
+    /* v8 ignore next 3 -- failsafe TODO: add test */
     if (global_1.GlobalConfig.get('platform') === 'local') {
         throw new Error('Cannot sync git when platform=local');
     }
@@ -358,20 +363,18 @@ async function syncGit() {
     if (await fs_extra_1.default.pathExists(gitHead)) {
         try {
             await git.raw(['remote', 'set-url', 'origin', config.url]);
-            await resetToBranch(await getDefaultBranch(git));
             const fetchStart = Date.now();
-            await gitRetry(() => git.pull());
-            await gitRetry(() => git.fetch());
+            await gitRetry(() => git.fetch(['--prune', 'origin']));
             config.currentBranch =
                 config.currentBranch || (await getDefaultBranch(git));
             await resetToBranch(config.currentBranch);
             await cleanLocalBranches();
-            await gitRetry(() => git.raw(['remote', 'prune', 'origin']));
             const durationMs = Math.round(Date.now() - fetchStart);
             logger_1.logger.info({ durationMs }, 'git fetch completed');
             clone = false;
+            /* v8 ignore next 6 -- TODO: add test */
         }
-        catch (err) /* istanbul ignore next */ {
+        catch (err) {
             if (err.message === error_messages_1.REPOSITORY_EMPTY) {
                 throw err;
             }
@@ -402,8 +405,9 @@ async function syncGit() {
                 await git.clone(config.url, '.', opts);
             };
             await gitRetry(() => emptyDirAndClone());
+            /* v8 ignore next 10 -- TODO: add test */
         }
-        catch (err) /* istanbul ignore next */ {
+        catch (err) {
             logger_1.logger.debug({ err }, 'git clone error');
             if (err.message?.includes('No space left on device')) {
                 throw new Error(error_messages_1.SYSTEM_INSUFFICIENT_DISK_SPACE);
@@ -418,8 +422,9 @@ async function syncGit() {
     }
     try {
         config.currentBranchSha = (await git.raw(['rev-parse', 'HEAD'])).trim();
+        /* v8 ignore next 6 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         if (err.message?.includes('fatal: not a git repository')) {
             throw new Error(error_messages_1.REPOSITORY_CHANGED);
         }
@@ -430,8 +435,9 @@ async function syncGit() {
     try {
         const latestCommit = (await git.log({ n: 1 })).latest;
         logger_1.logger.debug({ latestCommit }, 'latest repository commit');
+        /* v8 ignore next 10 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -445,9 +451,9 @@ async function syncGit() {
         config.currentBranch ??
             config.defaultBranch ??
             (await getDefaultBranch(git));
+    /* v8 ignore next -- TODO: add test */
     delete (0, repository_1.getCache)()?.semanticCommits;
 }
-// istanbul ignore next
 async function getRepoStatus(path) {
     if (is_1.default.string(path)) {
         const localDir = global_1.GlobalConfig.get('localDir');
@@ -478,8 +484,9 @@ async function getCommitMessages() {
             format: { message: '%s' },
         });
         return res.all.map((commit) => commit.message);
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch /* istanbul ignore next */ {
+    catch {
         return [];
     }
 }
@@ -498,8 +505,9 @@ async function checkoutBranch(branchName) {
         }
         await git.reset(simple_git_1.ResetMode.HARD);
         return config.currentBranchSha;
+        /* v8 ignore next 11 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -517,15 +525,16 @@ async function getFileList() {
     let files;
     try {
         files = await git.raw(['ls-tree', '-r', branch]);
+        /* v8 ignore next 10 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         if (err.message?.includes('fatal: Not a valid object name')) {
             logger_1.logger.debug({ err }, 'Branch not found when checking branch list - aborting');
             throw new Error(error_messages_1.REPOSITORY_CHANGED);
         }
         throw err;
     }
-    // istanbul ignore if
+    /* v8 ignore next 3 -- TODO: add test */
     if (!files) {
         return [];
     }
@@ -537,7 +546,7 @@ async function getFileList() {
         .map((line) => line.split((0, regex_1.regEx)(/\t/)).pop());
 }
 function getBranchList() {
-    return Object.keys(config.branchCommits ?? /* istanbul ignore next */ {});
+    return Object.keys(config.branchCommits ?? {});
 }
 async function isBranchBehindBase(branchName, baseBranch) {
     const baseBranchSha = getBranchCommit(baseBranch);
@@ -555,8 +564,9 @@ async function isBranchBehindBase(branchName, baseBranch) {
         logger_1.logger.debug({ baseBranch, branchName }, `branch.isBehindBase(): ${isBehind}`);
         (0, behind_base_branch_cache_1.setCachedBehindBaseResult)(branchName, isBehind);
         return isBehind;
+        /* v8 ignore next 7 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
             throw errChecked;
@@ -590,8 +600,9 @@ async function isBranchModified(branchName, baseBranch) {
         for (const commit of commits.all) {
             committedAuthors.add(commit.author_email);
         }
+        /* v8 ignore next 10 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         if (err.message?.includes('fatal: bad revision')) {
             logger_1.logger.debug({ err }, 'Remote branch not found when checking last commit author - aborting run');
             throw new Error(error_messages_1.REPOSITORY_CHANGED);
@@ -662,7 +673,7 @@ async function isBranchConflicted(baseBranch, branch) {
     }
     catch (err) {
         result = true;
-        // istanbul ignore if: not easily testable
+        /* v8 ignore next 6 -- TODO: add test */
         if (!err?.git?.conflicts?.length) {
             logger_1.logger.debug({ baseBranch, branch, err }, 'isBranchConflicted: unknown error');
         }
@@ -673,8 +684,9 @@ async function isBranchConflicted(baseBranch, branch) {
             if (origBranch !== baseBranch) {
                 await git.checkout(origBranch);
             }
+            /* v8 ignore next 6 -- TODO: add test */
         }
-        catch (err) /* istanbul ignore next */ {
+        catch (err) {
             logger_1.logger.debug({ baseBranch, branch, err }, 'isBranchConflicted: cleanup error');
         }
     }
@@ -692,21 +704,22 @@ async function deleteBranch(branchName) {
         await gitRetry(() => git.raw(deleteCommand));
         logger_1.logger.debug(`Deleted remote branch: ${branchName}`);
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
+        /* v8 ignore next 3 -- TODO: add test */
         if (errChecked) {
             throw errChecked;
         }
         logger_1.logger.debug(`No remote branch to delete with name: ${branchName}`);
     }
     try {
+        /* v8 ignore next 2 -- TODO: add test (always throws) */
         await deleteLocalBranch(branchName);
-        // istanbul ignore next
         logger_1.logger.debug(`Deleted local branch: ${branchName}`);
     }
     catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
-        // istanbul ignore if
+        /* v8 ignore next 3 -- TODO: add test */
         if (errChecked) {
             throw errChecked;
         }
@@ -777,7 +790,7 @@ async function getBranchLastCommitTime(branchName) {
     }
     catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
-        // istanbul ignore if
+        /* v8 ignore next 3 -- TODO: add test */
         if (errChecked) {
             throw errChecked;
         }
@@ -789,8 +802,9 @@ async function getBranchFiles(branchName) {
     try {
         const diff = await gitRetry(() => git.diffSummary([`origin/${branchName}`, `origin/${branchName}^`]));
         return diff.files.map((file) => file.file);
+        /* v8 ignore next 8 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         logger_1.logger.warn({ err }, 'getBranchFiles error');
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
         if (errChecked) {
@@ -809,7 +823,7 @@ async function getFile(filePath, branchName) {
     }
     catch (err) {
         const errChecked = (0, error_1.checkForPlatformFailure)(err);
-        // istanbul ignore if
+        /* v8 ignore next 3 -- TODO: add test */
         if (errChecked) {
             throw errChecked;
         }
@@ -871,8 +885,9 @@ async function prepareCommit({ branchName, files, message, force = false, }) {
                 try {
                     await git.rm([fileName]);
                     deletedFiles.push(fileName);
+                    /* v8 ignore next 8 -- TODO: add test */
                 }
-                catch (err) /* istanbul ignore next */ {
+                catch (err) {
                     const errChecked = (0, error_1.checkForPlatformFailure)(err);
                     if (errChecked) {
                         throw errChecked;
@@ -891,9 +906,9 @@ async function prepareCommit({ branchName, files, message, force = false, }) {
                 }
                 else {
                     let contents;
-                    // istanbul ignore else
                     if (typeof file.contents === 'string') {
                         contents = Buffer.from(file.contents);
+                        /* v8 ignore next 3 -- TODO: add test */
                     }
                     else {
                         contents = file.contents;
@@ -910,15 +925,16 @@ async function prepareCommit({ branchName, files, message, force = false, }) {
                     }
                 }
                 try {
-                    // istanbul ignore next
+                    /* v8 ignore next 2 -- TODO: add test */
                     const addParams = fileName === app_strings_1.configFileNames[0] ? ['-f', fileName] : fileName;
                     await git.add(addParams);
                     if (file.isExecutable) {
                         await git.raw(['update-index', '--chmod=+x', fileName]);
                     }
                     addedModifiedFiles.push(fileName);
+                    /* v8 ignore next 11 -- TODO: add test */
                 }
-                catch (err) /* istanbul ignore next */ {
+                catch (err) {
                     if (!err.message.includes('The following paths are ignored by one of your .gitignore files')) {
                         throw err;
                     }
@@ -956,8 +972,9 @@ async function prepareCommit({ branchName, files, message, force = false, }) {
             }),
         };
         return result;
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         return (0, error_1.handleCommitError)(err, branchName, files);
     }
 }
@@ -978,8 +995,9 @@ async function pushCommit({ sourceRef, targetRef, files, }) {
         logger_1.logger.debug({ result: pushRes }, 'git push');
         (0, limits_1.incLimitedValue)('Commits');
         result = true;
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         (0, error_1.handleCommitError)(err, sourceRef, files);
     }
     return result;
@@ -994,8 +1012,9 @@ async function fetchBranch(branchName) {
         config.branchCommits[branchName] = commit;
         config.branchIsModified[branchName] = false;
         return commit;
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         return (0, error_1.handleCommitError)(err, branchName);
     }
 }
@@ -1016,8 +1035,9 @@ async function commitFiles(commitConfig) {
             }
         }
         return null;
+        /* v8 ignore next 6 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         if (err.message.includes('[rejected] (stale info)')) {
             throw new Error(error_messages_1.REPOSITORY_CHANGED);
         }
@@ -1091,8 +1111,9 @@ async function clearRenovateRefs() {
             .map((line) => line.replace((0, regex_1.regEx)(/[0-9a-f]+\s+/i), '').trim())
             .filter((line) => line.startsWith('refs/renovate/branches/'));
         renovateRefs.push(...refs);
+        /* v8 ignore next 3 -- TODO: add test */
     }
-    catch (err) /* istanbul ignore next */ {
+    catch (err) {
         logger_1.logger.warn({ err }, `Renovate refs cleanup error`);
     }
     if (renovateRefs.length) {
@@ -1101,18 +1122,19 @@ async function clearRenovateRefs() {
             await git.push(pushOpts);
         }
         catch (err) {
-            /* istanbul ignore else */
             if ((0, error_1.bulkChangesDisallowed)(err)) {
                 for (const ref of renovateRefs) {
                     try {
                         const pushOpts = ['--delete', 'origin', ref];
                         await git.push(pushOpts);
+                        /* v8 ignore next 4 -- TODO: add test */
                     }
-                    catch (err) /* istanbul ignore next */ {
+                    catch (err) {
                         logger_1.logger.debug({ err }, 'Error deleting "refs/renovate/branches/*"');
                         break;
                     }
                 }
+                /* v8 ignore next 3 -- TODO: add test */
             }
             else {
                 logger_1.logger.warn({ err }, 'Error deleting "refs/renovate/branches/*"');
@@ -1147,8 +1169,9 @@ const treeShaRegex = (0, regex_1.regEx)(/tree\s+(?<treeSha>[0-9a-f]{40})\s*/);
  */
 async function listCommitTree(commitSha) {
     const commitOutput = await git.catFile(['-p', commitSha]);
-    const { treeSha } = treeShaRegex.exec(commitOutput)?.groups ??
-        /* istanbul ignore next: will never happen */ {};
+    const { treeSha } = 
+    /* v8 ignore next -- will never happen ? */
+    treeShaRegex.exec(commitOutput)?.groups ?? {};
     const contents = await git.catFile(['-p', treeSha]);
     const lines = contents.split(regex_1.newlineRegex);
     const result = [];