Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py
- changeset 207
- 3f889378dede
- parent 204
- 61552f56788a
- child 208
- 26ed553ad4fb
equal
deleted
inserted
replaced
| 206:e24ba21c6d3a | 207:3f889378dede |
|---|---|
| 11 | 11 |
| 12 from PyQt4.QtCore import pyqtSlot, SIGNAL, Qt, QDate, QProcess, QTimer, QRegExp, QSize | 12 from PyQt4.QtCore import pyqtSlot, SIGNAL, Qt, QDate, QProcess, QTimer, QRegExp, QSize |
| 13 from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, \ | 13 from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, \ |
| 14 QApplication, QMessageBox, QCursor, QWidget, QLineEdit, QColor, QPixmap, \ | 14 QApplication, QMessageBox, QCursor, QWidget, QLineEdit, QColor, QPixmap, \ |
| 15 QPainter, QPen, QBrush, QIcon | 15 QPainter, QPen, QBrush, QIcon |
| 16 | |
| 17 from E5Gui.E5Application import e5App | |
| 16 | 18 |
| 17 from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog | 19 from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog |
| 18 from .HgDiffDialog import HgDiffDialog | 20 from .HgDiffDialog import HgDiffDialog |
| 19 | 21 |
| 20 import UI.PixmapCache | 22 import UI.PixmapCache |
| 443 args.append('--follow') | 445 args.append('--follow') |
| 444 if self.commandMode == "log": | 446 if self.commandMode == "log": |
| 445 args.append('--copies') | 447 args.append('--copies') |
| 446 args.append('--style') | 448 args.append('--style') |
| 447 args.append(os.path.join(os.path.dirname(__file__), "styles", "logBrowser.style")) | 449 args.append(os.path.join(os.path.dirname(__file__), "styles", "logBrowser.style")) |
| 450 if self.commandMode == "incoming": | |
| 451 project = e5App().getObject("Project") | |
| 452 self.vcs.bundleFile = os.path.join( | |
| 453 project.getProjectManagementDir(), "hg-bundle.hg") | |
| 454 args.append('--bundle') | |
| 455 args.append(self.vcs.bundleFile) | |
| 448 if not self.projectMode: | 456 if not self.projectMode: |
| 449 args.append(self.filename) | 457 args.append(self.filename) |
| 450 | 458 |
| 451 self.process.setWorkingDirectory(self.repodir) | 459 self.process.setWorkingDirectory(self.repodir) |
| 452 | 460 |
