--- a/mercurial/HGRepository.st	Sat Mar 09 20:02:01 2013 +0100
+++ b/mercurial/HGRepository.st	Sat Mar 09 22:29:37 2013 +0000
@@ -54,12 +54,18 @@
 initialize
     "Invoked at system start or when the class is dynamically loaded."
 
-    "/ please change as required (and remove this comment)
+    | useCommandServer |
 
     Cache := CacheDictionary new: 8.
-    UseCommandServer := false.
 
-    "Modified: / 03-03-2013 / 22:57:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    useCommandServer := OperatingSystem getEnvironment: 'STX_LIBSCM_MERCURIAL_USE_COMMAND_SERVER'.
+    useCommandServer isNil ifTrue:[
+        UseCommandServer := false.  
+    ] ifFalse:[
+        UseCommandServer := (useCommandServer ~= 0) not.
+    ]
+
+    "Modified: / 09-03-2013 / 22:21:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HGRepository class methodsFor:'instance creation'!