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

csinfo: simplify ChangesetInfo.get_data() method

Changeset 136e346259ef…

Parent 8271b27fea38…

by Yuki KODAMA

Changes to one file · Browse files at 136e346259ef Showing diff from parent 8271b27fea38 Diff from another changeset...

Change 1 of 8 Show Entire File tortoisehg/​hgtk/​csinfo.py Stacked
 
119
120
121
122
 
 
123
124
125
126
127
128
 
 
129
130
131
 
146
147
148
149
 
150
151
152
 
159
160
161
162
 
163
164
165
 
175
176
177
178
 
179
180
181
 
187
188
189
190
 
191
192
193
 
201
202
203
204
 
205
206
207
 
215
216
217
218
 
219
220
221
 
244
245
246
247
 
248
249
250
 
251
252
253
 
254
255
256
 
119
120
121
 
122
123
124
125
126
127
 
 
128
129
130
131
132
 
147
148
149
 
150
151
152
153
 
160
161
162
 
163
164
165
166
 
176
177
178
 
179
180
181
182
 
188
189
190
 
191
192
193
194
 
202
203
204
 
205
206
207
208
 
216
217
218
 
219
220
221
222
 
245
246
247
 
248
249
250
 
251
252
253
 
254
255
256
257
@@ -119,13 +119,14 @@
  def __init__(self):   pass   - def get_data(self, widget, item, rev, custom, repo): + def get_data(self, item, *args): + widget, rev, custom, repo = args   def default_func(widget, ctx):   return None   def preset_func(widget, ctx):   if item == 'rev': - revnum = self.get_data(widget, 'revnum', rev, custom, repo) - revid = self.get_data(widget, 'revid', rev, custom, repo) + revnum = self.get_data('revnum', *args) + revid = self.get_data('revid', *args)   return '%s (%s)' % (revnum, revid)   elif item == 'revnum':   return str(ctx.rev()) @@ -146,7 +147,7 @@
  return hglib.toutf(ctx.branch())   return None   elif item == 'branch': - value = self.get_data(widget, 'rawbranch', rev, custom, repo) + value = self.get_data('rawbranch', *args)   if value:   dblist = repo.ui.config('tortoisehg', 'deadbranch', '')   if dblist and value in [hglib.toutf(b.strip()) \ @@ -159,7 +160,7 @@
  return None   return value   elif item == 'tags': - value = self.get_data(widget, 'rawtags', rev, custom, repo) + value = self.get_data('rawtags', *args)   if value:   htags = repo.ui.config('tortoisehg', 'hidetags', '')   htags = [hglib.toutf(b.strip()) for b in htags.split()] @@ -175,7 +176,7 @@
  return custom[item]['data'](widget, ctx)   return preset_func(widget, ctx)   - def get_label(self, widget, item, rev, custom, repo): + def get_label(self, item, widget, rev, custom, repo):   def default_func(widget):   return ''   def preset_func(widget): @@ -187,7 +188,7 @@
  return custom[item]['label'](widget)   return preset_func(widget)   - def get_markup(self, widget, item, rev, custom, repo): + def get_markup(self, item, widget, rev, custom, repo):   def default_func(widget, value):   return gtklib.markup_escape_text(value)   def preset_func(widget, value): @@ -201,7 +202,7 @@
  tags = [gtklib.markup(' %s ' % tag, **opts) for tag in value]   return ' '.join(tags)   return default_func(widget, value) - value = self.get_data(widget, item, rev, custom, repo) + value = self.get_data(item, widget, rev, custom, repo)   if value is None:   return None   if custom.has_key(item) and custom[item].has_key('markup'): @@ -215,7 +216,7 @@
  self.cache = {}     def try_cache(self, target, func, *args): - widget, item, rev, custom, repo = args + item, widget, rev, custom, repo = args   key = target + item + str(rev) + str(custom) + str(id(repo))   try:   return self.cache[key] @@ -244,13 +245,13 @@
  self.info = info     def get_data(self, item): - return self.info.get_data(self, item, self.rev, self.custom, self.repo) + return self.info.get_data(item, self, self.rev, self.custom, self.repo)     def get_label(self, item): - return self.info.get_label(self, item, self.rev, self.custom, self.repo) + return self.info.get_label(item, self, self.rev, self.custom, self.repo)     def get_markup(self, item): - return self.info.get_markup(self, item, self.rev, self.custom, self.repo) + return self.info.get_markup(item, self, self.rev, self.custom, self.repo)     def update(self, rev=None, custom=None, repo=None):   if rev is not None: