Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1.4, 1.1.5, and 1.1.6

stable "Force" option when pushing and popping MQ patches

Changeset 53bc2c29f684…

Parent 6833e4301163…

by Niels Kühnel

Changes to one file · Browse files at 53bc2c29f684 Showing diff from parent 6833e4301163 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​thgmq.py Stacked
 
70
71
72
 
 
 
 
 
73
74
75
 
321
322
323
 
 
 
 
324
325
326
 
334
335
336
 
 
 
 
337
338
339
 
860
861
862
 
 
 
 
 
863
864
865
 
70
71
72
73
74
75
76
77
78
79
80
 
326
327
328
329
330
331
332
333
334
335
 
343
344
345
346
347
348
349
350
351
352
 
873
874
875
876
877
878
879
880
881
882
883
@@ -70,6 +70,11 @@
  'ShowQParent',   "Show 'qparent'",   False, + gobject.PARAM_READWRITE), + 'force-pushpop': (gobject.TYPE_BOOLEAN, + 'ForcePushPop', + "Force", + False,   gobject.PARAM_READWRITE)   }   @@ -321,6 +326,10 @@
  if not self.is_operable():   return   cmdline = ['hg', 'qpop'] + + if self.get_property('force-pushpop'): + cmdline.append('-f') +   if all:   cmdline.append('--all')   self.cmd.execute(cmdline, self.cmd_done) @@ -334,6 +343,10 @@
  if not self.is_operable():   return   cmdline = ['hg', 'qpush'] + + if self.get_property('force-pushpop'): + cmdline.append('-f') +   if all:   cmdline.append('--all')   self.cmd.execute(cmdline, self.cmd_done) @@ -860,6 +873,11 @@
  ascheck=True, check=True)   self.vmenu['show-qparent'] = item   + item = m.append(_("Force"), lambda item: self.refresh(), + ascheck=True, check=False) + self.vmenu['force-pushpop'] = item + +   menu = m.build()   menu.show_all()   return menu