forked from desktop/desktop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request desktop#19626 from desktop/merge-tree-perf
Accurately calculate number of conflicted files in a merge
- Loading branch information
Showing
214 changed files
with
100 additions
and
703,803 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,117 +1,41 @@ | ||
| import byline from 'byline' | ||
| import { Branch } from '../../models/branch' | ||
| import { ComputedAction } from '../../models/computed-action' | ||
| import { MergeTreeResult } from '../../models/merge' | ||
| import { Repository } from '../../models/repository' | ||
| import { isErrnoException } from '../errno-exception' | ||
| import { getMergeBase } from './merge' | ||
| import { spawnGit } from './spawn' | ||
|
|
||
| // the merge-tree output is a collection of entries like this | ||
| // | ||
| // changed in both | ||
| // base 100644 f69fbc5c40409a1db7a3f8353bfffe46a21d6054 atom/browser/resources/mac/Info.plist | ||
| // our 100644 9094f0f7335edf833d51f688851e6a105de60433 atom/browser/resources/mac/Info.plist | ||
| // their 100644 2dd8bc646cff3869557549a39477e30022e6cfdd atom/browser/resources/mac/Info.plist | ||
| // @@ -17,9 +17,15 @@ | ||
| // <key>CFBundleIconFile</key> | ||
| // <string>electron.icns</string> | ||
| // <key>CFBundleVersion</key> | ||
| // +<<<<<<< .our | ||
| // <string>4.0.0</string> | ||
| // <key>CFBundleShortVersionString</key> | ||
| // <string>4.0.0</string> | ||
| // +======= | ||
| // + <string>1.4.16</string> | ||
| // + <key>CFBundleShortVersionString</key> | ||
| // + <string>1.4.16</string> | ||
| // +>>>>>>> .their | ||
| // <key>LSApplicationCategoryType</key> | ||
| //<string>public.app-category.developer-tools</string> | ||
| // <key>LSMinimumSystemVersion</key> | ||
|
|
||
| // The first line for each entry is what I'm referring to as the the header | ||
| // This regex filters on the known entries that can appear | ||
| const contextHeaderRe = | ||
| /^(merged|added in remote|removed in remote|changed in both|removed in local|added in both)$/ | ||
|
|
||
| const conflictMarkerRe = /^\+[<>=]{7}$/ | ||
| import { git, isGitError } from './core' | ||
| import { GitError } from 'dugite' | ||
|
|
||
| export async function determineMergeability( | ||
| repository: Repository, | ||
| ours: Branch, | ||
| theirs: Branch | ||
| ): Promise<MergeTreeResult> { | ||
| const mergeBase = await getMergeBase(repository, ours.tip.sha, theirs.tip.sha) | ||
|
|
||
| if (mergeBase === null) { | ||
| return { kind: ComputedAction.Invalid } | ||
| } | ||
|
|
||
| if (mergeBase === ours.tip.sha || mergeBase === theirs.tip.sha) { | ||
| return { kind: ComputedAction.Clean } | ||
| } | ||
|
|
||
| const process = await spawnGit( | ||
| ['merge-tree', mergeBase, ours.tip.sha, theirs.tip.sha], | ||
| ) { | ||
| return git( | ||
| [ | ||
| 'merge-tree', | ||
| '--write-tree', | ||
| '--name-only', | ||
| '--no-messages', | ||
| '-z', | ||
| ours.tip.sha, | ||
| theirs.tip.sha, | ||
| ], | ||
| repository.path, | ||
| 'mergeTree' | ||
| 'determineMergeability', | ||
| { successExitCodes: new Set([0, 1]) } | ||
| ) | ||
|
|
||
| return await new Promise<MergeTreeResult>((resolve, reject) => { | ||
| const mergeTreeResultPromise: Promise<MergeTreeResult> = | ||
| process.stdout !== null | ||
| ? parseMergeTreeResult(process.stdout) | ||
| : Promise.reject(new Error('Failed reading merge-tree output')) | ||
|
|
||
| // If this is an exception thrown by Node.js while attempting to | ||
| // spawn let's keep the salient details but include the name of | ||
| // the operation. | ||
| process.on('error', e => | ||
| reject( | ||
| isErrnoException(e) ? new Error(`merge-tree failed: ${e.code}`) : e | ||
| ) | ||
| ) | ||
|
|
||
| process.on('exit', code => { | ||
| if (code !== 0) { | ||
| reject(new Error(`merge-tree exited with code '${code}'`)) | ||
| } else { | ||
| mergeTreeResultPromise.then(resolve, reject) | ||
| } | ||
| .then<MergeTreeResult>(({ stdout }) => { | ||
| // The output will be "<tree-id>\0[<filename>\0]*" so we can get the | ||
| // number of conflicted files by counting the number of null bytes and | ||
| // subtracting one for the tree id. | ||
| const conflictedFiles = (stdout.match(/\0/g)?.length ?? 0) - 1 | ||
| return conflictedFiles > 0 | ||
| ? { kind: ComputedAction.Conflicts, conflictedFiles } | ||
| : { kind: ComputedAction.Clean } | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| export function parseMergeTreeResult(stream: NodeJS.ReadableStream) { | ||
| return new Promise<MergeTreeResult>(resolve => { | ||
| let seenConflictMarker = false | ||
| let conflictedFiles = 0 | ||
|
|
||
| stream | ||
| .pipe(byline()) | ||
| .on('data', (line: string) => { | ||
| // New header means new file, reset conflict flag and record if we've | ||
| // seen a conflict in this file or not | ||
| if (contextHeaderRe.test(line)) { | ||
| if (seenConflictMarker) { | ||
| conflictedFiles++ | ||
| seenConflictMarker = false | ||
| } | ||
| } else if (conflictMarkerRe.test(line)) { | ||
| seenConflictMarker = true | ||
| } | ||
| }) | ||
| .on('end', () => { | ||
| if (seenConflictMarker) { | ||
| conflictedFiles++ | ||
| } | ||
|
|
||
| resolve( | ||
| conflictedFiles > 0 | ||
| ? { kind: ComputedAction.Conflicts, conflictedFiles } | ||
| : { kind: ComputedAction.Clean } | ||
| ) | ||
| }) | ||
| }) | ||
| .catch<MergeTreeResult>(e => | ||
| isGitError(e, GitError.CannotMergeUnrelatedHistories) | ||
| ? Promise.resolve({ kind: ComputedAction.Invalid }) | ||
| : Promise.reject(e) | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.