Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun Apr 18 10:52:29 2010 +0000
+++ b/Documentation/Help/source.qhp	Sun Apr 18 14:20:04 2010 +0000
@@ -7973,6 +7973,7 @@
       <keyword name="HgLogBrowserDialog.__generateLogItem" id="HgLogBrowserDialog.__generateLogItem" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__generateLogItem" />
       <keyword name="HgLogBrowserDialog.__getColor" id="HgLogBrowserDialog.__getColor" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getColor" />
       <keyword name="HgLogBrowserDialog.__getLogEntries" id="HgLogBrowserDialog.__getLogEntries" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getLogEntries" />
+      <keyword name="HgLogBrowserDialog.__getParents" id="HgLogBrowserDialog.__getParents" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__getParents" />
       <keyword name="HgLogBrowserDialog.__procFinished" id="HgLogBrowserDialog.__procFinished" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__procFinished" />
       <keyword name="HgLogBrowserDialog.__processBuffer" id="HgLogBrowserDialog.__processBuffer" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__processBuffer" />
       <keyword name="HgLogBrowserDialog.__readStderr" id="HgLogBrowserDialog.__readStderr" ref="eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html#HgLogBrowserDialog.__readStderr" />

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html	Sun Apr 18 10:52:29 2010 +0000
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html	Sun Apr 18 14:20:04 2010 +0000
@@ -87,6 +87,9 @@
 <td><a href="#HgLogBrowserDialog.__getLogEntries">__getLogEntries</a></td>
 <td>Private method to retrieve log entries from the repository.</td>
 </tr><tr>
+<td><a href="#HgLogBrowserDialog.__getParents">__getParents</a></td>
+<td>Private method to get the parents of the currently viewed file/directory.</td>
+</tr><tr>
 <td><a href="#HgLogBrowserDialog.__procFinished">__procFinished</a></td>
 <td>Private slot connected to the finished signal.</td>
 </tr><tr>
@@ -351,6 +354,21 @@
 <dd>
 revision number to start from (integer, string)
 </dd>
+</dl><a NAME="HgLogBrowserDialog.__getParents" ID="HgLogBrowserDialog.__getParents"></a>
+<h4>HgLogBrowserDialog.__getParents</h4>
+<b>__getParents</b>(<i>rev</i>)
+<p>
+        Private method to get the parents of the currently viewed file/directory.
+</p><dl>
+<dt><i>rev</i></dt>
+<dd>
+revision number to get parents for (string)
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+list of parent revisions (list of integers)
+</dd>
 </dl><a NAME="HgLogBrowserDialog.__procFinished" ID="HgLogBrowserDialog.__procFinished"></a>
 <h4>HgLogBrowserDialog.__procFinished</h4>
 <b>__procFinished</b>(<i>exitCode, exitStatus</i>)

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Apr 18 10:52:29 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Sun Apr 18 14:20:04 2010 +0000
@@ -57,9 +57,9 @@
         
         self.vcs = vcs
         if mode in ("log", "incoming", "outgoing"):
-            self.mode = mode
+            self.commandMode = mode
         else:
-            self.mode = "log"
+            self.commandMode = "log"
         
         self.__maxDate = QDate()
         self.__minDate = QDate()
@@ -96,6 +96,7 @@
         self.diff = None
         self.__started = False
         self.__lastRev = 0
+        self.projectMode = False
         
         # attributes to store log graph data
         self.__revs = []
@@ -205,7 +206,8 @@
         
         # add edges to the graph
         edges = []
-        if rev:
+##        if rev and parents[0] != -1:
+        if parents[0] != -1:
             for ecol, erev in enumerate(self.__revs):
                 if erev in next:
                     edges.append((ecol, next.index(erev), self.__revColors[erev]))
@@ -278,6 +280,49 @@
         painter.end()
         return QIcon(pix)
     
+    def __getParents(self, rev):
+        """
+        Private method to get the parents of the currently viewed file/directory.
+        
+        @param rev revision number to get parents for (string)
+        @return list of parent revisions (list of integers)
+        """
+        errMsg = ""
+        parents = [-1]
+        
+        process = QProcess()
+        args = []
+        args.append("parents")
+        args.append("--template")
+        args.append("{rev}\n")
+        args.append("-r")
+        args.append(rev)
+        args.append(self.filename)
+        
+        process.setWorkingDirectory(self.repodir)
+        process.start('hg', args)
+        procStarted = process.waitForStarted()
+        if procStarted:
+            finished = process.waitForFinished(30000)
+            if finished and process.exitCode() == 0:
+                output = \
+                    str(process.readAllStandardOutput(), 
+                        Preferences.getSystem("IOEncoding"), 
+                        'replace')
+                parents = [int(p) for p in output.strip().splitlines()]
+            else:
+                if not finished:
+                    errMsg = self.trUtf8("The hg process did not finish within 30s.")
+        else:
+            errMsg = self.trUtf8("Could not start the hg executable.")
+        
+        if errMsg:
+            QMessageBox.critical(self,
+                self.trUtf8("Mercurial Error"),
+                errMsg)
+        
+        return parents
+    
     def __generateLogItem(self, author, date, message, revision, changedPaths, parents, 
                           branches, tags):
         """
@@ -315,23 +360,24 @@
         itm.setForeground(self.BranchColumn, 
                           QBrush(QColor(self.__branchColor(branches[0]))))
         
+        if not self.projectMode:
+            parents = self.__getParents(rev)
         column, color, edges = self.__generateEdges(int(rev), parents)
         
         itm.setData(0, self.__messageRole, message)
         itm.setData(0, self.__changesRole, changedPaths)
         itm.setData(0, self.__edgesRole, edges)
         
-        if self.fname == "." and self.dname == self.repodir:
-            if self.logTree.topLevelItemCount() > 1:
-                topedges = \
-                    self.logTree.topLevelItem(self.logTree.indexOfTopLevelItem(itm) - 1)\
-                    .data(0, self.__edgesRole)
-            else:
-                topedges = None
-            
-            icon = self.__generateIcon(column, color, edges, topedges, 
-                                       QColor(self.__branchColor(branches[0])))
-            itm.setIcon(0, icon)
+        if self.logTree.topLevelItemCount() > 1:
+            topedges = \
+                self.logTree.topLevelItem(self.logTree.indexOfTopLevelItem(itm) - 1)\
+                .data(0, self.__edgesRole)
+        else:
+            topedges = None
+        
+        icon = self.__generateIcon(column, color, edges, topedges, 
+                                   QColor(self.__branchColor(branches[0])))
+        itm.setIcon(0, icon)
         
         try:
             self.__lastRev = int(revision.split(":")[0])
@@ -379,18 +425,20 @@
         self.inputGroup.show()
         
         args = []
-        args.append(self.mode)
+        args.append(self.commandMode)
         self.vcs.addArguments(args, self.vcs.options['global'])
         self.vcs.addArguments(args, self.vcs.options['log'])
         args.append('--verbose')
         args.append('--limit')
         args.append(str(self.limitSpinBox.value()))
-        if self.mode in ("incoming", "outgoing"):
+        if self.commandMode in ("incoming", "outgoing"):
             args.append("--newest-first")
         if startRev is not None:
             args.append('--rev')
             args.append('{0}:0'.format(startRev))
-        if not self.stopCheckBox.isChecked():
+        if not self.projectMode and \
+           not self.fname == "." and \
+           not self.stopCheckBox.isChecked():
             args.append('--follow')
         args.append('--template')
         args.append("change|{rev}:{node|short}\n"
@@ -404,7 +452,7 @@
                     "branches|{branches}\n"
                     "tags|{tags}\n"
                     "@@@\n")
-        if self.fname != "." or self.dname != self.repodir:
+        if not self.projectMode:
             args.append(self.filename)
         
         self.process.setWorkingDirectory(self.repodir)
@@ -439,6 +487,8 @@
             if self.repodir == os.sep:
                 return
         
+        self.projectMode = (self.fname == "." and self.dname == self.repodir)
+        self.stopCheckBox.setDisabled(self.projectMode or self.fname == ".")
         self.activateWindow()
         self.raise_()
         

--- a/changelog	Sun Apr 18 10:52:29 2010 +0000
+++ b/changelog	Sun Apr 18 14:20:04 2010 +0000
@@ -1,5 +1,8 @@
 Change Log
 ----------
+Version 5.0-snapshot-2010mmdd:
+- bug fixes
+
 Version 5.0-snapshot-20100418:
 - bug fixes
 - added plugin for Mercurial version control system

--- a/i18n/eric5_cs.ts	Sun Apr 18 10:52:29 2010 +0000
+++ b/i18n/eric5_cs.ts	Sun Apr 18 14:20:04 2010 +0000
@@ -14720,12 +14720,12 @@
         <translation type="unfinished">Vybrat pole pro filtrování</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="748"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/>
         <source>Revision</source>
         <translation type="unfinished">Revize</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="745"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/>
         <source>Author</source>
         <translation type="unfinished">Autor</translation>
     </message>
@@ -14885,15 +14885,30 @@
         <translation type="unfinished">Změněno</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Chyba v procesu generování</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/>
+        <source>The hg process did not finish within 30s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <source>Could not start the hg executable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
+        <source>Mercurial Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HgLogDialog</name>

Binary file i18n/eric5_de.qm has changed

--- a/i18n/eric5_de.ts	Sun Apr 18 10:52:29 2010 +0000
+++ b/i18n/eric5_de.ts	Sun Apr 18 14:20:04 2010 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="de">
+<!DOCTYPE TS>
+<TS version="2.0" language="de">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -1549,7 +1550,7 @@
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/>
-        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
+        <source>Open in New &amp;Tab	Ctrl+LMB</source>
         <translation>In neuem &amp;Register öffnen\tStrg+LMK</translation>
     </message>
     <message>
@@ -1600,7 +1601,7 @@
     </message>
     <message>
         <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="72"/>
-        <source>Open in New &amp;Tab<byte value="x9"/>Ctrl+LMB</source>
+        <source>Open in New &amp;Tab	Ctrl+LMB</source>
         <translation>In neuem &amp;Register öffnen\tStrg+LMK</translation>
     </message>
 </context>
@@ -11041,7 +11042,7 @@
     </message>
     <message>
         <location filename="Helpviewer/HelpBrowserWV.py" line="568"/>
-        <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source>
+        <source>Open Link in New Tab	Ctrl+LMB</source>
         <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation>
     </message>
     <message>
@@ -13783,12 +13784,12 @@
         <translation>Wähle das als Filter zu verwendende Feld</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="748"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/>
         <source>Revision</source>
         <translation>Revision</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="745"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/>
         <source>Author</source>
         <translation>Autor</translation>
     </message>
@@ -13948,15 +13949,30 @@
         <translation>Modifiziert</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>Process Generation Error</source>
         <translation>Fehler beim Prozessstart</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation>
     </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/>
+        <source>The hg process did not finish within 30s.</source>
+        <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <source>Could not start the hg executable.</source>
+        <translation>Das hg Programm konnte nicht gestartet werden.</translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
+        <source>Mercurial Error</source>
+        <translation>Mercurial Fehler</translation>
+    </message>
 </context>
 <context>
     <name>HgLogDialog</name>

--- a/i18n/eric5_es.ts	Sun Apr 18 10:52:29 2010 +0000
+++ b/i18n/eric5_es.ts	Sun Apr 18 14:20:04 2010 +0000
@@ -13801,12 +13801,12 @@
         <translation type="unfinished">Seleccione el campo de filtrado</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="748"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/>
         <source>Revision</source>
         <translation type="unfinished">Revisión</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="745"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/>
         <source>Author</source>
         <translation type="unfinished">Autor</translation>
     </message>
@@ -13956,12 +13956,12 @@
         <translation type="unfinished">Modificado</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Error de Generación de Proceso</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation>
     </message>
@@ -13975,6 +13975,21 @@
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/>
+        <source>The hg process did not finish within 30s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <source>Could not start the hg executable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
+        <source>Mercurial Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HgLogDialog</name>

--- a/i18n/eric5_fr.ts	Sun Apr 18 10:52:29 2010 +0000
+++ b/i18n/eric5_fr.ts	Sun Apr 18 14:20:04 2010 +0000
@@ -15096,12 +15096,12 @@
         <translation type="unfinished">Sélectionner le champ à filtrer</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="748"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/>
         <source>Revision</source>
         <translation type="unfinished">Révision</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="745"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/>
         <source>Author</source>
         <translation type="unfinished">Auteur</translation>
     </message>
@@ -15261,15 +15261,30 @@
         <translation type="unfinished">Modifié</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Erreur du processus</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/>
+        <source>The hg process did not finish within 30s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <source>Could not start the hg executable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
+        <source>Mercurial Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HgLogDialog</name>

--- a/i18n/eric5_it.ts	Sun Apr 18 10:52:29 2010 +0000
+++ b/i18n/eric5_it.ts	Sun Apr 18 14:20:04 2010 +0000
@@ -14761,12 +14761,12 @@
         <translation type="unfinished">Seleziona il campo su cui filtrare</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="748"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/>
         <source>Revision</source>
         <translation type="unfinished">Revisione</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="745"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/>
         <source>Author</source>
         <translation type="unfinished">Autore</translation>
     </message>
@@ -14926,15 +14926,30 @@
         <translation type="unfinished">Modificato</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Errore Generazione Processo</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/>
+        <source>The hg process did not finish within 30s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <source>Could not start the hg executable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
+        <source>Mercurial Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HgLogDialog</name>

--- a/i18n/eric5_ru.ts	Sun Apr 18 10:52:29 2010 +0000
+++ b/i18n/eric5_ru.ts	Sun Apr 18 14:20:04 2010 +0000
@@ -14343,12 +14343,12 @@
         <translation type="unfinished">Задайте поле, по которому фильтровать</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="748"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/>
         <source>Revision</source>
         <translation type="unfinished">Версия (ревизия)</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="745"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/>
         <source>Author</source>
         <translation type="unfinished">Автор</translation>
     </message>
@@ -14498,12 +14498,12 @@
         <translation type="unfinished">Изменено</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">Ошибка процесса генерации</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14517,6 +14517,21 @@
         <source>Tags</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/>
+        <source>The hg process did not finish within 30s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <source>Could not start the hg executable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
+        <source>Mercurial Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HgLogDialog</name>

--- a/i18n/eric5_tr.ts	Sun Apr 18 10:52:29 2010 +0000
+++ b/i18n/eric5_tr.ts	Sun Apr 18 14:20:04 2010 +0000
@@ -15027,12 +15027,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="748"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/>
         <source>Revision</source>
         <translation type="unfinished">Gözden Geçirme</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="745"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/>
         <source>Author</source>
         <translation type="unfinished">Yazar</translation>
     </message>
@@ -15192,15 +15192,30 @@
         <translation type="unfinished">Değiştirildi</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">İşlem Üretecinde Hata</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/>
+        <source>The hg process did not finish within 30s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <source>Could not start the hg executable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
+        <source>Mercurial Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HgLogDialog</name>

--- a/i18n/eric5_zh_CN.GB2312.ts	Sun Apr 18 10:52:29 2010 +0000
+++ b/i18n/eric5_zh_CN.GB2312.ts	Sun Apr 18 14:20:04 2010 +0000
@@ -15068,12 +15068,12 @@
         <translation type="unfinished">选择要过滤的区域</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="748"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/>
         <source>Revision</source>
         <translation type="unfinished">修订</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="745"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/>
         <source>Author</source>
         <translation type="unfinished">作者</translation>
     </message>
@@ -15233,15 +15233,30 @@
         <translation type="unfinished">已修改</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>Process Generation Error</source>
         <translation type="unfinished">进程生成错误</translation>
     </message>
     <message>
-        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/>
         <source>The process {0} could not be started. Ensure, that it is in the search path.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/>
+        <source>The hg process did not finish within 30s.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/>
+        <source>Could not start the hg executable.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/>
+        <source>Mercurial Error</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HgLogDialog</name>