Add useCommitAndPush to settings & GitPanel props

Author: ktaletsk

schema/plugin.json

@@ -58,6 +58,12 @@
       "title": "Simple staging flag",
       "description": "If true, use a simplified concept of staging. Only files with changes are shown (instead of showing staged/changed/untracked), and all files with changes will be automatically staged",
       "default": false
+    },
+    "useCommitAndPush": {
+      "type": "boolean",
+      "title": "Combine commit and push in one button",
+      "description": "If true, combine commit and push in one button.",
+      "default": false
     }
   },
   "jupyter.lab.shortcuts": [

src/components/CommitBox.tsx

@@ -19,6 +19,11 @@ export interface ICommitBoxProps {
    */
   commands: CommandRegistry;
 
+  /**
+   * Boolean indicating whether to use simplified commit-and-push instead of commit button
+   */
+  useCommitAndPush: boolean;
+
   /**
    * Boolean indicating whether files currently exist which have changes to commit.
    */
@@ -91,7 +96,9 @@ export class CommitBox extends React.Component<
       ? this.props.trans.__('Disabled: No files are staged for commit')
       : !this.state.summary
       ? this.props.trans.__('Disabled: No commit message summary')
-      : this.props.trans.__('Commit');
+      : !this.props.useCommitAndPush
+      ? this.props.trans.__('Commit')
+      : this.props.trans.__('Commit and push');
 
     const shortcutHint = CommandRegistry.formatKeystroke(
       this._getSubmitKeystroke()

src/components/GitPanel.tsx

@@ -380,13 +380,15 @@ export class GitPanel extends React.Component<IGitPanelProps, IGitPanelState> {
           <CommitBox
             hasFiles={this._markedFiles.length > 0}
             trans={this.props.trans}
+            useCommitAndPush={this.props.settings.composite['useCommitAndPush'] as boolean}
             onCommit={this.commitMarkedFiles}
             commands={this.props.commands}
           />
         ) : (
           <CommitBox
             hasFiles={this._hasStagedFile()}
             trans={this.props.trans}
+            useCommitAndPush={this.props.settings.composite['useCommitAndPush'] as boolean}
             onCommit={this.commitStagedFiles}
             commands={this.props.commands}
           />