Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

thgmq: support folding multiple patches

Changeset 54d1b90d1ce6…

Parent 5851e8cc51f6…

by Yuki KODAMA

Changes to one file · Browse files at 54d1b90d1ce6 Showing diff from parent 5851e8cc51f6 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​thgmq.py Stacked
 
418
419
420
421
 
422
423
424
425
426
 
 
 
 
 
 
 
 
 
427
428
 
 
 
 
429
430
431
 
432
433
434
 
418
419
420
 
421
422
423
424
 
 
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
 
442
443
444
445
@@ -418,17 +418,28 @@
  """   [MQ] Execute 'qfold' command.   - patch: the patch name or an index to specify the patch. + patch: a patch name or an index number, or its list.   """   if not patch or not self.has_applied():   return - data = dict(target=patch, qtip=self.get_qtip_patchname()) - ret = gdialog.Confirm(_('Confirm Fold'), [], None, + if isinstance(patch, (basestring, int, long)): + patch = [patch] + unapplied = [p for p in patch if not self.is_applied(p)] + if not unapplied: + return + data = dict(qtip=self.get_qtip_patchname()) + if len(unapplied) == 1: + data.update(target=unapplied[0]) + ret = gdialog.Confirm(_('Confirm Fold'), [], None,   _("Do you want to fold un-applied patch '%(target)s'"   " into current patch '%(qtip)s'?") % data).run() + else: + ret = gdialog.Confirm(_('Confirm Fold'), unapplied, None, + _("Do you want to fold following un-applied patches" + " into the current patch '%(qtip)s'?") % data).run()   if ret != gtk.RESPONSE_YES:   return - cmdline = ['hg', 'qfold', patch] + cmdline = ['hg', 'qfold'] + unapplied   self.cmd.execute(cmdline, self.cmd_done)     def qmove(self, patch, op):