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

stable status: Fix "open..." subrepo or shelve links

Changeset b991177d05ae…

Parent fd2e5d8cbefc…

by Angel Ezquerra

Changes to one file · Browse files at b991177d05ae Showing diff from parent fd2e5d8cbefc Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
99
100
101
102
 
103
104
105
 
515
516
517
518
 
519
520
521
 
686
687
688
 
689
690
691
 
694
695
696
 
 
 
 
 
 
 
 
 
 
 
 
 
 
697
698
699
 
99
100
101
 
102
103
104
105
 
515
516
517
 
518
519
520
521
 
686
687
688
689
690
691
692
 
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
@@ -99,7 +99,7 @@
  tb.setIcon(qtlib.geticon('view-refresh'))   tb.clicked.connect(self.refreshWctx)   le = QLineEdit() - if hasattr(le, 'setPlaceholderText'): # Qt >= 4.7 + if hasattr(le, 'setPlaceholderText'): # Qt >= 4.7   le.setPlaceholderText('### filter text ###')   else:   lbl = QLabel(_('Filter:')) @@ -515,7 +515,7 @@
  if ms[f] == 'u' and f not in nchecked:   nchecked[f] = checked.get(f, True)   rows.append(mkrow(f, 'C')) - self.headers = ('*', _('Stat'), _('M'), _('Filename'), + self.headers = ('*', _('Stat'), _('M'), _('Filename'),   _('Type'), _('Size (KB)'))   self.checked = nchecked   self.unfiltered = rows @@ -686,6 +686,7 @@
  self.stwidget.showMessage.connect(self.statusbar.showMessage)   self.stwidget.progress.connect(self.statusbar.progress)   self.stwidget.titleTextChanged.connect(self.setWindowTitle) + self.stwidget.linkActivated.connect(self.linkActivated)     self.setWindowTitle(self.stwidget.getTitle())   self.setWindowFlags(Qt.Window) @@ -694,6 +695,20 @@
  QShortcut(QKeySequence.Refresh, self, self.stwidget.refreshWctx)   QTimer.singleShot(0, self.stwidget.refreshWctx)   + def linkActivated(self, link): + link = hglib.fromunicode(link) + if link.startswith('subrepo:'): + from tortoisehg.hgqt.run import qtrun + from tortoisehg.hgqt import commit + qtrun(commit.run, ui.ui(), root=link[8:]) + if link.startswith('shelve:'): + repo = self.commit.repo + from tortoisehg.hgqt import shelve + dlg = shelve.ShelveDialog(repo, self) + dlg.finished.connect(dlg.deleteLater) + dlg.exec_() + self.refresh() +   def loadSettings(self):   s = QSettings()   self.stwidget.loadSettings(s, 'status')