Merge branch 'master' of https://github.com/jupyterlab/jupyterlab-git into refactor-commit-box

Author: kgryte

README.md

@@ -28,12 +28,45 @@ jupyter lab build
 
 ### Troubleshooting
 
-- When you run JupyterLab, if you can see the Git sidepanel UI but you cannot get it to work, you may need to explicitly enable the serverextension by running:
+Before consulting the following list, be sure the server extension and the frontend extension have the same version by executing the following commands:
 
 ```bash
-jupyter serverextension enable --py jupyterlab_git
+jupyter serverextension list
+jupyter labextension list
 ```
 
+- **Issue**: the Git panel does not recognize that you are in a Git repository.
+
+  Possible fixes:
+  
+  - Be sure to be in a Git repository in the filebrowser tab
+  
+  - Check the server log. If you see a warning with a 404 code similar to:  
+    `[W 00:27:41.800 LabApp] 404 GET /git/server_root?1576081660665`
+    
+    Explicitly enable the server extension by running:
+    ```bash
+    jupyter serverextension enable --py jupyterlab_git
+    ```
+    
+  - If you are using JupyterHub or some other technologies requiring an initialization script which includes the jupyterlab-git extension, be sure to install both the frontend and the server extension **before** launching JupyterLab.
+  
+- **Issue**: the Git panel is not visible.
+
+  Possible fixes:
+  
+  - Check that the JupyterLab extension is installed:
+  
+    ```bash
+    jupyter labextension list
+    ```
+    
+    If you don't see `@jupyterlab/git v...  enabled  OK` in the list, explicitly install the jupyter labextension by running:
+    
+    ```bash
+    jupyter labextension @jupyterlab/git
+    ```
+
 ## Development
 
 ### Contributing

jupyterlab_git/__init__.py

@@ -1,20 +1,20 @@
+"""Initialize the backend server extension
 """
-Initialize the backend server extension
-"""
+# need this in order to show version in `jupyter serverextension list`
+from ._version import __version__
+
 from jupyterlab_git.handlers import setup_handlers
 from jupyterlab_git.git import Git
 
 
 def _jupyter_server_extension_paths():
-    """
-    Declare the Jupyter server extension paths.
+    """Declare the Jupyter server extension paths.
     """
     return [{"module": "jupyterlab_git"}]
 
 
 def load_jupyter_server_extension(nbapp):
-    """
-    Load the Jupyter server extension.
+    """Load the Jupyter server extension.
     """
     git = Git(nbapp.web_app.settings['contents_manager'])
     nbapp.web_app.settings["git"] = git

src/components/PathHeader.tsx

@@ -68,6 +68,7 @@ export class PathHeader extends React.Component<IPathHeaderProps> {
         />
         <button
           className={classes(repoRefreshStyle, 'jp-Icon-16')}
+          title={'Refresh the repository to detect local and remote changes'}
           onClick={() => this.props.refresh()}
         />
       </div>

src/components/SinglePastCommitInfo.tsx

@@ -169,6 +169,7 @@ export class SinglePastCommitInfo extends React.Component<
                 discardFileButtonStyle
               )}
               onClick={this.showDeleteCommit}
+              title="Discard changes introduced by this commit"
             />
             <button
               className={classes(
@@ -177,6 +178,7 @@ export class SinglePastCommitInfo extends React.Component<
                 revertButtonStyle
               )}
               onClick={this.showResetToCommit}
+              title="Discard changes introduced *after* this commit"
             />
           </div>
           <div>

src/gitMenuCommands.ts

@@ -28,33 +28,25 @@ export function addCommands(
   const { commands, shell } = app;
 
   /**
-   * Add open terminal and run command
-   *
-   * Argument 'cmd' can be passed at the execute function to specify the command to execute
+   * Add open terminal in the Git repository
    */
   commands.addCommand(CommandIDs.gitTerminalCommand, {
-    label: 'Git Command in Terminal',
-    caption: 'Open a new terminal to perform git command',
+    label: 'Open Terminal in Git Repository',
+    caption: 'Open a New Terminal in the Git Repository',
     execute: async args => {
-      let changeDirectoryCommand =
-        model.pathRepository === null
-          ? ''
-          : 'cd "' + model.pathRepository.split('"').join('\\"') + '"';
-      let gitCommand = (args['cmd'] as string) || '';
-      let linkCommand =
-        changeDirectoryCommand !== '' && gitCommand !== '' ? '&&' : '';
-
       const main = (await commands.execute(
         'terminal:create-new',
         args
       )) as MainAreaWidget<ITerminal.ITerminal>;
 
-      const terminal = main.content;
       try {
-        terminal.session.send({
-          type: 'stdin',
-          content: [changeDirectoryCommand + linkCommand + gitCommand + '\n']
-        });
+        if (model.pathRepository !== null) {
+          const terminal = main.content;
+          terminal.session.send({
+            type: 'stdin',
+            content: [`cd "${model.pathRepository.split('"').join('\\"')}"\n`]
+          });
+        }
 
         return main;
       } catch (e) {

src/model.ts

@@ -681,17 +681,6 @@ export class GitExtension implements IGitExtension {
     }
   }
 
-  performDiff(filename: string, revisionA: string, revisionB: string) {
-    let extension = PathExt.extname(filename).toLocaleLowerCase();
-    if (this._diffProviders[extension] !== undefined) {
-      this._diffProviders[extension](filename, revisionA, revisionB);
-    } else if (this.commands) {
-      this.commands.execute('git:terminal-cmd', {
-        cmd: 'git diff ' + revisionA + ' ' + revisionB
-      });
-    }
-  }
-
   /**
    * Register a new diff provider for specified file types
    *