Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.5, 2.1, and 2.1.1

stable qimport: fix broken multiple revision qimport

To fix this problem runCommand has been added support for running multiple
commands in a row.

Changeset d0fbbfcb07db…

Parent 5aa22dcac84b…

by Angel Ezquerra

Changes to one file · Browse files at d0fbbfcb07db Showing diff from parent 5aa22dcac84b Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
1418
1419
1420
 
1421
1422
 
1423
1424
1425
 
 
1426
1427
1428
 
1458
1459
1460
1461
 
1462
1463
1464
1465
1466
1467
 
 
1418
1419
1420
1421
1422
 
1423
1424
 
 
1425
1426
1427
1428
1429
 
1459
1460
1461
 
1462
1463
1464
1465
1466
1467
 
1468
@@ -1418,11 +1418,12 @@
  for rev in revList:   patchNames[rev] = getUniquePatchName(str(rev))   + cmdlines = []   for rev in revList: - cmdline = ['qimport', '--rev', '%s' % rev, + cmdlines.append(['qimport', '--rev', '%s' % rev,   '--repository', self.repo.root, - '--name', patchNames[rev]] - self.runCommand(cmdline) + '--name', patchNames[rev]]) + self.runCommand(*cmdlines)   else:   # There were no collisions with existing patch names, we can   # simply qimport the whole revision set in a single go @@ -1458,10 +1459,10 @@
  def onCommandFinished(self, ret):   self.repo.decrementBusyCount()   - def runCommand(self, cmdline): + def runCommand(self, *cmdlines):   if self.runner.core.running():   InfoMsgBox(_('Unable to start'),   _('Previous command is still running'))   return   self.repo.incrementBusyCount() - self.runner.run(cmdline) + self.runner.run(*cmdlines)