Merged remote changes.

Sun, 13 Jun 2010 15:46:12 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 13 Jun 2010 15:46:12 +0200
changeset 348
01246ad582c3
parent 347
0b1a7a38f8e9 (diff)
parent 345
abe576eec80d (current diff)
child 350
db40effc5c65

Merged remote changes.

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Jun 13 14:38:21 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Jun 13 15:46:12 2010 +0200
@@ -1057,7 +1057,10 @@
             if finished and process.exitCode() == 0:
                 output = str(process.readAllStandardOutput(), 
                     Preferences.getSystem("IOEncoding"), 'replace')
-                url = output.splitlines()[0].strip()
+                if output:
+                    url = output.splitlines()[0].strip()
+                else:
+                    url = ""
         
         return QApplication.translate('mercurial',
             """<h3>Repository information</h3>\n"""
@@ -1522,6 +1525,12 @@
                 return
         
         cfgFile = os.path.join(repodir, self.adminDir, "hgrc")
+        if not os.path.exists(cfgFile):
+            try:
+                cfg = open(cfgFile, "w")
+                cfg.close()
+            except IOError:
+                pass
         self.editor = MiniEditor(cfgFile, "Properties")
         self.editor.show()
     

eric ide

mercurial