Merge branch 'master' of github.com:JohnstonCode/svn-scm

Author: JohnstonCode

README.md

@@ -92,11 +92,11 @@ Example:
 |`svn.path`|Path to the svn executable|`null`|
 |`svn.ignoreMissingSvnWarning`|Ignores the warning when SVN is missing|`false`|
 |`svn.diff.withHead`|Show diff changes using latest revision in the repository. Set false to use latest revision in local folder|`true`|
-|`svn.layout.trunkRegex`|Regex to detect path for 'trunk' in SVN URL, 'null' to disable. (Ex.: '(trunk)', '(main)')|`"(trunk)"`|
+|`svn.layout.trunkRegex`|Regex to detect path for 'trunk' in SVN URL, 'null' to disable. (Ex.: '(trunk)', '(main)')|`"(trunk)(/.*)?"`|
 |`svn.layout.trunkRegexName`|Regex group position for name of trunk|`1`|
-|`svn.layout.branchesRegex`|Regex to detect path for 'branches' in SVN URL, 'null' to disable. Subpath use 'branches/.\*/(.\*)' (Ex.: 'branches/.\*/(.\*)', 'versions/(.\*)')|`"branches/(.*)"`|
+|`svn.layout.branchesRegex`|Regex to detect path for 'branches' in SVN URL, 'null' to disable. Subpath use 'branches/[^/]+/([^/]+)(/.\*)?' (Ex.: 'branches/...', 'versions/...')|`"branches/([^/]+)(/.*)?"`|
 |`svn.layout.branchesRegexName`|Regex group position for name of branch|`1`|
-|`svn.layout.tagsRegex`|Regex to detect path for 'tags' in SVN URL, 'null' to disable. Subpath use 'tags/.\*/(.\*)'. (Ex.: 'tags/(.\*)', 'stamps/(.\*)')|`"tags/(.*)"`|
+|`svn.layout.tagsRegex`|Regex to detect path for 'tags' in SVN URL, 'null' to disable. Subpath use 'tags/[^/]+/([^/]+)(/.\*)?'. (Ex.: 'tags/...', 'stamps/...')|`"tags/([^/]+)(/.*)?"`|
 |`svn.layout.tagRegexName`|Regex group position for name of tag|`1`|
 |`svn.layout.showFullName`|Set true to show 'branches/\<name\>' and false to show only '\<name\>'|`true`|
 |`svn.multipleFolders.enabled`|Allow to find subfolders using SVN|`false`|
@@ -111,3 +111,4 @@ Example:
 |`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`|
 |`svn.default.encoding`|Encoding of svn output if the output is not utf-8. When this parameter is null, the encoding is automatically detected. Example: 'windows-1252'.|`null`|
+|`svn.showUpdateMessage`|Show the update message when update is run|`true`|

package.json

@@ -502,7 +502,7 @@
             "null"
           ],
           "description": "Regex to detect path for 'trunk' in SVN URL, 'null' to disable. (Ex.: '(trunk)', '(main)')",
-          "default": "(trunk)"
+          "default": "(trunk)(/.*)?"
         },
         "svn.layout.trunkRegexName": {
           "type": [
@@ -516,8 +516,8 @@
             "string",
             "null"
           ],
-          "description": "Regex to detect path for 'branches' in SVN URL, 'null' to disable. Subpath use 'branches/.*/(.*)' (Ex.: 'branches/.*/(.*)', 'versions/(.*)')",
-          "default": "branches/(.*)"
+          "description": "Regex to detect path for 'branches' in SVN URL, 'null' to disable. Subpath use 'branches/[^/]+/([^/]+)(/.*)?' (Ex.: 'branches/...', 'versions/...')",
+          "default": "branches/([^/]+)(/.*)?"
         },
         "svn.layout.branchesRegexName": {
           "type": [
@@ -531,8 +531,8 @@
             "string",
             "null"
           ],
-          "description": "Regex to detect path for 'tags' in SVN URL, 'null' to disable. Subpath use 'tags/.*/(.*)'. (Ex.: 'tags/(.*)', 'stamps/(.*)')",
-          "default": "tags/(.*)"
+          "description": "Regex to detect path for 'tags' in SVN URL, 'null' to disable. Subpath use 'tags/[^/]+/([^/]+)(/.*)?'. (Ex.: 'tags/...', 'stamps/...')",
+          "default": "tags/([^/]+)(/.*)?"
         },
         "svn.layout.tagRegexName": {
           "type": [