Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

p4pending: use cmdui.Runner(), pipe output back to workbench

Changeset eb570f78ac51…

Parent 47dd3d34d544…

by Steve Borho

Changes to 2 files · Browse files at eb570f78ac51 Showing diff from parent 47dd3d34d544 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​p4pending.py Stacked
 
19
20
21
 
 
 
 
 
22
23
24
 
33
34
35
36
 
37
 
 
38
39
40
 
85
86
87
 
88
89
90
 
96
97
98
 
99
100
101
 
102
103
104
 
19
20
21
22
23
24
25
26
27
28
29
 
38
39
40
 
41
42
43
44
45
46
47
 
92
93
94
95
96
97
98
 
104
105
106
107
108
109
110
111
112
113
114
@@ -19,6 +19,11 @@
   class PerforcePending(QDialog):   'Dialog for selecting a revision' + + output = pyqtSignal(QString, QString) + makeLogVisible = pyqtSignal(bool) + showMessage = pyqtSignal(unicode) +   def __init__(self, repo, pending, parent):   QDialog.__init__(self, parent)   self.repo = repo @@ -33,8 +38,10 @@
  self.cslist = cslist.ChangesetList()   layout.addWidget(self.cslist)   - self.cmd = cmdui.Widget() + self.cmd = cmdui.Runner(self)   self.cmd.commandFinished.connect(self.commandFinished) + self.cmd.output.connect(self.output) + self.cmd.makeLogVisible.connect(self.makeLogVisible)   self.cmd.setVisible(False)   layout.addWidget(self.cmd)   @@ -85,6 +92,7 @@
  self.cmd.show_output(True)   self.bb.button(QDialogButtonBox.Ok).setEnabled(False)   self.bb.button(QDialogButtonBox.Discard).setEnabled(False) + self.showMessage.emit(_('Submitting p4 changelist...'))   self.cmd.run(cmdline)     def revert(self): @@ -96,9 +104,11 @@
  self.cmd.show_output(True)   self.bb.button(QDialogButtonBox.Ok).setEnabled(False)   self.bb.button(QDialogButtonBox.Discard).setEnabled(False) + self.showMessage.emit(_('Reverting p4 changelist...'))   self.cmd.run(cmdline)     def commandFinished(self, ret): + self.showMessage.emit('')   self.repo.decrementBusyCount()   self.bb.button(QDialogButtonBox.Ok).setEnabled(True)   self.bb.button(QDialogButtonBox.Discard).setEnabled(True)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
561
562
563
 
 
 
564
565
566
 
561
562
563
564
565
566
567
568
569
@@ -561,6 +561,9 @@
  if pending:   from tortoisehg.hgqt.p4pending import PerforcePending   dlg = PerforcePending(self.repo, pending, self) + dlg.showMessage.connect(self.showMessage) + dlg.output.connect(self.output) + dlg.makeLogVisible.connect(self.makeLogVisible)   dlg.exec_()   self.finishfunc = finished   self.run(['--repository', self.root, 'p4pending', '--verbose'], ())