Merge pull request #139 from edgardmessias/news_commits_statusbar

Added in StatusBar notification of news commits (Close #135)

Author: JohnstonCode

package.json

@@ -360,6 +360,13 @@
             "How frequently (in minutes) to check branch changes. Set to `0` to avoid periodic checks.",
           "default": 5
         },
+        "svn.newsCommits.update": {
+          "type": "number",
+          "minimum": 0,
+          "description":
+            "How frequently (in minutes) to check news commits. Set to `0` to avoid periodic checks.",
+          "default": 5
+        },
         "svn.multipleFolders.enabled": {
           "type": "boolean",
           "description": "Allow to find subfolders using SVN",

src/commands.ts

@@ -702,7 +702,7 @@ export class SvnCommands {
   @command("svn.update", { repository: true })
   async update(repository: Repository) {
     try {
-      const result = await repository.repository.update();
+      const result = await repository.updateRevision();
       window.showInformationMessage(result);
     } catch (error) {
       console.error(error);

src/repository.ts

@@ -26,6 +26,7 @@ import { IFileStatus } from "./statusParser";
 export class Repository {
   public watcher: FileSystemWatcher;
   public sourceControl: SourceControl;
+  public statusBar: SvnStatusBar;
   public changes: SvnResourceGroup;
   public unversioned: SvnResourceGroup;
   public external: SvnResourceGroup;
@@ -36,8 +37,10 @@ export class Repository {
   private disposables: Disposable[] = [];
   public currentBranch = "";
   public isSwitchingBranch: boolean = false;
+  public isUpdatingRevision: boolean = false;
   public branches: any[] = [];
   public branchesTimer: NodeJS.Timer;
+  public newsCommit: number = 0;
 
   private _onDidChangeRepository = new EventEmitter<Uri>();
   readonly onDidChangeRepository: Event<Uri> = this._onDidChangeRepository
@@ -49,6 +52,10 @@ export class Repository {
   private _onDidChangeBranch = new EventEmitter<void>();
   readonly onDidChangeBranch: Event<void> = this._onDidChangeBranch.event;
 
+  private _onDidChangeNewsCommit = new EventEmitter<void>();
+  readonly onDidChangeNewsCommit: Event<void> = this._onDidChangeNewsCommit
+    .event;
+
   get root(): string {
     return this.repository.root;
   }
@@ -114,19 +121,20 @@ export class Repository {
     this.sourceControl.quickDiffProvider = this;
     this.disposables.push(this.sourceControl);
 
-    const statusBar = new SvnStatusBar(this);
-    this.disposables.push(statusBar);
-    statusBar.onDidChange(
-      () => (this.sourceControl.statusBarCommands = statusBar.commands),
+    this.statusBar = new SvnStatusBar(this);
+    this.disposables.push(this.statusBar);
+    this.statusBar.onDidChange(
+      () => (this.sourceControl.statusBarCommands = this.statusBar.commands),
       null,
       this.disposables
     );
 
-    const updateBranchName = async () => {
+    const updateBranchInfo = async () => {
       this.currentBranch = await this.getCurrentBranch();
-      this.sourceControl.statusBarCommands = statusBar.commands;
+      this.sourceControl.statusBarCommands = this.statusBar.commands;
     };
-    updateBranchName();
+    this.onDidChangeStatus(updateBranchInfo);
+    updateBranchInfo();
 
     this.changes = this.sourceControl.createResourceGroup(
       "changes",
@@ -163,7 +171,15 @@ export class Repository {
       }, 1000 * 60 * updateFreq);
     }
 
+    const updateFreqNews = svnConfig.get<number>("svn.newsCommits.update");
+    if (updateFreqNews) {
+      setInterval(() => {
+        this.updateNewsCommits();
+      }, 1000 * 60 * updateFreqNews);
+    }
+
     this.updateBranches();
+    this.updateNewsCommits();
     this.update();
   }
 
@@ -176,6 +192,15 @@ export class Repository {
     }
   }
 
+  @debounce(1000)
+  async updateNewsCommits() {
+    const newsCommit = await this.repository.countNewsCommit();
+    if (newsCommit !== this.newsCommit) {
+      this.newsCommit = newsCommit;
+      this._onDidChangeNewsCommit.fire();
+    }
+  }
+
   @debounce(1000)
   async update() {
     let changes: any[] = [];
@@ -286,8 +311,6 @@ export class Repository {
       this.external.resourceStates = [];
     }
 
-    this.currentBranch = await this.getCurrentBranch();
-
     this._onDidChangeStatus.fire();
 
     return Promise.resolve();
@@ -362,6 +385,7 @@ export class Repository {
     this.isSwitchingBranch = false;
     this.updateBranches();
     this._onDidChangeBranch.fire();
+    this.updateNewsCommits()
     return response;
   }
 
@@ -386,9 +410,18 @@ export class Repository {
       this.isSwitchingBranch = false;
       this.updateBranches();
       this._onDidChangeBranch.fire();
+      this.updateNewsCommits()
     }
   }
 
+  async updateRevision() {
+    this.isUpdatingRevision = true;
+    const response = await this.repository.update();
+    this.isUpdatingRevision = false;
+    this.updateNewsCommits();
+    return response;
+  }
+
   async resolve(file: string, action: string) {
     try {
       const response = await this.repository.resolve(file, action);

src/statusBar.ts

@@ -1,4 +1,11 @@
-import { window, StatusBarItem, Disposable, EventEmitter, Event } from "vscode";
+import {
+  window,
+  StatusBarItem,
+  Disposable,
+  EventEmitter,
+  Event,
+  Command
+} from "vscode";
 import { Repository } from "./repository";
 
 export class SvnStatusBar {
@@ -24,20 +31,41 @@ export class SvnStatusBar {
       null,
       this.disposables
     );
+    repository.onDidChangeNewsCommit(
+      this._onDidChange.fire,
+      this._onDidChange,
+      this.disposables
+    );
   }
 
-  get commands() {
-    const icon = this.repository.isSwitchingBranch ? "sync~spin" : "git-branch";
-    const title = `$(${icon}) ${this.repository.currentBranch}`;
+  get commands(): Command[] {
+    const result: Command[] = [];
 
-    return [
-      {
+    if (this.repository.currentBranch) {
+      const icon = this.repository.isSwitchingBranch
+        ? "sync~spin"
+        : "git-branch";
+      result.push({
         command: "svn.switchBranch",
         tooltip: "switch branch",
-        title,
+        title: `$(${icon}) ${this.repository.currentBranch}`,
         arguments: [this.repository]
-      }
-    ];
+      });
+    }
+
+    const icon = this.repository.isUpdatingRevision ? "sync~spin" : "sync";
+    const title =
+      this.repository.newsCommit > 0
+        ? `${this.repository.newsCommit} news commits`
+        : "Updated";
+
+    result.push({
+      command: "svn.update",
+      tooltip: "Update Revision",
+      title: `$(${icon}) ${title}`,
+      arguments: [this.repository]
+    });
+    return result;
   }
 
   dispose(): void {

src/svn.ts

@@ -254,8 +254,8 @@ export class Svn {
     return this.exec("", ["ls", "--xml", filePath]);
   }
 
-  info(path: string) {
-    return this.exec(path, ["info", "--xml"]);
+  info(path: string, revision: string = "BASE") {
+    return this.exec(path, ["info", "--xml", "-r", revision]);
   }
 
   copy(rootPath: string, branchPath: string, name: string) {

src/svnRepository.ts

@@ -2,6 +2,7 @@ import { workspace } from "vscode";
 import { Svn, CpOptions } from "./svn";
 import { IFileStatus, parseStatusXml } from "./statusParser";
 import { parseInfoXml, ISvnInfo } from "./infoParser";
+import { sequentialize } from "./decorators";
 
 export class Repository {
   private _info?: ISvnInfo;
@@ -28,6 +29,7 @@ export class Repository {
     this._info = undefined;
   }
 
+  @sequentialize
   async getInfo(): Promise<ISvnInfo> {
     if (this._info) {
       return this._info;
@@ -269,6 +271,8 @@ export class Repository {
       throw new Error(result.stderr);
     }
 
+    this.resetInfo();
+
     const message = result.stdout
       .trim()
       .split(/\r?\n/)
@@ -318,4 +322,27 @@ export class Repository {
 
     return result.stdout;
   }
+
+  async countNewsCommit(revision: string = "BASE:HEAD") {
+    const result = await this.svn.exec(this.workspaceRoot, [
+      "log",
+      "-r",
+      revision,
+      "-q",
+      "--xml"
+    ]);
+
+    if (result.exitCode !== 0) {
+      return 0;
+    }
+
+    const matches = result.stdout.match(/<logentry/g);
+
+    if (matches && matches.length > 0) {
+      // Every return current commit
+      return matches.length - 1;
+    }
+
+    return 0;
+  }
 }