Skip to content
Snippets Groups Projects
Select Git revision
  • d3b774e8efb97f5542920109f14bc4fd5dda63ee
  • main default protected
  • renovate/main-ghcr.io-renovatebot-base-image-10.x
  • renovate/main-ghcr.io-containerbase-devcontainer-13.x
  • next
  • revert-31645-feat/rename-gradle-wrapper-validation-action
  • renovate/main-redis-5.x
  • fix/36615b-branch-reuse-no-cache
  • chore/punycode
  • fix/36615-branch-reuse-bug
  • 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
  • 41.31.1
  • 41.31.0
  • 41.30.5
  • 41.30.4
  • 41.30.3
  • 41.30.2
  • 41.30.1
  • 41.30.0
  • 41.29.1
  • 41.29.0
  • 41.28.2
  • 41.28.1
  • 41.28.0
  • 41.27.1
  • 41.27.0
  • 41.26.2
  • 41.26.1
  • 41.26.0
  • 41.25.1
  • 41.25.0
41 results

conflicts-cache.ts

Blame
  • user avatar
    Sergei Zharinov authored and GitHub committed
    Co-authored-by: default avatarMichael Kriese <michael.kriese@visualon.de>
    Co-authored-by: default avatarRhys Arkins <rhys@arkins.net>
    d3b774e8
    History
    conflicts-cache.ts 1.49 KiB
    import { getCache } from '../cache/repository';
    
    export function getCachedConflictResult(
      targetBranchName: string,
      targetBranchSha: string,
      sourceBranchName: string,
      sourceBranchSha: string
    ): boolean | null {
      const { gitConflicts } = getCache();
      if (!gitConflicts) {
        return null;
      }
    
      const targetBranchConflicts = gitConflicts[targetBranchName];
      if (targetBranchConflicts?.targetBranchSha !== targetBranchSha) {
        return null;
      }
    
      const sourceBranchConflict =
        targetBranchConflicts.sourceBranches[sourceBranchName];
      if (sourceBranchConflict?.sourceBranchSha !== sourceBranchSha) {
        return null;
      }
    
      return sourceBranchConflict.isConflicted;
    }
    
    export function setCachedConflictResult(
      targetBranchName: string,
      targetBranchSha: string,
      sourceBranchName: string,
      sourceBranchSha: string,
      isConflicted: boolean
    ): void {
      const cache = getCache();
      cache.gitConflicts ??= {};
      const { gitConflicts } = cache;
    
      let targetBranchConflicts = gitConflicts[targetBranchName];
      if (targetBranchConflicts?.targetBranchSha !== targetBranchSha) {
        gitConflicts[targetBranchName] = {
          targetBranchSha,
          sourceBranches: {},
        };
        targetBranchConflicts = gitConflicts[targetBranchName];
      }
    
      const sourceBranchConflict =
        targetBranchConflicts.sourceBranches[sourceBranchName];
      if (sourceBranchConflict?.sourceBranchSha !== sourceBranchSha) {
        targetBranchConflicts.sourceBranches[sourceBranchName] = {
          sourceBranchSha,
          isConflicted,
        };
      }
    }