Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

thgpbranch: Enable pmerge --all

Changeset 2df4fd60320e…

Parent 1b2721ab8332…

by Peer Sommerlund

Changes to one file · Browse files at 2df4fd60320e Showing diff from parent 1b2721ab8332 Diff from another changeset...

Change 1 of 6 Show Entire File tortoisehg/​hgtk/​thgpbranch.py Stacked
 
12
13
14
 
15
16
17
 
88
89
90
91
 
92
93
94
 
198
199
200
 
 
 
 
 
201
202
203
 
401
402
403
404
 
405
406
 
 
407
408
 
 
 
 
 
 
 
 
409
410
411
 
581
582
583
 
 
 
 
 
 
 
 
 
 
 
 
584
585
586
 
645
646
647
648
 
649
650
651
 
12
13
14
15
16
17
18
 
89
90
91
 
92
93
94
95
 
199
200
201
202
203
204
205
206
207
208
209
 
407
408
409
 
410
411
412
413
414
415
 
416
417
418
419
420
421
422
423
424
425
426
 
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
 
672
673
674
 
675
676
677
678
@@ -12,6 +12,7 @@
   from tortoisehg.util.i18n import _   +from tortoisehg.hgtk import hgcmd  from tortoisehg.hgtk import update  from tortoisehg.hgtk import gtklib, dialog  from tortoisehg.hgtk.logview import graphcell @@ -88,7 +89,7 @@
  ## buttons   self.btn = {}   pmergebtn = tbar.append_stock(gtk.STOCK_CONVERT, - _('Merge pending dependencies')) + _('Merge all pending dependencies'))   pmergebtn.connect('clicked', self.pmerge_clicked)   self.btn['pmerge'] = pmergebtn   @@ -198,6 +199,11 @@
    pane.add(self.list)   + ## command widget + self.cmd = hgcmd.CmdWidget(style=hgcmd.STYLE_COMPACT, + tooltips=tooltips) + mainbox.pack_start(self.cmd, False, False) +   # accelerator   if accelgroup:   # TODO @@ -401,11 +407,20 @@
  self.emit('repo-invalidated')   return True   - def pmerge(self): + def pmerge(self, patch_name=None):   """   [pbranch] Execute 'pmerge' command. + + :param patch_name: Merge to this patch-branch   """ - assert False + if not self.has_patch(): + return + cmdline = ['hg', 'pmerge'] + if patch_name: + cmdline += [patch_name] + else: + cmdline += ['--all'] + self.cmd.execute(cmdline, self.cmd_done)     def pbackout(self):   """ @@ -581,6 +596,18 @@
  if not oldparents == newparents:   self.emit('repo-invalidated')   + def cmd_done(self, returncode, useraborted, noemit=False): + if returncode == 0: + if self.cmd.get_pbar(): + self.cmd.set_result(_('Succeed'), style='ok') + elif useraborted: + self.cmd.set_result(_('Canceled'), style='error') + else: + self.cmd.set_result(_('Failed'), style='error') + self.refresh() + if not noemit: + self.emit('repo-invalidated') +   def do_get_property(self, property):   try:   return self.vmenu[property.name].get_active() @@ -645,7 +672,7 @@
  pass     def pmerge_clicked(self, toolbutton): - pass + self.pmerge()     def pnew_clicked(self, toolbutton):   self.pnew_ui()