Commits

Yuya Nishihara committed 767f738

resolve: run commands by RepoAgent

Comments (0)

Files changed (1)

tortoisehg/hgqt/resolve.py

 
         out = qtlib.LabeledSeparator(_('Command output'))
         self.layout().addWidget(out)
-        self.cmd = cmdui.Widget(True, False, self)
-        self.cmd.commandFinished.connect(self.refresh)
-        self.cmd.setShowOutput(True)
-        self.layout().addWidget(self.cmd)
+        self._cmdlog = cmdui.LogWidget(self)
+        self.layout().addWidget(self._cmdlog)
 
         BB = QDialogButtonBox
         bbox = QDialogButtonBox(BB.Close)
             for root, wfile in selected:
                 if root == curroot:
                     cmd.append(os.path.normpath(os.path.join(root, wfile)))
-            cmdlines.append(cmd)
+            cmdlines.append(map(hglib.tounicode, cmd))
             selected = [(r, w) for r, w in selected if r != curroot]
         if cmdlines:
-            self.cmd.run(*cmdlines)
+            sess = self._repoagent.runCommandSequence(cmdlines, self)
+            sess.commandFinished.connect(self.refresh)
+            sess.outputReceived.connect(self._cmdlog.appendLog)
 
     def merge(self, tool=False):
         if not tool: