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: respect 'deadbranch' option

To ignore 'deadbranch' option, you can use 'rawbranch' item.

Changeset 090d9807c205…

Parent 51bc7ac8c803…

by Yuki KODAMA

Changes to one file · Browse files at 090d9807c205 Showing diff from parent 51bc7ac8c803 Diff from another changeset...

Change 1 of 3 Show Entire File tortoisehg/​hgtk/​csinfo.py Stacked
 
113
114
115
116
 
 
117
118
119
 
140
141
142
143
 
144
145
146
 
 
 
 
 
 
 
 
147
148
149
 
175
176
177
178
 
179
180
181
 
113
114
115
 
116
117
118
119
120
 
141
142
143
 
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
 
184
185
186
 
187
188
189
190
@@ -113,7 +113,8 @@
    LABELS = {'rev': _('rev:'), 'revnum': _('rev:'), 'revid': _('rev:'),   'summary': _('summary:'), 'user': _('user:'), - 'date': _('date:'), 'branch': _('branch:'), 'tags': _('tags:')} + 'date': _('date:'), 'branch': _('branch:'), 'tags': _('tags:'), + 'rawbranch': _('branch:')}     def __init__(self):   pass @@ -140,10 +141,18 @@
  return hglib.toutf(ctx.user())   elif item == 'date':   return hglib.displaytime(ctx.date()) - elif item == 'branch': + elif item == 'rawbranch':   if ctx.node() in repo.branchtags().values():   return hglib.toutf(ctx.branch())   return None + elif item == 'branch': + value = self.get_data(widget, 'rawbranch', rev, custom, repo) + if value: + dblist = repo.ui.config('tortoisehg', 'deadbranch', '') + if dblist and value in [hglib.toutf(b.strip()) \ + for b in dblist.split(',')]: + value = None + return value   elif item == 'tags':   value = hglib.toutf(', '.join(ctx.tags()))   if len(value) == 0: @@ -175,7 +184,7 @@
  def preset_func(widget, value):   if item in ('rev', 'revnum', 'revid'):   return gtklib.markup(value, face='monospace', size='9000') - elif item == 'branch': + elif item in ('rawbranch', 'branch'):   return gtklib.markup(' %s ' % value, color='black',   background='#aaffaa')   elif item == 'tags':