Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.0.1, 2.0.2, and 2.0.3

stable repomodel: follow behavior of bookmarks command (refs #177)

Even though localrepo._bookmarkcurrent has a value, it is not considered a real
current bookmark unless the bookmarked revision is also the working parent.

Changeset 7bf7897aec3c…

Parent bac5b8436eb4…

by Steve Borho

Changes to one file · Browse files at 7bf7897aec3c Showing diff from parent bac5b8436eb4 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repomodel.py Stacked
 
530
531
532
 
533
534
535
536
 
 
 
537
538
539
 
530
531
532
533
534
 
 
 
535
536
537
538
539
540
@@ -530,10 +530,11 @@
  parts.append(qtlib.applyeffects(u' %s ' % branchu, effects))     for mark in ctx.bookmarks(): + style = 'log.bookmark'   if mark == self.repo._bookmarkcurrent: - style = 'log.curbookmark' - else: - style = 'log.bookmark' + bn = self.repo._bookmarks[self.repo._bookmarkcurrent] + if bn in self.repo.dirstate.parents(): + style = 'log.curbookmark'   marku = hglib.tounicode(mark)   effects = qtlib.geteffect(style)   parts.append(qtlib.applyeffects(u' %s ' % marku, effects))