Merge pull request #124 from edgardmessias/improved_status_parser

Improved statusParser

Author: JohnstonCode

src/repository.ts

@@ -20,7 +20,7 @@ import * as path from "path";
 import * as micromatch from "micromatch";
 import { setInterval, clearInterval } from "timers";
 import { toSvnUri } from "./uri";
-import { Status } from "./svn";
+import { Status, PropStatus } from "./svn";
 
 export class Repository {
   public watcher: FileSystemWatcher;
@@ -188,10 +188,15 @@ export class Repository {
         ? Uri.file(path.join(this.workspaceRoot, status.rename))
         : undefined;
 
-      if (status.status === Status.UNVERSIONED) {
-        unversioned.push(new Resource(uri, status.status, renameUri));
+      const resouce = new Resource(uri, status.status, renameUri, status.props);
+
+      if (status.status === Status.NORMAL && status.props === PropStatus.NONE) {
+        // On commit, `svn status` return all locked files with status="normal" and props="none"
+        return;
+      } else if (status.status === Status.UNVERSIONED) {
+        unversioned.push(resouce);
       } else if (status.status === Status.EXTERNAL) {
-        external.push(new Resource(uri, status.status, renameUri));
+        external.push(resouce);
       } else {
         if (status.status === Status.UNVERSIONED) {
           const matches = status.path.match(
@@ -209,13 +214,13 @@ export class Repository {
         }
 
         if (!status.changelist) {
-          changes.push(new Resource(uri, status.status, renameUri));
+          changes.push(resouce);
         } else {
           let changelist = changelists.get(status.changelist);
           if (!changelist) {
             changelist = [];
           }
-          changelist.push(new Resource(uri, status.status, renameUri));
+          changelist.push(resouce);
           changelists.set(status.changelist, changelist);
         }
       }

src/resource.ts

@@ -6,7 +6,7 @@ import {
   Command
 } from "vscode";
 import * as path from "path";
-import { Status } from "./svn";
+import { Status, PropStatus } from "./svn";
 import { memoize } from "./decorators";
 
 const iconsRootPath = path.join(__dirname, "..", "icons");
@@ -44,7 +44,8 @@ export class Resource implements SourceControlResourceState {
   constructor(
     private _resourceUri: Uri,
     private _type: String,
-    private _renameResourceUri?: Uri
+    private _renameResourceUri?: Uri,
+    private _props?: String
   ) {}
 
   @memoize
@@ -58,6 +59,9 @@ export class Resource implements SourceControlResourceState {
   get renameResourceUri(): Uri | undefined {
     return this._renameResourceUri;
   }
+  get props(): String | undefined {
+    return this._props;
+  }
 
   get decorations(): SourceControlResourceDecorations {
     const light = { iconPath: this.getIconPath("light") };
@@ -97,6 +101,16 @@ export class Resource implements SourceControlResourceState {
       return "Renamed from " + this.renameResourceUri.fsPath;
     }
 
+    if (
+      this.type === Status.NORMAL &&
+      this.props &&
+      this.props !== PropStatus.NONE
+    ) {
+      return (
+        "Property " + this.props.charAt(0).toUpperCase() + this.props.slice(1)
+      );
+    }
+
     return this.type.charAt(0).toUpperCase() + this.type.slice(1);
   }
 

src/statusParser.ts

@@ -2,6 +2,7 @@ import * as xml2js from "xml2js";
 
 export interface IFileStatus {
   status: string;
+  props: string;
   path: string;
   changelist?: string;
   rename?: string;
@@ -14,27 +15,20 @@ export interface IFileStatus {
 }
 
 export interface IEntry {
-  $: {
-    path: string;
-  };
-  "wc-status": {
-    $: {
-      item: string;
-      revision: string;
-      props: string;
-      "moved-to"?: string;
-      "moved-from"?: string;
-    };
+  path: string;
+  wcStatus: {
+    item: string;
+    revision: string;
+    props: string;
+    movedTo?: string;
+    movedFrom?: string;
+    wcLocked?: string;
     commit: {
-      $: {
-        revision: string;
-      };
+      revision: string;
       author: string;
       date: string;
     };
   };
-  path: string;
-  rename?: string;
 }
 
 function processEntry(
@@ -54,21 +48,22 @@ function processEntry(
 
   let r: IFileStatus = {
     changelist: changelist,
-    path: entry["$"].path,
-    status: entry["wc-status"].$.item
+    path: entry.path,
+    status: entry.wcStatus.item,
+    props: entry.wcStatus.props
   };
 
-  if (entry["wc-status"].$["moved-to"] && r.status === "deleted") {
+  if (entry.wcStatus.movedTo && r.status === "deleted") {
     return [];
   }
-  if (entry["wc-status"].$["moved-from"] && r.status === "added") {
-    r.rename = entry["wc-status"].$["moved-from"];
+  if (entry.wcStatus.movedFrom && r.status === "added") {
+    r.rename = entry.wcStatus.movedFrom;
   }
-  if (entry["wc-status"].commit) {
+  if (entry.wcStatus.commit) {
     r.commit = {
-      revision: entry["wc-status"].commit.$.revision,
-      author: entry["wc-status"].commit.author,
-      date: entry["wc-status"].commit.date
+      revision: entry.wcStatus.commit.revision,
+      author: entry.wcStatus.commit.author,
+      date: entry.wcStatus.commit.date
     };
   }
 
@@ -87,20 +82,31 @@ function xmlToStatus(xml: any) {
     }
 
     xml.changelist.forEach((change: any) => {
-      statusList.push(...processEntry(change.entry, change.$.name));
+      statusList.push(...processEntry(change.entry, change.name));
     });
   }
 
   return statusList;
 }
 
+function camelcase(name: string) {
+  return name
+    .replace(/(?:^\w|[A-Z]|\b\w)/g, function(letter, index) {
+      return index == 0 ? letter.toLowerCase() : letter.toUpperCase();
+    })
+    .replace(/[\s\-]+/g, "");
+}
+
 export async function parseStatusXml(content: string): Promise<IFileStatus[]> {
   return new Promise<IFileStatus[]>((resolve, reject) => {
     xml2js.parseString(
       content,
       {
+        mergeAttrs: true,
         explicitRoot: false,
-        explicitArray: false
+        explicitArray: false,
+        attrNameProcessors: [camelcase],
+        tagNameProcessors: [camelcase]
       },
       (err, result) => {
         if (err) {

src/svn.ts

@@ -25,6 +25,13 @@ export enum Status {
   UNVERSIONED = "unversioned"
 }
 
+export enum PropStatus {
+  CONFLICTED = "conflicted",
+  MODIFIED = "modified",
+  NONE = "none",
+  NORMAL = "normal"
+}
+
 export interface CpOptions {
   cwd?: string;
   encoding?: string;