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: use csinfo label

Changeset 4ba7abd63761…

Parent 8962c1a0cc39…

by Yuki KODAMA

Changes to one file · Browse files at 4ba7abd63761 Showing diff from parent 8962c1a0cc39 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgtk/​update.py Stacked
 
16
17
18
19
 
20
21
22
 
82
83
84
85
86
87
88
89
90
 
 
 
91
92
93
 
94
95
96
97
 
98
99
100
 
101
102
103
 
104
105
106
 
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
 
201
202
203
 
204
205
206
 
208
209
210
211
 
212
213
214
 
16
17
18
 
19
20
21
22
 
82
83
84
 
 
 
 
 
 
85
86
87
88
89
 
90
91
92
93
 
94
95
96
 
97
98
99
 
100
101
102
103
 
169
170
171
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
172
 
173
174
175
 
176
177
178
179
 
181
182
183
 
184
185
186
187
@@ -16,7 +16,7 @@
 from tortoisehg.util import hglib, paths  from tortoisehg.util.hglib import LookupError, RepoLookupError, RepoError   -from tortoisehg.hgtk import hgcmd, gtklib, gdialog +from tortoisehg.hgtk import csinfo, gtklib, gdialog, hgcmd    MODE_NORMAL = 'normal'  MODE_WORKING = 'working' @@ -82,25 +82,22 @@
  combo.append_text(t)     ## changeset summaries - def new_label(): - label = gtk.Label('-') - label.set_selectable(True) - label.set_line_wrap(True) - label.set_size_request(350, -1) - return label + style = csinfo.labelstyle(contents=('%(rev)s', ' %(branch)s', + ' %(tags)s', '\n%(summary)s'), selectable=True, width=350) + createinfo = csinfo.factory(style=style, repo=repo)     ## summary of target revision - self.target_label = new_label() + self.target_label = createinfo('tip')   table.add_row(_('Target:'), self.target_label)     ## summary of parent 1 revision - self.parent1_label = new_label() + self.parent1_label = createinfo('tip')     ## summary of parent 2 revision if needs - self.ctxs = self.repo[None].parents() + self.ctxs = repo[None].parents()   if len(self.ctxs) == 2:   table.add_row(_('Parent 1:'), self.parent1_label) - self.parent2_label = new_label() + self.parent2_label = createinfo('tip')   table.add_row(_('Parent 2:'), self.parent2_label)   else:   table.add_row(_('Parent:'), self.parent1_label) @@ -172,35 +169,11 @@
  self.abortbtn.set_property('visible', working)     def update_summaries(self): - def setlabel(label, ctx): - revision = str(ctx.rev()) - hash = str(ctx) - summary = gtklib.markup_escape_text(hglib.toutf( - ctx.description().split('\n')[0])) - face = 'monospace' - size = '9000' - - format = '<span face="%s" size="%s">%s (%s)\n</span>' - t = format % (face, size, revision, hash) - - branch = ctx.branch() - if branch != 'default': - format = '<span color="%s" background="%s"> %s </span> ' - t += format % ('black', '#aaffaa', branch) - - tags = self.repo.nodetags(ctx.node()) - format = '<span color="%s" background="%s"> %s </span> ' - for tag in tags: - t += format % ('black', '#ffffaa', tag) - - t += summary - label.set_markup(t) -   ctxs = self.ctxs - setlabel(self.parent1_label, ctxs[0]) + self.parent1_label.update(ctxs[0])   merge = len(ctxs) == 2   if merge: - setlabel(self.parent2_label, ctxs[1]) + self.parent2_label.update(ctxs[1])   newrev = self.revcombo.get_active_text()   try:   new_ctx = self.repo[newrev] @@ -208,7 +181,7 @@
  self.target_label.set_label(_('(same as parent)'))   self.updatebtn.set_sensitive(self.opt_clean.get_active())   else: - setlabel(self.target_label, self.repo[newrev]) + self.target_label.update(self.repo[newrev])   self.updatebtn.set_sensitive(True)   except (LookupError, RepoLookupError, RepoError):   self.target_label.set_label(_('unknown revision!'))