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: remove dorebase variable

Changeset e14521f6d3e9…

Parent f1d930944bce…

by Steve Borho

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

Change 1 of 6 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
895
896
897
898
899
900
901
 
905
906
907
908
909
910
911
 
915
916
917
918
 
919
920
921
 
996
997
998
999
1000
1001
1002
 
1006
1007
1008
1009
1010
1011
1012
 
1018
1019
1020
1021
 
1022
1023
1024
 
895
896
897
 
898
899
900
 
904
905
906
 
907
908
909
 
913
914
915
 
916
917
918
919
 
994
995
996
 
997
998
999
 
1003
1004
1005
 
1006
1007
1008
 
1014
1015
1016
 
1017
1018
1019
1020
@@ -895,7 +895,6 @@
  def apply_clicked(button, 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 @@ -905,7 +904,6 @@
  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) @@ -915,7 +913,7 @@
  dlg.show_all()   dlg.run()   dlg.hide() - remove_overlay(dorebase) + remove_overlay('--rebase' in cmd)     def reject_clicked(button):   remove_overlay(False) @@ -996,7 +994,6 @@
  def pull_clicked(self, toolbutton, combo, ppullcombo, ppulldata):   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 @@ -1006,7 +1003,6 @@
  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) @@ -1018,7 +1014,7 @@
  dlg.hide()   if dlg.return_code() == 0:   self.repo.invalidate() - if dorebase: + if '--rebase' in cmd:   self.origtip = len(self.repo)   self.reload_log()   elif len(self.repo) > self.origtip: