Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

csinfo: show 'rev' item correctly

If the target item doesn't have revision num/id,
'rev' data function should be return None.

Changeset 46212e639636…

Parent 1b21c5031ed0…

by Yuki KODAMA

Changes to one file · Browse files at 46212e639636 Showing diff from parent 1b21c5031ed0 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​csinfo.py Stacked
 
213
214
215
216
 
 
 
217
218
219
 
322
323
324
325
 
326
327
328
 
329
330
331
 
213
214
215
 
216
217
218
219
220
221
 
324
325
326
 
327
328
 
 
329
330
331
332
@@ -213,7 +213,9 @@
  if item == 'rev':   revnum = self.get_data('revnum', *args)   revid = self.get_data('revid', *args) - return (revnum, revid) + if revid: + return (revnum, revid) + return None   elif item == 'revnum':   return ctx.rev()   elif item == 'revid': @@ -322,10 +324,9 @@
  if item == 'rev':   revnum, revid = value   revid = gtklib.markup(revid, **mono) - if revnum: + if revnum is not None and revid is not None:   return '%s (%s)' % (revnum, revid) - else: - return '%s' % revid + return '%s' % revid   elif item in ('revid', 'transplant'):   return gtklib.markup(value, **mono)   elif item == 'revnum':