Merge pull request #226 from edgardmessias/ignore_externals

Added option to ignore externals on update (Close #210)

Author: JohnstonCode

README.md

@@ -109,3 +109,4 @@ Example:
 |`svn.log.length`|Number of commit messages to log|`50`|
 |`svn.showOutput`|Show the output window when the extension starts|`false`|
 |`svn.conflicts.autoResolve`|Set file to status resolved after fix conflictss|`false`|
+|`svn.update.ignoreExternals`|Set to ignore externals definitions on update (add --ignore-externals)|`true`|

package.json

@@ -596,6 +596,11 @@
           "type": "boolean",
           "description": "Set file to status resolved after fix conflictss",
           "default": false
+        },
+        "svn.update.ignoreExternals": {
+          "type": "boolean",
+          "description": "Set to ignore externals definitions on update (add --ignore-externals)",
+          "default": true
         }
       }
     }

src/commands.ts

@@ -132,7 +132,7 @@ export class SvnCommands implements IDisposable {
       value: repository.username
     });
 
-    if(username === undefined) {
+    if (username === undefined) {
       return false;
     }
 
@@ -142,7 +142,7 @@ export class SvnCommands implements IDisposable {
       password: true
     });
 
-    if(username === undefined) {
+    if (username === undefined) {
       return false;
     }
 
@@ -685,7 +685,12 @@ export class SvnCommands implements IDisposable {
   @command("svn.update", { repository: true })
   async update(repository: Repository) {
     try {
-      const result = await repository.updateRevision();
+      const ignoreExternals = configuration.get<boolean>(
+        "ignoreExternals",
+        false
+      );
+
+      const result = await repository.updateRevision(ignoreExternals);
       window.showInformationMessage(result);
     } catch (error) {
       console.error(error);

src/repository.ts

@@ -638,9 +638,9 @@ export class Repository {
     });
   }
 
-  async updateRevision(): Promise<string> {
+  async updateRevision(ignoreExternals: boolean = false): Promise<string> {
     return await this.run<string>(Operation.Update, async () => {
-      const response = await this.repository.update();
+      const response = await this.repository.update(ignoreExternals);
       this.updateNewCommits();
       return response;
     });

src/svnRepository.ts

@@ -294,8 +294,14 @@ export class Repository {
     return result.stdout;
   }
 
-  async update(): Promise<string> {
-    const result = await this.exec(["update"]);
+  async update(ignoreExternals: boolean = true): Promise<string> {
+    const args = ["update"];
+
+    if (ignoreExternals) {
+      args.push("--ignore-externals");
+    }
+
+    const result = await this.exec(args);
 
     this.resetInfo();