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

history: respect post-pull choice when pulling from a bundle

Changeset f1d930944bce…

Parent 282b12d3a286…

by Steve Borho

Changes to one file · Browse files at f1d930944bce Showing diff from parent 282b12d3a286 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
748
749
750
751
752
753
754
 
775
776
777
 
 
778
779
780
 
890
891
892
893
 
894
895
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
896
897
898
899
900
 
901
902
903
 
904
905
 
906
907
908
909
910
 
 
911
912
913
 
748
749
750
 
751
752
753
 
774
775
776
777
778
779
780
781
 
891
892
893
 
894
895
 
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
 
918
919
920
 
921
922
 
923
924
925
926
927
928
929
930
931
932
933
@@ -748,7 +748,6 @@
  if alias == 'default':   urlcombo.set_active(len(urllist)-1)   - incoming.connect('clicked', self.incoming_clicked, urlcombo)   outgoing.connect('clicked', self.outgoing_clicked, urlcombo, stop)   push.connect('clicked', self.push_clicked, urlcombo)   conf.connect('clicked', self.conf_clicked, urlcombo) @@ -775,6 +774,8 @@
  in enumerate(ppulldata) if name == 'none'][0]   ppullcombo.set_active(pos)   + incoming.connect('clicked', self.incoming_clicked, urlcombo, + ppullcombo, ppulldata)   pull.connect('clicked', self.pull_clicked, urlcombo, ppullcombo,   ppulldata)   syncbox.append_widget(ppullcombo) @@ -890,24 +891,43 @@
  def get_extras(self):   return self.stbar   - def incoming_clicked(self, toolbutton, combo): + def incoming_clicked(self, toolbutton, combo, ppullcombo, ppulldata):   def apply_clicked(button, bfile): - cmdline = ['hg', 'pull', bfile] + sel = ppullcombo.get_active_text() + ppull = [name for (name, label) in ppulldata if sel == label][0] + dorebase = False + if ppull == 'fetch': + cmd = ['fetch', '--message', 'merge'] + # load the fetch extension explicitly + extensions.load(self.ui, 'fetch', None) + else: + cmd = ['pull'] + if ppull == 'update': + cmd.append('--update') + elif ppull == 'rebase': + dorebase = True + cmd.append('--rebase') + # load the rebase extension explicitly + extensions.load(self.ui, 'rebase', None) + + cmdline = ['hg'] + cmd + [bfile]   dlg = hgcmd.CmdDialog(cmdline)   dlg.show_all()   dlg.run()   dlg.hide() - remove_overlay() + remove_overlay(dorebase)     def reject_clicked(button): - remove_overlay() + remove_overlay(False)   - def remove_overlay(): + def remove_overlay(resettip):   self.bfile = None   combo.get_child().set_text('')   self.repo = hg.repository(self.ui, path=self.repo.root)   self.graphview.set_repo(self.repo, self.stbar)   self.changeview.repo = self.repo + if resettip: + self.origtip = len(self.repo)   self.reload_log()   self.toolbar.remove(self.toolbar.get_nth_item(0))   self.toolbar.remove(self.toolbar.get_nth_item(0))