Skip to content
Snippets Groups Projects
Select Git revision
  • 2720688f4cbb52315d971b2637f83e4a9484bf2c
  • main default protected
  • renovate/main-renovatebot-github-action-43.x
  • next
  • feat/gnupg
  • fix/36615b-branch-reuse-no-cache
  • renovate/main-redis-5.x
  • chore/punycode
  • refactor/pin-new-value
  • feat/36219--git-x509-signing
  • feat/structured-logger
  • hotfix/39.264.1
  • feat/skip-dangling
  • gh-readonly-queue/next/pr-36034-7a061c4ca1024a19e2c295d773d9642625d1c2be
  • hotfix/39.238.3
  • refactor/gitlab-auto-approve
  • feat/template-strings
  • gh-readonly-queue/next/pr-35654-137d934242c784e0c45d4b957362214f0eade1d7
  • fix/32307-global-extends-merging
  • fix/32307-global-extends-repositories
  • gh-readonly-queue/next/pr-35009-046ebf7cb84ab859f7fefceb5fa53a54ce9736f8
  • 41.45.0
  • 41.44.0
  • 41.43.7
  • 41.43.6
  • 41.43.5
  • 41.43.4
  • 41.43.3
  • 41.43.2
  • 41.43.1
  • 41.43.0
  • 41.42.12
  • 41.42.11
  • 41.42.10
  • 41.42.9
  • 41.42.8
  • 41.42.7
  • 41.42.6
  • 41.42.5
  • 41.42.4
  • 41.42.3
41 results

index.js

Blame
  • parent.js 2.33 KiB
    module.exports = {
      getParentBranch,
    };
    
    async function getParentBranch(config) {
      const { branchName } = config;
      // Check if branch exists
      const branchExists = await platform.branchExists(branchName);
      if (!branchExists) {
        logger.info(`Branch needs creating`);
        return { parentBranch: undefined };
      }
      logger.debug(`Branch already exists`);
    
      // Check for existing PR
      const pr = await platform.getBranchPr(branchName);
    
      if (pr) {
        if (pr.title && pr.title.startsWith('rebase!')) {
          logger.info('Manual rebase requested via PR title for #' + pr.number);
          return { parentBranch: undefined };
        }
        if (pr.labels && pr.labels.includes(config.rebaseLabel)) {
          logger.info('Manual rebase requested via PR labels for #' + pr.number);
          await platform.deleteLabel(pr.number, config.rebaseLabel);
          return { parentBranch: undefined };
        }
      }
    
      if (
        config.rebaseStalePrs ||
        (config.rebaseStalePrs === null && (await platform.getRepoForceRebase())) ||
        (config.automerge && config.automergeType === 'branch')
      ) {
        const isBranchStale = await platform.isBranchStale(branchName);
        if (isBranchStale) {
          logger.info(`Branch is stale and needs rebasing`);
          // We can rebase the branch only if no PR or PR can be rebased
          if (!pr || pr.canRebase) {
            return { parentBranch: undefined };
          }
          // TODO: Warn here so that it appears in PR body
          logger.info('Cannot rebase branch');
          return { parentBranch: branchName, canRebase: false };
        }
      }
    
      // Now check if PR is unmergeable. If so then we also rebase
      if (pr && pr.isConflicted) {
        logger.debug('PR is conflicted');
        if (pr.canRebase) {
          logger.info(`Branch is not mergeable and needs rebasing`);
          // TODO: Move this down to api library
          if (config.isGitLab || config.isVsts) {
            logger.info(`Deleting unmergeable branch in order to recreate/rebase`);
            await platform.deleteBranch(branchName);
          }
          // Setting parentBranch back to undefined means that we'll use the default branch
          return { parentBranch: undefined };
        }
        // Don't do anything different, but warn
        // TODO: Add warning to PR
        logger.info(`Branch is not mergeable but can't be rebased`);
      }
      logger.debug(`Branch does not need rebasing`);
      return { parentBranch: branchName, canRebase: true };
    }