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

stable Merge with stable

Changeset b398d3431385…

Parents a673bfbfc502…

Parents b66a4e123a0f…

by Yuki KODAMA

Changes to 20 files · Browse files at b398d3431385 Showing diff from parent a673bfbfc502 b66a4e123a0f Diff from another changeset...

Show Entire File i18n/​tortoisehg/​ca.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​cs.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​da.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​es.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​he.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​it.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ja.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ko.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ru.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​uk.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_CN.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_TW.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 7 Show Entire File tortoisehg/​hgtk/​changeset.py Stacked
 
47
48
49
50
 
51
52
53
 
86
87
88
89
90
91
92
93
94
95
96
97
 
 
 
 
98
99
100
 
397
398
399
 
 
 
 
400
401
402
 
405
406
407
 
 
408
409
410
 
525
526
527
 
 
 
 
528
529
530
531
532
 
 
 
 
 
 
533
534
535
 
599
600
601
602
 
603
604
605
 
 
 
606
607
608
 
702
703
704
705
706
707
 
 
708
709
710
 
47
48
49
 
50
51
52
53
 
86
87
88
 
 
 
 
 
89
90
91
92
93
94
95
96
97
98
99
 
396
397
398
399
400
401
402
403
404
405
 
408
409
410
411
412
413
414
415
 
530
531
532
533
534
535
536
537
538
539
540
 
541
542
543
544
545
546
547
548
549
 
613
614
615
 
616
617
618
 
619
620
621
622
623
624
 
718
719
720
 
 
 
721
722
723
724
725
@@ -47,7 +47,7 @@
  def prepare_display(self):   self.currow = None   self.graphview = None - self.glog_parent = NoneY + self.glog_parent = None   node0, node1 = cmdutil.revpair(self.repo, self.opts.get('rev'))   self.load_details(self.repo.changelog.rev(node0))   @@ -86,15 +86,14 @@
  if not ctx:   return   - if not self.parent_button.parent: - self.parent_box.pack_start(gtk.HSeparator(), False, False) - self.parent_box.pack_start(self.parent_button, False, False) - self.parent_box.show_all() -   parents = ctx.parents()   title = self.get_title()   if parents:   if len(parents) == 2: + if not self.parent_button.parent: + self.parent_box.pack_start(gtk.HSeparator(), False, False) + self.parent_box.pack_start(self.parent_button, False, False) + self.parent_box.show_all()   self.parent_box.show()   if self.diff_other_parent():   title += ':' + str(parents[1].rev()) @@ -397,6 +396,10 @@
  return menu     def get_body(self): + embedded = bool(self.stbar) + use_expander = embedded and self.ui.configbool( + 'tortoisehg', 'changeset-expander') +   self.curfile = ''   if self.repo.ui.configbool('tortoisehg', 'copyhash'):   sel = (os.name == 'nt') and 'CLIPBOARD' or 'PRIMARY' @@ -405,6 +408,8 @@
  self.clipboard = None   self.filemenu = self.file_context_menu()   + details_frame_parent = gtk.VBox() +   # changeset frame   details_frame = gtk.Frame()   details_frame.set_shadow_type(gtk.SHADOW_ETCHED_IN) @@ -525,11 +530,20 @@
  self.patchstyle = csinfo.panelstyle(contents=('patch', 'branch',   'user', 'dateage', 'parents'),   selectable=True) + if use_expander: + self.csetstyle['expander'] = True + self.patchstyle['expander'] = True +   self.summarypanel = csinfo.create(self.repo, custom=custom)     ## summary box (summarypanel + separator)   self.summarybox = gtk.VBox() - details_box.pack_start(self.summarybox, False, False) + if use_expander: + # don't scroll summarybox + details_frame_parent.pack_start(self.summarybox, False, False) + else: + # scroll summarybox + details_box.pack_start(self.summarybox, False, False)   self.summarybox.pack_start(self.summarypanel, False, False)   self.summarybox.pack_start(gtk.HSeparator(), False, False)   @@ -599,10 +613,12 @@
    self._hpaned = gtk.HPaned()   self._hpaned.pack1(list_frame, True, True) - self._hpaned.pack2(details_frame, True, True) + self._hpaned.pack2(details_frame_parent, True, True)   self._hpaned.set_position(self._setting_hpos)   - if self.stbar: + details_frame_parent.pack_start(details_frame, True, True) + + if embedded:   # embedded by changelog browser   return self._hpaned   else: @@ -702,9 +718,8 @@
  opts = {'change':str(self.currev), 'bundle':self.bfile}   self._do_diff([self.curfile], opts)   - def file_row_act(self, tree, path, column) : - 'Default action is the first entry in the context menu' - self.filemenu.get_children()[0].activate() + def file_row_act(self, tree, path, column): + self.diff_file_rev(None)   return True     def save_file_rev(self, menuitem):
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​csinfo.py Stacked
 
467
468
469
470
 
471
472
473
 
467
468
469
 
470
471
472
473
@@ -467,7 +467,7 @@
  self.csstyle = style     self.expander = gtk.Expander() - self.expander.set_expanded(True) + self.expander.set_expanded(False)     # layout table for contents   self.table = gtklib.LayoutTable(ypad=1, headopts={'weight': 'bold'})
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​history.py Stacked
 
1902
1903
1904
1905
1906
 
1907
1908
1909
 
1902
1903
1904
 
 
1905
1906
1907
1908
@@ -1902,8 +1902,7 @@
  return True     def tree_row_act(self, tree, path, column) : - 'Default action is the first entry in the context menu' - self.tree_context_menu().get_children()[0].activate() + self.vdiff_change(None)   return True    def run(ui, *pats, **opts):