Skip to content

Commit 2cc0178

Browse files
committed
Refer to 'remote' not 'origin'
1 parent 9b93482 commit 2cc0178

File tree

10 files changed

+17
-17
lines changed

10 files changed

+17
-17
lines changed

src/ipc/issueActions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export interface StartWorkAction extends Action {
120120
remoteName: string;
121121
setupJira: boolean;
122122
setupBitbucket: boolean;
123-
pushBranchToOrigin: boolean;
123+
pushBranchToRemote: boolean;
124124
}
125125

126126
export interface OpenStartWorkPageAction extends Action {

src/lib/ipc/fromUI/startWork.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export interface StartRequestAction {
2727
sourceBranch: Branch;
2828
targetBranch: string;
2929
upstream: string;
30-
pushBranchToOrigin: boolean;
30+
pushBranchToRemote: boolean;
3131
}
3232

3333
export interface OpenSettingsAction {

src/lib/webview/controller/startwork/startWorkActionApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export interface StartWorkActionApi {
1717
destinationBranch: string,
1818
sourceBranch: Branch,
1919
remote: string,
20-
pushBranchToOrigin: boolean,
20+
pushBranchToRemote: boolean,
2121
): Promise<void>;
2222
closePage(): void;
2323
getStartWorkConfig(): StartWorkBranchTemplate;

src/lib/webview/controller/startwork/startWorkWebviewController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ export class StartWorkWebviewController implements WebviewController<StartWorkIs
134134
msg.targetBranch,
135135
msg.sourceBranch,
136136
msg.upstream,
137-
msg.pushBranchToOrigin,
137+
msg.pushBranchToRemote,
138138
);
139139
}
140140
this.postMessage({

src/react/atlascode/startwork/StartWorkPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ const StartWorkPage: React.FunctionComponent = () => {
725725
<Grid item>
726726
<Typography variant="h4">
727727
<Box fontWeight="fontWeightBold">
728-
Push the new branch to origin
728+
Push the new branch to remote
729729
</Box>
730730
</Typography>
731731
</Grid>

src/react/atlascode/startwork/startWorkController.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface StartWorkControllerApi {
3030
sourceBranch: Branch,
3131
targetBranch: string,
3232
upstream: string,
33-
pushBranchToOrigin: boolean,
33+
pushBranchToRemote: boolean,
3434
) => Promise<{ transistionStatus?: string; branch?: string; upstream?: string }>;
3535
closePage: () => void;
3636
openJiraIssue: () => void;
@@ -123,7 +123,7 @@ export function useStartWorkController(): [StartWorkState, StartWorkControllerAp
123123
sourceBranch: Branch,
124124
targetBranch: string,
125125
upstream: string,
126-
pushBranchToOrigin: boolean,
126+
pushBranchToRemote: boolean,
127127
): Promise<StartWorkResponseMessage> => {
128128
return new Promise<StartWorkResponseMessage>((resolve, reject) => {
129129
(async () => {
@@ -138,7 +138,7 @@ export function useStartWorkController(): [StartWorkState, StartWorkControllerAp
138138
sourceBranch,
139139
targetBranch,
140140
upstream,
141-
pushBranchToOrigin,
141+
pushBranchToRemote,
142142
},
143143
StartWorkMessageType.StartWorkResponse,
144144
ConnectionTimeout,

src/webview/startwork/vscStartWorkActionApi.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class VSCStartWorkActionApi implements StartWorkActionApi {
5050
destinationBranch: string,
5151
sourceBranch: Branch,
5252
remote: string,
53-
pushBranchToOrigin: boolean,
53+
pushBranchToRemote: boolean,
5454
): Promise<void> {
5555
const scm = Container.bitbucketContext.getRepositoryScm(wsRepo.rootUri)!;
5656

@@ -76,7 +76,7 @@ export class VSCStartWorkActionApi implements StartWorkActionApi {
7676
`${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
7777
);
7878

79-
if (pushBranchToOrigin) {
79+
if (pushBranchToRemote) {
8080
await scm.push(remote, destinationBranch, true);
8181
}
8282
}

src/webviews/components/issue/StartWorkPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ export default class StartWorkPage extends WebviewComponent<Emit, Accept, {}, St
261261
transition: this.state.transition,
262262
setupJira: this.state.jiraSetupEnabled,
263263
setupBitbucket: this.isEmptyRepo(this.state.repo) ? false : this.state.bitbucketSetupEnabled,
264-
pushBranchToOrigin: false,
264+
pushBranchToRemote: false,
265265
});
266266
};
267267

src/webviews/startWorkOnBitbucketIssueWebview.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export class StartWorkOnBitbucketIssueWebview
105105
e.targetBranchName,
106106
e.sourceBranch,
107107
e.remoteName,
108-
e.pushBranchToOrigin,
108+
e.pushBranchToRemote,
109109
);
110110
}
111111

@@ -139,7 +139,7 @@ export class StartWorkOnBitbucketIssueWebview
139139
destBranch: string,
140140
sourceBranch: Branch,
141141
remote: string,
142-
pushBranchToOrigin: boolean,
142+
pushBranchToRemote: boolean,
143143
): Promise<void> {
144144
// checkout if a branch exists already
145145
try {
@@ -163,7 +163,7 @@ export class StartWorkOnBitbucketIssueWebview
163163
`${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
164164
);
165165

166-
if (pushBranchToOrigin) {
166+
if (pushBranchToRemote) {
167167
await repo.push(remote, destBranch, true);
168168
}
169169

src/webviews/startWorkOnIssueWebview.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export class StartWorkOnIssueWebview
112112
e.targetBranchName,
113113
e.sourceBranch,
114114
e.remoteName,
115-
e.pushBranchToOrigin,
115+
e.pushBranchToRemote,
116116
);
117117
}
118118
const currentUserId = issue.siteDetails.userId;
@@ -151,7 +151,7 @@ export class StartWorkOnIssueWebview
151151
destBranch: string,
152152
sourceBranch: Branch,
153153
remote: string,
154-
pushBranchToOrigin: boolean,
154+
pushBranchToRemote: boolean,
155155
): Promise<void> {
156156
// checkout if a branch exists already
157157
try {
@@ -175,7 +175,7 @@ export class StartWorkOnIssueWebview
175175
`${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
176176
);
177177

178-
if (pushBranchToOrigin) {
178+
if (pushBranchToRemote) {
179179
await repo.push(remote, destBranch, true);
180180
}
181181
}

0 commit comments

Comments
 (0)