Skip to content

Improves "paused" operation (cherry-pick, merge, rebase, revert) status and actions #3912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Improves "paused" operation (cherry-pick, merge, rebase, revert) status and actions #3912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7074de
Refactors merge/rebase status
eamodio Jan 7, 2025
ef478e4
Splits git utils into webview safe vs vscode only
eamodio Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/autolinks/autolinks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type { IntegrationId } from '../constants.integrations';
import { IssueIntegrationId } from '../constants.integrations';
import type { Container } from '../container';
import type { GitRemote } from '../git/models/remote';
import { getIssueOrPullRequestHtmlIcon, getIssueOrPullRequestMarkdownIcon } from '../git/utils/icons';
import { getIssueOrPullRequestHtmlIcon, getIssueOrPullRequestMarkdownIcon } from '../git/utils/vscode/icons';
import type { HostingIntegration, IssueIntegration } from '../plus/integrations/integration';
import { fromNow } from '../system/date';
import { debug } from '../system/decorators/log';
Expand Down
4 changes: 2 additions & 2 deletions src/commands/quickCommand.steps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ import type { WorktreeQuickPickItem } from '../git/models/worktree.quickpick';
import { createWorktreeQuickPickItem } from '../git/models/worktree.quickpick';
import { getWorktreesByBranch } from '../git/models/worktree.utils';
import { remoteUrlRegex } from '../git/parsers/remoteParser';
import type { BranchSortOptions, TagSortOptions } from '../git/utils/sorting';
import { sortBranches, sortContributors, sortTags, sortWorktrees } from '../git/utils/sorting';
import type { BranchSortOptions, TagSortOptions } from '../git/utils/vscode/sorting';
import { sortBranches, sortContributors, sortTags, sortWorktrees } from '../git/utils/vscode/sorting';
import { getApplicablePromo } from '../plus/gk/account/promos';
import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../plus/gk/account/subscription';
import type { LaunchpadCommandArgs } from '../plus/launchpad/launchpad';
Expand Down
3 changes: 1 addition & 2 deletions src/constants.views.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,10 @@ export type TreeViewNodeTypes =
| 'grouping'
| 'launchpad'
| 'launchpad-item'
| 'merge-status'
| 'message'
| 'pager'
| 'paused-operation-status'
| 'pullrequest'
| 'rebase-status'
| 'reflog'
| 'reflog-record'
| 'remote'
Expand Down
10 changes: 7 additions & 3 deletions src/env/node/git/git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ const rootSha = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
export const GitErrors = {
badRevision: /bad revision '(.*?)'/i,
cantLockRef: /cannot lock ref|unable to update local ref/i,
changesWouldBeOverwritten: /Your local changes to the following files would be overwritten/i,
changesWouldBeOverwritten:
/Your local changes to the following files would be overwritten|Your local changes would be overwritten/i,
commitChangesFirst: /Please, commit your changes before you can/i,
conflict: /^CONFLICT \([^)]+\): \b/m,
failedToDeleteDirectoryNotEmpty: /failed to delete '(.*?)': Directory not empty/i,
Expand All @@ -93,18 +94,21 @@ export const GitErrors = {
alreadyCheckedOut: /already checked out/i,
mainWorkingTree: /is a main working tree/i,
noUpstream: /^fatal: The current branch .* has no upstream branch/i,
noPausedOperation:
/no merge (?:in progress|to abort)|no cherry-pick(?: or revert)? in progress|no rebase in progress/i,
permissionDenied: /Permission.*denied/i,
pushRejected: /^error: failed to push some refs to\b/m,
rebaseMultipleBranches: /cannot rebase onto multiple branches/i,
remoteAhead: /rejected because the remote contains work/i,
remoteConnection: /Could not read from remote repository/i,
tagConflict: /! \[rejected\].*\(would clobber existing tag\)/m,
unmergedFiles: /is not possible because you have unmerged files/i,
unmergedFiles: /is not possible because you have unmerged files|You have unmerged files/i,
unstagedChanges: /You have unstaged changes/i,
tagAlreadyExists: /tag .* already exists/i,
tagNotFound: /tag .* not found/i,
invalidTagName: /invalid tag name/i,
remoteRejected: /rejected because the remote contains work/i,
unresolvedConflicts: /You must edit all merge conflicts|Resolve all conflicts/i,
};

const GitWarnings = {
Expand Down Expand Up @@ -1543,7 +1547,7 @@ export class Git {
target,
);
} catch (ex) {
const msg = ex?.toString() ?? '';
const msg: string = ex?.toString() ?? '';

if (GitErrors.notAValidObjectName.test(msg)) {
throw new Error(
Expand Down
Loading
Loading