1. Yuya Nishihara
  2. thg-qt-mq

Commits

Yuya Nishihara  committed 9f7ffce

fix

  • Participants
  • Parent commits 8c8b824
  • Branches default

Comments (0)

Files changed (1)

File 15119.diff

View file
  • Ignore whitespace
 # Date 1377338027 -32400
 #      Sat Aug 24 18:53:47 2013 +0900
 # Node ID 4d0796024aea4d648b230b0730a2da911db4bab1
-# Parent  c3b6264dba25e4053d67e4c32e985369e55a1abf
+# Parent c3b6264dba25e4053d67e4c32e985369e55a1abf
 qdelete: run Mercurial command by using RepoAgent
 
 - busycount and output signal are managed by RepoAgent
 diff --git a/tortoisehg/hgqt/qdelete.py b/tortoisehg/hgqt/qdelete.py
 --- a/tortoisehg/hgqt/qdelete.py
 +++ b/tortoisehg/hgqt/qdelete.py
-@@ -14,7 +14,6 @@ from tortoisehg.hgqt.i18n import _
- from tortoisehg.hgqt import cmdui
+@@ -11,10 +11,8 @@ from PyQt4.QtGui import *
+ from tortoisehg.util import hglib
+ from tortoisehg.hgqt import qtlib
+ from tortoisehg.hgqt.i18n import _
+-from tortoisehg.hgqt import cmdui
  
  class QDeleteDialog(QDialog):
 -    output = pyqtSignal(QString, QString)
      makeLogVisible = pyqtSignal(bool)
  
      def __init__(self, repoagent, patches, parent):
-@@ -38,10 +37,6 @@ class QDeleteDialog(QDialog):
+@@ -38,10 +36,6 @@ class QDeleteDialog(QDialog):
          self.keepchk.setChecked(True)
          self.layout().addWidget(self.keepchk)
  
          BB = QDialogButtonBox
          bbox = QDialogButtonBox(BB.Ok|BB.Cancel)
          bbox.accepted.connect(self.accept)
-@@ -49,20 +44,16 @@ class QDeleteDialog(QDialog):
+@@ -49,20 +43,16 @@ class QDeleteDialog(QDialog):
          self.layout().addWidget(bbox)
          self.bbox = bbox