feat: fixed the issues after rebase

Author: ktaletsk

jupyterlab_git/git.py

@@ -37,6 +37,19 @@ def communicate(self):
             p.expect('Password for .*:')
             p.sendline(self.password)
 
+            p.expect(pexpect.EOF)
+            response = p.before
+
+            self.returncode = p.wait()
+            p.close()
+            
+            return response
+        except pexpect.exceptions.EOF: #In case of pexpect failure
+            response = p.before
+            self.returncode = p.exitstatus
+            p.close() #close process
+            return response
+
 
 class Git:
     """
@@ -160,7 +173,7 @@ def clone(self, current_path, repo_url, auth=None):
         else:
             env["GIT_TERMINAL_PROMPT"] = "0"
             p = subprocess.Popen(
-                ['git clone {}'.format(unquote(repo_url))],
+                ['git', 'clone', unquote(repo_url)],
                 stdout=PIPE,
                 stderr=PIPE,
                 env = env,
@@ -616,7 +629,7 @@ def pull(self, curr_fb_path, auth=None):
         if (auth):
             env["GIT_TERMINAL_PROMPT"] = "1"
             p = git_auth_input_wrapper(
-                command = ['git', 'pull', '--no-commit'],
+                command = 'git pull --no-commit',
                 cwd = os.path.join(self.root_dir, curr_fb_path),
                 env = env,
                 username = auth['username'],
@@ -631,7 +644,6 @@ def pull(self, curr_fb_path, auth=None):
                 stderr=PIPE,
                 env = env,
                 cwd=os.path.join(self.root_dir, curr_fb_path),
-                env = env,
             )
             _, error = p.communicate()
 
@@ -650,7 +662,7 @@ def push(self, remote, branch, curr_fb_path, auth=None):
         if (auth):
             env["GIT_TERMINAL_PROMPT"] = "1"
             p = git_auth_input_wrapper(
-                command = ['git', 'push', remote, branch],
+                command = 'git push {} {}'.format(remote, branch),
                 cwd = os.path.join(self.root_dir, curr_fb_path),
                 env = env,
                 username = auth['username'],
@@ -665,7 +677,6 @@ def push(self, remote, branch, curr_fb_path, auth=None):
                 stderr=PIPE,
                 env = env,
                 cwd=os.path.join(self.root_dir, curr_fb_path),
-                env = env,
             )
             _, error = p.communicate()
 

src/components/BranchHeader.tsx

@@ -1,13 +1,9 @@
 import * as React from 'react';
 
-import { Dialog } from '@jupyterlab/apputils';
-
 import { Git } from '../git';
 
 import { CommitBox } from './CommitBox';
 
-import { GitAuthorForm } from './CommitAuthorBox';
-
 import { NewBranchBox } from './NewBranchBox';
 
 import {

src/components/PathHeader.tsx

@@ -18,8 +18,6 @@ import { GitPullPushDialog, Operation } from '../widgets/gitPushPull';
 
 import { GitCredentialsForm } from './CredentialsBox';
 
-import { GitCredentialsForm } from './CredentialsBox';
-
 export interface IPathHeaderState {
   refresh: any;
   gitApi: Git;
@@ -99,7 +97,7 @@ export class PathHeader extends React.Component<
     let result = await dialog.launch();
     dialog.dispose();
     let retry = false;
-    while (result.button.label === 'CANCEL') {
+    while (result.button.label === 'Cancel') {
       let credentialsDialog = new Dialog({
         title: 'Git credentials required',
         body: new GitCredentialsForm(

src/git.ts

@@ -126,6 +126,7 @@ export interface IGitLogResult {
 export interface IIdentity {
   name: string;
   email: string;
+}
 
 /**
  * Interface for the Git Auth request.
@@ -144,16 +145,6 @@ export interface IGitClone {
   auth?: IGitAuth;
 }
 
-/**
- * Structure for the request to the Git Commit API.
- */
-export interface IGitCommit {
-  commit_msg: string;
-  top_repo_path: string;
-  author_name?: string;
-  author_email?: string;
-}
-
 /**
  * Structure for the request to the Git Clone API.
  */
@@ -193,14 +184,6 @@ export interface IGitCloneResult {
   message?: string;
 }
 
-/**
- * Structure for the result of the Git Commit API.
- */
-export interface IGitCommitResult {
-  code: number;
-  message?: string;
-}
-
 /**
  * Structure for the result of the Git Push & Pull API.
  */
@@ -474,30 +457,18 @@ export class Git {
     }
   }
   /** Make request to commit all staged files in repository 'path' */
-  async commit(
-    message: string,
-    path: string,
-    authorName: string = '',
-    authorEmail: string = ''
-  ): Promise<IGitCommitResult> {
+  async commit(message: string, path: string): Promise<Response> {
     try {
-      let obj: IGitCommit = {
+      let response = await httpGitRequest('/git/commit', 'POST', {
         commit_msg: message,
         top_repo_path: path
-      };
-
-      if (authorName !== '' && authorEmail !== '') {
-        obj.author_name = authorName;
-        obj.author_email = authorEmail;
-      }
-
-      let response = await httpGitRequest('/git/commit', 'POST', obj);
+      });
       if (response.status !== 200) {
         return response.json().then((data: any) => {
           throw new ServerConnection.ResponseError(response, data.message);
         });
       }
-      return response.json();
+      return response;
     } catch (err) {
       throw ServerConnection.NetworkError;
     }