Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset f372b674f9d4…

Parents c4cae234f498…

Parents 6de640f3f5a1…

by Yuki KODAMA

Changes to 4 files · Browse files at f372b674f9d4 Showing diff from parent c4cae234f498 6de640f3f5a1 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgtk/​commit.py Stacked
 
658
659
660
661
 
 
 
 
 
662
663
664
 
658
659
660
 
661
662
663
664
665
666
667
668
@@ -658,7 +658,11 @@
    def get_head_info(self):   def ishead(ctx): - return len(ctx.children()) == 0 + for cctx in ctx.children(): + if cctx.branch() == ctx.branch(): + return False + else: + return True   if self.mqmode:   ctxs = self.repo['.'].parents()   else:
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​logview/​graphcell.py Stacked
 
162
163
164
 
 
165
166
167
 
162
163
164
165
166
167
168
169
@@ -162,6 +162,8 @@
  start, end, colour, style)     # Draw the revision node in the right column + if not self.node: + return   (column, colour, status) = self.node   arc_start_position_x = cell_area.x + box_size * column + box_size / 2;   arc_start_position_y = cell_area.y + cell_area.height / 2;
Change 1 of 1 Show Entire File tortoisehg/​hgtk/​thgconfig.py Stacked
 
1071
1072
1073
1074
 
1075
1076
1077
 
1071
1072
1073
 
1074
1075
1076
1077
@@ -1071,7 +1071,7 @@
  layout.add_row(defaultradio)   layout.add_row(presetradio, presetcombo)   vbox = gtk.VBox() - vbox.pack_start(customradio, False, False) + vbox.pack_start(customradio, False, False, 4)   vbox.pack_start(gtk.VBox())   layout.add_row(vbox, table, yhopt=gtk.FILL|gtk.EXPAND)  
Change 1 of 2 Show Entire File tortoisehg/​hgtk/​update.py Stacked
 
65
66
67
 
 
 
 
 
 
 
 
68
69
70
 
71
72
73
 
75
76
77
78
 
79
80
 
81
82
 
83
84
85
 
65
66
67
68
69
70
71
72
73
74
75
76
77
 
78
79
80
81
 
83
84
85
 
86
87
 
88
89
 
90
91
92
93
@@ -65,9 +65,17 @@
  ' %(tags)s', '\n%(summary)s'), selectable=True, width=350)   factory = csinfo.factory(self.repo, style=style)   + def add_with_pad(title, cslabel): + label = gtk.Label(title) + label.set_alignment(1, 0) + headbox = gtk.VBox() + headbox.pack_start(label, False, False, 2) + headbox.pack_start(gtk.VBox()) + table.add_row(headbox, cslabel, yhopt=gtk.FILL|gtk.EXPAND) +   ## summary of target revision   self.target_label = factory() - table.add_row(_('Target:'), self.target_label) + add_with_pad(_('Target:'), self.target_label)     ## summary of parent 1 revision   self.parent1_label = factory() @@ -75,11 +83,11 @@
  ## summary of parent 2 revision if needs   self.ctxs = self.repo[None].parents()   if len(self.ctxs) == 2: - table.add_row(_('Parent 1:'), self.parent1_label) + add_with_pad(_('Parent 1:'), self.parent1_label)   self.parent2_label = factory() - table.add_row(_('Parent 2:'), self.parent2_label) + add_with_pad(_('Parent 2:'), self.parent2_label)   else: - table.add_row(_('Parent:'), self.parent1_label) + add_with_pad(_('Parent:'), self.parent1_label)   self.parent2_label = None     ## option expander