Merge pull request #22 from lite3/master

add autoCloseUpdateDialog config

README.md

@@ -1,20 +1,43 @@
-sublime-TortoiseSVN
-===================
-
+Sublime-TortoiseSVN
+=============
 sublime-TortoiseSVN is a tiny and simple plugin for [Sublime Text](http://www.sublimetext.com) .
 It's behavior is similar to [subclipse](http://subclipse.tigris.org/) in [Eclipse](http://www.eclipse.org/).
 **It runs only on Windows and needs the TortoiseSVN and TortoiseSVN command line tools (TortoiseProc.exe).**
 
 Usage
------
+============
 Install it using [Sublime Package Control](http://wbond.net/sublime_packages/package_control).
 If TortoiseSVN is not installed at `C:\\Program Files\\TortoiseSVN\\bin\\TortoiseProc.exe`, specify the correct path
 by setting property "tortoiseproc_path" in your TortoiseSVN.sublime-settings file. 
 
-- [alt+c] : commit current file. 
-- [alt+u] : update current file. 
+
+The default key bindings are 
+- [alt+c] : commit current file.
+- [alt+u] : update current file.
 - [alt+r] : revert current file.
 
-Right click folder or file in SiderBar can commit/update also.
+You can also call TortoiseSVN commands when right-clicking folders or files in the side bar.
+
+
+IMPORTANT
+==============
+
+Do NOT edit the default Sublime-TortoiseSVN settings. Your changes will be lost
+when Sublime-TortoiseSVN is updated. ALWAYS edit the user Sublime-TortoiseSVN settings
+by selecting "Preferences->Package Settings->TortoiseSVN->Settings - User".
+Note that individual settings you include in your user settings will **completely**
+replace the corresponding default setting, so you must provide that setting in its entirety.
+
+Settings
+==============
+
+If your TortoiseProc.exe path is not the default, please modify the path by selecting 
+"Preferences->Package Settings->TortoiseSVN->Settings - User" in the menu.
 
+The default setting is:
 
+    {
+        // Auto close update dialog when no errors, conflicts and merges
+        "autoCloseUpdateDialog": false,
+        "tortoiseproc_path": "C:\\Program Files\\TortoiseSVN\\bin\\TortoiseProc.exe"
+    }

TortoiseSVN.py

@@ -19,7 +19,7 @@ def run(self, cmd, paths=None, isHung=False):
 				' please config setting file', '\n   --sublime-TortoiseSVN']))
 			raise
 
-		proce = subprocess.Popen('"' + tortoiseproc_path + '"' + ' /closeonend:3' + 
+		proce = subprocess.Popen('"' + tortoiseproc_path + '"' + 
 			' /command:' + cmd + ' /path:"%s"' % dir , stdout=subprocess.PIPE)
 
 		# This is required, cause of ST must wait TortoiseSVN update then revert
@@ -58,7 +58,9 @@ def revertPoint(self):
 
 class SvnUpdateCommand(MutatingTortoiseSvnCommand):
 	def run(self, paths=None):
-		MutatingTortoiseSvnCommand.run(self, 'update', paths)
+		settings = sublime.load_settings('TortoiseSVN.sublime-settings')
+		closeonend = '3' if True == settings.get('autoCloseUpdateDialog') else '0'
+		MutatingTortoiseSvnCommand.run(self, 'update /closeonend:'+closeonend, paths)
 
 
 class SvnCommitCommand(TortoiseSvnCommand):

TortoiseSVN.sublime-settings

@@ -1,3 +1,5 @@
 {
+	// Auto close update dialog when no errors, conflicts and merges
+	"autoCloseUpdateDialog": false,
 	"tortoiseproc_path": "C:\\Program Files\\TortoiseSVN\\bin\\TortoiseProc.exe"
 }

messages.json

@@ -2,5 +2,6 @@
     "install": "messages/install.txt",
     "1.2.0": "messages/1.2.0.txt",
     "1.3.0": "messages/1.3.0.txt",
-    "1.3.1": "messages/1.3.1.txt"
+    "1.3.1": "messages/1.3.1.txt",
+    "1.3.2": "messages/1.3.2.txt"
 }

messages/1.3.2.txt

@@ -0,0 +1,5 @@
+Sublime-TortoiseSVN 1.3.2 changelog
+=============================
+
+- Add: config:autoCloseUpdateDialog, default false.
+    Auto close update dialog when no errors, conflicts and merges

messages/install.txt

@@ -37,5 +37,7 @@ If your TortoiseProc.exe path is not the default, please modify the path by sele
 The default setting is:
 
 	{
-		"tortoiseproc_path": "C:\\Program Files\\TortoiseSVN\\bin\\TortoiseProc.exe"
-	}
+        // Auto close update dialog when no errors, conflicts and merges
+        "autoCloseUpdateDialog": false,
+        "tortoiseproc_path": "C:\\Program Files\\TortoiseSVN\\bin\\TortoiseProc.exe"
+    }