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

update: cleanup UI codes #2

Changeset f8277a149004…

Parent bba95a137eb2…

by Yuki KODAMA

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

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​update.py Stacked
 
87
88
89
90
91
92
 
93
94
95
96
97
 
 
98
99
100
101
 
102
103
104
105
106
107
108
109
 
 
 
110
111
112
 
 
113
114
115
 
202
203
204
205
 
206
207
208
 
209
210
211
212
213
 
214
215
216
 
217
218
219
 
220
221
222
 
87
88
89
 
 
 
90
91
92
 
 
 
93
94
95
96
 
 
97
98
99
100
101
 
 
 
 
102
103
104
105
 
 
106
107
108
109
110
 
197
198
199
 
200
201
202
 
203
204
205
206
207
 
208
209
210
 
211
212
213
 
214
215
216
217
@@ -87,29 +87,24 @@
  label.set_selectable(True)   label.set_line_wrap(True)   label.set_size_request(350, -1) - hb = gtk.HBox() - hb.pack_start(label, False, False) - return hb, label + return label     ## summary of target revision - hb, label = new_label() - table.add_row(_('Target:'), hb) - self.new_rev_label = label + self.target_label = new_label() + table.add_row(_('Target:'), self.target_label)     ## summary of parent 1 revision - hb, label = new_label() - self.current_rev_label1 = label + self.parent1_label = new_label()     ## summary of parent 2 revision if needs   self.ctxs = self.repo[None].parents()   if len(self.ctxs) == 2: - table.add_row(_('Parent 1:'), hb) - hb, label = new_label() - table.add_row(_('Parent 2:'), hb) - self.current_rev_label2 = label + table.add_row(_('Parent 1:'), self.parent1_label) + self.parent2_label = new_label() + table.add_row(_('Parent 2:'), self.parent2_label)   else: - table.add_row(_('Parent:'), hb) - self.current_rev_label2 = None + table.add_row(_('Parent:'), self.parent1_label) + self.parent2_label = None     # signal handlers   self.revcombo.connect('changed', lambda b: self.update_summaries()) @@ -202,21 +197,21 @@
  label.set_markup(t)     ctxs = self.ctxs - setlabel(self.current_rev_label1, ctxs[0]) + setlabel(self.parent1_label, ctxs[0])   merge = len(ctxs) == 2   if merge: - setlabel(self.current_rev_label2, ctxs[1]) + setlabel(self.parent2_label, ctxs[1])   newrev = self.revcombo.get_active_text()   try:   new_ctx = self.repo[newrev]   if not merge and new_ctx.rev() == ctxs[0].rev(): - self.new_rev_label.set_label(_('(same as parent)')) + self.target_label.set_label(_('(same as parent)'))   self.updatebtn.set_sensitive(self.opt_clean.get_active())   else: - setlabel(self.new_rev_label, self.repo[newrev]) + setlabel(self.target_label, self.repo[newrev])   self.updatebtn.set_sensitive(True)   except (LookupError, RepoLookupError, RepoError): - self.new_rev_label.set_label(_('unknown revision!')) + self.target_label.set_label(_('unknown revision!'))   self.updatebtn.set_sensitive(False)     def update(self):