Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

stable commit: manually run addremove when refreshing a patch

Fixes #495

Changeset d8238f918d71…

Parent 4ac54ef7d2e4…

by Steve Borho

Changes to one file · Browse files at d8238f918d71 Showing diff from parent 4ac54ef7d2e4 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​commit.py Stacked
 
558
559
560
561
562
563
564
565
566
567
568
569
570
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
571
572
573
 
672
673
674
675
 
676
677
678
 
558
559
560
 
 
 
 
 
 
 
 
 
 
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
 
677
678
679
 
680
681
682
683
@@ -558,16 +558,21 @@
  def should_addremove(self, files):   if self.test_opt('addremove'):   return True - else: - response = gdialog.Confirm(_('Confirm Add/Remove'), - files, self,_('Add/Remove the following files?')).run() - if response == gtk.RESPONSE_YES: - # This will stay set for further commits (meaning no - # more prompts). Problem? - self.opts['addremove'] = True - return True - return False - + response = gdialog.Confirm(_('Confirm Add/Remove'), + files, self,_('Add/Remove the following files?')).run() + if response != gtk.RESPONSE_YES: + return False + # This will stay set for further commits (meaning no more + # prompts). Problem? + self.opts['addremove'] = True + if self.qnew or self.qheader is not None: + cmdline = ['hg', 'addremove', '--verbose'] + cmdline += [self.repo.wjoin(x) for x in files] + dialog = hgcmd.CmdDialog(cmdline, True) + dialog.set_transient_for(self) + dialog.run() + dialog.hide() + return True     def ready_message(self):   buf = self.text.get_buffer() @@ -672,7 +677,7 @@
  cmdline.append('--force')   elif self.qheader is not None:   cmdline[1] = 'qrefresh' - if self.opts['addremove']: + elif self.opts['addremove']:   cmdline += ['--addremove']   if self.opts['user']:   cmdline.extend(['--user', self.opts['user']])