Refer to 'remote' not 'origin'

atlassian · Feb 20, 2025 · 2cc0178 · 2cc0178
1 parent 9b93482
commit 2cc0178
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 17 deletions.
diff --git a/src/ipc/issueActions.ts b/src/ipc/issueActions.ts
@@ -120,7 +120,7 @@ export interface StartWorkAction extends Action {
     remoteName: string;
     setupJira: boolean;
     setupBitbucket: boolean;
-    pushBranchToOrigin: boolean;
+    pushBranchToRemote: boolean;
 }
 
 export interface OpenStartWorkPageAction extends Action {

diff --git a/src/lib/ipc/fromUI/startWork.ts b/src/lib/ipc/fromUI/startWork.ts
@@ -27,7 +27,7 @@ export interface StartRequestAction {
     sourceBranch: Branch;
     targetBranch: string;
     upstream: string;
-    pushBranchToOrigin: boolean;
+    pushBranchToRemote: boolean;
 }
 
 export interface OpenSettingsAction {

diff --git a/src/lib/webview/controller/startwork/startWorkActionApi.ts b/src/lib/webview/controller/startwork/startWorkActionApi.ts
@@ -17,7 +17,7 @@ export interface StartWorkActionApi {
         destinationBranch: string,
         sourceBranch: Branch,
         remote: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ): Promise<void>;
     closePage(): void;
     getStartWorkConfig(): StartWorkBranchTemplate;

diff --git a/src/lib/webview/controller/startwork/startWorkWebviewController.ts b/src/lib/webview/controller/startwork/startWorkWebviewController.ts
@@ -134,7 +134,7 @@ export class StartWorkWebviewController implements WebviewController<StartWorkIs
                             msg.targetBranch,
                             msg.sourceBranch,
                             msg.upstream,
-                            msg.pushBranchToOrigin,
+                            msg.pushBranchToRemote,
                         );
                     }
                     this.postMessage({

diff --git a/src/react/atlascode/startwork/StartWorkPage.tsx b/src/react/atlascode/startwork/StartWorkPage.tsx
@@ -725,7 +725,7 @@ const StartWorkPage: React.FunctionComponent = () => {
                                                 <Grid item>
                                                     <Typography variant="h4">
                                                         <Box fontWeight="fontWeightBold">
-                                                            Push the new branch to origin
+                                                            Push the new branch to remote
                                                         </Box>
                                                     </Typography>
                                                 </Grid>

diff --git a/src/react/atlascode/startwork/startWorkController.ts b/src/react/atlascode/startwork/startWorkController.ts
@@ -30,7 +30,7 @@ export interface StartWorkControllerApi {
         sourceBranch: Branch,
         targetBranch: string,
         upstream: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ) => Promise<{ transistionStatus?: string; branch?: string; upstream?: string }>;
     closePage: () => void;
     openJiraIssue: () => void;
@@ -123,7 +123,7 @@ export function useStartWorkController(): [StartWorkState, StartWorkControllerAp
             sourceBranch: Branch,
             targetBranch: string,
             upstream: string,
-            pushBranchToOrigin: boolean,
+            pushBranchToRemote: boolean,
         ): Promise<StartWorkResponseMessage> => {
             return new Promise<StartWorkResponseMessage>((resolve, reject) => {
                 (async () => {
@@ -138,7 +138,7 @@ export function useStartWorkController(): [StartWorkState, StartWorkControllerAp
                                 sourceBranch,
                                 targetBranch,
                                 upstream,
-                                pushBranchToOrigin,
+                                pushBranchToRemote,
                             },
                             StartWorkMessageType.StartWorkResponse,
                             ConnectionTimeout,

diff --git a/src/webview/startwork/vscStartWorkActionApi.ts b/src/webview/startwork/vscStartWorkActionApi.ts
@@ -50,7 +50,7 @@ export class VSCStartWorkActionApi implements StartWorkActionApi {
         destinationBranch: string,
         sourceBranch: Branch,
         remote: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ): Promise<void> {
         const scm = Container.bitbucketContext.getRepositoryScm(wsRepo.rootUri)!;
 
@@ -76,7 +76,7 @@ export class VSCStartWorkActionApi implements StartWorkActionApi {
             `${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
         );
 
-        if (pushBranchToOrigin) {
+        if (pushBranchToRemote) {
             await scm.push(remote, destinationBranch, true);
         }
     }

diff --git a/src/webviews/components/issue/StartWorkPage.tsx b/src/webviews/components/issue/StartWorkPage.tsx
@@ -261,7 +261,7 @@ export default class StartWorkPage extends WebviewComponent<Emit, Accept, {}, St
             transition: this.state.transition,
             setupJira: this.state.jiraSetupEnabled,
             setupBitbucket: this.isEmptyRepo(this.state.repo) ? false : this.state.bitbucketSetupEnabled,
-            pushBranchToOrigin: false,
+            pushBranchToRemote: false,
         });
     };
 

diff --git a/src/webviews/startWorkOnBitbucketIssueWebview.ts b/src/webviews/startWorkOnBitbucketIssueWebview.ts
@@ -105,7 +105,7 @@ export class StartWorkOnBitbucketIssueWebview
                                     e.targetBranchName,
                                     e.sourceBranch,
                                     e.remoteName,
-                                    e.pushBranchToOrigin,
+                                    e.pushBranchToRemote,
                                 );
                             }
 
@@ -139,7 +139,7 @@ export class StartWorkOnBitbucketIssueWebview
         destBranch: string,
         sourceBranch: Branch,
         remote: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ): Promise<void> {
         // checkout if a branch exists already
         try {
@@ -163,7 +163,7 @@ export class StartWorkOnBitbucketIssueWebview
             `${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
         );
 
-        if (pushBranchToOrigin) {
+        if (pushBranchToRemote) {
             await repo.push(remote, destBranch, true);
         }
 

diff --git a/src/webviews/startWorkOnIssueWebview.ts b/src/webviews/startWorkOnIssueWebview.ts
@@ -112,7 +112,7 @@ export class StartWorkOnIssueWebview
                                     e.targetBranchName,
                                     e.sourceBranch,
                                     e.remoteName,
-                                    e.pushBranchToOrigin,
+                                    e.pushBranchToRemote,
                                 );
                             }
                             const currentUserId = issue.siteDetails.userId;
@@ -151,7 +151,7 @@ export class StartWorkOnIssueWebview
         destBranch: string,
         sourceBranch: Branch,
         remote: string,
-        pushBranchToOrigin: boolean,
+        pushBranchToRemote: boolean,
     ): Promise<void> {
         // checkout if a branch exists already
         try {
@@ -175,7 +175,7 @@ export class StartWorkOnIssueWebview
             `${sourceBranch.type === RefType.RemoteHead ? 'remotes/' : ''}${sourceBranch.name}`,
         );
 
-        if (pushBranchToOrigin) {
+        if (pushBranchToRemote) {
             await repo.push(remote, destBranch, true);
         }
     }