added schema/user settings. historyCount controls number of logs shown

Author: telamonian

jupyterlab_git/git.py

@@ -233,12 +233,12 @@ def status(self, current_path):
                 "message": my_error.decode("utf-8"),
             }
 
-    def log(self, current_path):
+    def log(self, current_path, history_count=10):
         """
         Execute git log command & return the result.
         """
         p = Popen(
-            ["git", "log", "--pretty=format:%H%n%an%n%ar%n%s", "-10"],
+            ["git", "log", "--pretty=format:%H%n%an%n%ar%n%s", ("-%d" % history_count)],
             stdout=PIPE,
             stderr=PIPE,
             cwd=os.path.join(self.root_dir, current_path),

jupyterlab_git/handlers.py

@@ -51,13 +51,16 @@ def post(self):
         POST request handler, calls individual handlers for
         'git show_top_level', 'git branch', 'git log', and 'git status'
         """
-        current_path = self.get_json_body()["current_path"]
+        body = self.get_json_body()
+        current_path = body["current_path"]
+        history_count = body["history_count"]
+
         show_top_level = self.git.show_top_level(current_path)
         if show_top_level["code"] != 0:
             self.finish(json.dumps(show_top_level))
         else:
             branch = self.git.branch(current_path)
-            log = self.git.log(current_path)
+            log = self.git.log(current_path, history_count)
             status = self.git.status(current_path)
 
             result = {

package.json

@@ -28,14 +28,13 @@
   },
   "files": [
     "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
-    "style/*.css",
-    "style/images/*.svg"
+    "schema/**/*.{json,}",
+    "style/**/*.{css,svg}"
   ],
   "sideEffects": [
     "style/*.css"
   ],
   "jupyterlab": {
-    "extension": true,
     "discovery": {
       "server": {
         "managers": [
@@ -46,7 +45,9 @@
           "name": "jupyterlab-git"
         }
       }
-    }
+    },
+    "extension": true,
+    "schemaDir": "schema"
   },
   "dependencies": {
     "@jupyterlab/application": "^1.1.0",

schema/plugin.json

@@ -0,0 +1,15 @@
+{
+  "jupyter.lab.setting-icon-class": "jp-GitIcon",
+  "jupyter.lab.setting-icon-label": "Git",
+  "title": "Git",
+  "description": "jupyterlab-git settings.",
+  "type": "object",
+  "properties": {
+    "historyCount": {
+      "type": "integer",
+      "title": "History count",
+      "description": "Number of (most recent) commits shown in the history log",
+      "default": 100
+    }
+  }
+}

src/components/GitPanel.tsx

@@ -28,6 +28,7 @@ import {
   findRepoButtonStyle
 } from '../style/GitPanelStyle';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import { ISettingRegistry } from '@jupyterlab/coreutils';
 
 /** Interface for GitPanel component state */
 export interface IGitSessionNodeState {
@@ -56,6 +57,7 @@ export interface IGitSessionNodeProps {
   app: JupyterFrontEnd;
   diff: IDiffCallback;
   renderMime: IRenderMimeRegistry;
+  settings: ISettingRegistry.ISettings;
 }
 
 /** A React component for the git extension's main display */
@@ -103,7 +105,8 @@ export class GitPanel extends React.Component<
       if (fileBrowser) {
         // Make API call to get all git info for repo
         let apiResult = await gitApi.allHistory(
-          (fileBrowser as any).model.path
+          (fileBrowser as any).model.path,
+          this.props.settings.composite['historyCount'] as number
         );
 
         if (apiResult.code === 0) {

src/components/GitWidget.tsx

@@ -19,10 +19,16 @@ import { gitWidgetStyle } from '../style/GitWidgetStyle';
 import { IDiffCallback } from '../git';
 
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
+import { ISettingRegistry } from '@jupyterlab/coreutils';
 /**
  * An options object for creating a running sessions widget.
  */
 export interface IOptions {
+  /**
+   * A settings key.
+   */
+  key: string;
+
   /**
    * A service manager instance.
    */
@@ -33,6 +39,11 @@ export interface IOptions {
    * The default is a shared renderer instance.
    */
   renderer?: IRenderer;
+
+  /**
+   * The setings registry.
+   */
+  settings: ISettingRegistry;
 }
 
 /**
@@ -77,11 +88,25 @@ export class GitWidget extends Widget {
       node: (options.renderer || defaultRenderer).createNode()
     });
     this.addClass(gitWidgetStyle);
-    const element = (
-      <GitPanel app={app} diff={diffFunction} renderMime={renderMime} />
-    );
-    this.component = ReactDOM.render(element, this.node);
-    this.component.refresh();
+
+    const { key } = options;
+    const registry = options.settings;
+
+    void registry.load(key).then(settings => {
+      this._settings = settings;
+      // this._settings.changed.connect(this._loadSettings, this);
+
+      const element = (
+        <GitPanel
+          app={app}
+          diff={diffFunction}
+          renderMime={renderMime}
+          settings={this._settings}
+        />
+      );
+      this.component = ReactDOM.render(element, this.node);
+      this.component.refresh();
+    });
   }
 
   /**
@@ -190,4 +215,5 @@ export class GitWidget extends Widget {
   private _renderer: IRenderer = null;
   private _refreshId = -1;
   private _refreshed = new Signal<this, void>(this);
+  private _settings: ISettingRegistry.ISettings;
 }

src/git.ts

@@ -270,10 +270,14 @@ export class Git {
   /** Make request for all git info of repository 'path'
    * (This API is also implicitly used to check if the current repo is a Git repo)
    */
-  async allHistory(path: string): Promise<IGitAllHistory> {
+  async allHistory(
+    path: string,
+    historyCount: number
+  ): Promise<IGitAllHistory> {
     try {
       let response = await httpGitRequest('/git/all_history', 'POST', {
-        current_path: path
+        current_path: path,
+        history_count: historyCount
       });
       if (response.status !== 200) {
         const data = await response.text();

src/index.ts

@@ -3,7 +3,7 @@ import {
   JupyterFrontEnd,
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
-import { PathExt } from '@jupyterlab/coreutils';
+import { ISettingRegistry, PathExt } from '@jupyterlab/coreutils';
 import { IFileBrowserFactory } from '@jupyterlab/filebrowser';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
@@ -32,12 +32,13 @@ export interface IGitExtension {
  * The default running sessions extension.
  */
 const plugin: JupyterFrontEndPlugin<IGitExtension> = {
-  id: 'jupyter.extensions.running-sessions-git',
+  id: '@jupyterlab/git:plugin',
   requires: [
     IMainMenu,
     ILayoutRestorer,
     IFileBrowserFactory,
-    IRenderMimeRegistry
+    IRenderMimeRegistry,
+    ISettingRegistry
   ],
   provides: IGitExtension,
   activate,
@@ -55,14 +56,16 @@ export class GitExtension implements IGitExtension {
   gitCloneWidget: GitClone;
   constructor(
     app: JupyterFrontEnd,
+    key: string,
+    settings: ISettingRegistry,
     restorer: ILayoutRestorer,
     factory: IFileBrowserFactory,
     renderMime: IRenderMimeRegistry
   ) {
     this.app = app;
     this.gitPlugin = new GitWidget(
       app,
-      { manager: app.serviceManager },
+      { key, manager: app.serviceManager, settings },
       this.performDiff.bind(this),
       renderMime
     );
@@ -109,13 +112,22 @@ function activate(
   mainMenu: IMainMenu,
   restorer: ILayoutRestorer,
   factory: IFileBrowserFactory,
-  renderMime: IRenderMimeRegistry
+  renderMime: IRenderMimeRegistry,
+  settings: ISettingRegistry
 ): IGitExtension {
   const { commands } = app;
+  const key = plugin.id;
 
   registerGitIcons(defaultIconRegistry);
 
-  let gitExtension = new GitExtension(app, restorer, factory, renderMime);
+  let gitExtension = new GitExtension(
+    app,
+    key,
+    settings,
+    restorer,
+    factory,
+    renderMime
+  );
 
   const category = 'Git';
   // Rank has been chosen somewhat arbitrarily to give priority to the running