Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Wed Apr 28 15:41:48 2010 +0000
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Wed Apr 28 17:17:09 2010 +0000
@@ -78,7 +78,7 @@
         
         self.__messageRole = Qt.UserRole
         self.__changesRole = Qt.UserRole + 1
-        self.__edgesRole   = Qt.UserRole + 2
+        self.__edgesRole   = Qt.UserRole + 2
         self.__parentsRole = Qt.UserRole + 3
         
         self.process = QProcess()
@@ -291,15 +291,16 @@
         
         process = QProcess()
         args = []
-        args.append("parents")
-        if self.commandMode == "incoming" and self.vcs.bundleFile:
-            args.append("--repository")
+        args.append("parents")
+        if self.commandMode == "incoming" and self.vcs.bundleFile:
+            args.append("--repository")
             args.append(self.vcs.bundleFile)
         args.append("--template")
         args.append("{rev}\n")
         args.append("-r")
         args.append(rev)
-        args.append(self.filename)
+        if not self.projectMode:
+            args.append(self.filename)
         
         process.setWorkingDirectory(self.repodir)
         process.start('hg', args)
@@ -370,7 +371,7 @@
         
         itm.setData(0, self.__messageRole, message)
         itm.setData(0, self.__changesRole, changedPaths)
-        itm.setData(0, self.__edgesRole, edges)
+        itm.setData(0, self.__edgesRole, edges)
         itm.setData(0, self.__parentsRole, parents)
         
         if self.logTree.topLevelItemCount() > 1:
@@ -721,7 +722,7 @@
                     change["action"], change["path"], change["copyfrom"])
             self.__resizeColumnsFiles()
             self.__resortFiles()
-        
+        
         parents = current.data(0, self.__parentsRole)
         self.diffP1Button.setEnabled(len(parents) > 0)
         self.diffP2Button.setEnabled(len(parents) > 1)
@@ -744,16 +745,16 @@
             self.diffP1Button.setEnabled(False)
             return
         rev2 = int(itm.text(self.RevisionColumn).split(":")[0])
-        
-        rev1 = itm.data(0, self.__parentsRole)[0]
-        if rev1 < 0:
+        
+        rev1 = itm.data(0, self.__parentsRole)[0]
+        if rev1 < 0:
             self.diffP1Button.setEnabled(False)
             return
         
         self.__diffRevisions(rev1, rev2)
     
     @pyqtSlot()
-    def on_diffP2_clicked(self):
+    def on_diffP2Button_clicked(self):
         """
         Private slot to handle the Diff to Parent 2 button.
         """
@@ -762,9 +763,9 @@
             self.diffP2Button.setEnabled(False)
             return
         rev2 = int(itm.text(self.RevisionColumn).split(":")[0])
-        
-        rev1 = itm.data(0, self.__parentsRole)[1]
-        if rev1 < 0:
+        
+        rev1 = itm.data(0, self.__parentsRole)[1]
+        if rev1 < 0:
             self.diffP2Button.setEnabled(False)
             return