Commits

Yuya Nishihara committed 9c9538f

cmdcore: rename worker's abort() used along with startCommand/isCommandRunning

  • Participants
  • Parent commits 44a881a

Comments (0)

Files changed (2)

tortoisehg/hgqt/cmdcore.py

         fullcmdline.extend(cmdline)
         self._proc.start(fullcmdline[0], fullcmdline[1:], QIODevice.ReadOnly)
 
-    def abort(self):
+    def abortCommand(self):
         if not self.isCommandRunning():
             return
         _interruptproc(self._proc)
     def abort(self):
         '''Cancel running Mercurial command'''
         if self.isRunning():
-            self._worker.abort()
+            self._worker.abortCommand()
             self._qnextp = len(self._queue)
             self._abortbyuser = True
         elif not self.isFinished():

tortoisehg/hgqt/thread.py

             self.cmdline[0:0] = ['--cwd', self._cwd]
         self.start()
 
-    def abort(self):
+    def abortCommand(self):
         if self.isCommandRunning() and hasattr(self, 'thread_id'):
             try:
                 thread2._async_raise(self.thread_id, KeyboardInterrupt)