Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 565fd98b9bfc…

Parents 9c6621a6f8a4…

Parents 5bca3163dfc3…

by Steve Borho

Changes to 5 files · Browse files at 565fd98b9bfc Showing diff from parent 9c6621a6f8a4 5bca3163dfc3 Diff from another changeset...

Change 1 of 4 Show Entire File tortoisehg/​hgqt/​repofilter.py Stacked
 
51
52
53
 
54
55
56
 
62
63
64
65
66
 
67
68
69
 
98
99
100
 
 
 
 
 
 
 
101
102
103
 
207
208
209
 
 
210
211
212
 
51
52
53
54
55
56
57
 
63
64
65
 
 
66
67
68
69
 
98
99
100
101
102
103
104
105
106
107
108
109
110
 
214
215
216
217
218
219
220
221
@@ -51,6 +51,7 @@
  self.revsetcombo = combo = QComboBox()   combo.setEditable(True)   combo.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) + combo.setSizeAdjustPolicy(QComboBox.AdjustToMinimumContentsLength)   le = combo.lineEdit()   le.returnPressed.connect(self.returnPressed)   le.selectionChanged.connect(self.selectionChanged) @@ -62,8 +63,7 @@
  self.clearBtn = QToolButton(self)   self.clearBtn.setIcon(qtlib.geticon('filedelete'))   self.clearBtn.setToolTip(_('Clear current query and query text')) - self.clearBtn.clicked.connect(le.clear) - self.clearBtn.clicked.connect(self.clearRevisionSet) + self.clearBtn.clicked.connect(self.onClearButtonClicked)   self.addWidget(self.clearBtn)   self.addWidget(combo)   @@ -98,6 +98,13 @@
  self._initbranchfilter()   self.refresh()   + def onClearButtonClicked(self): + if self.revsetcombo.lineEdit().text(): + self.revsetcombo.lineEdit().clear() + else: + self.hide() + self.clearRevisionSet.emit() +   def setEnableFilter(self, enabled):   'Enable/disable the changing of the current filter'   self.revsetcombo.setEnabled(enabled) @@ -207,6 +214,8 @@
  self._branchLabel.setMenu(self._branchMenu)     self._branchCombo = QComboBox() + self._branchCombo.setSizeAdjustPolicy(QComboBox.AdjustToMinimumContentsLength) + self._branchCombo.setMinimumSize(100,0)   self._branchCombo.currentIndexChanged.connect(self._emitBranchChanged)   self._branchReloading = False  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
412
413
414
415
416
417
418
419
 
 
420
421
422
 
412
413
414
 
 
 
 
 
415
416
417
418
419
@@ -412,11 +412,8 @@
    @pyqtSlot()   def clearRevisionSet(self): - if not self.filterbar.revsetle.text(): - self.filterbar.hide() - self.toolbarVisibilityChanged.emit() - return - elif not self.revset: + self.toolbarVisibilityChanged.emit() + if not self.revset:   return   self.revset = []   if self.revsetfilter:
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
272
273
274
 
 
 
275
276
277
 
272
273
274
275
276
277
278
279
280
@@ -272,6 +272,9 @@
  path, bundle = s   cmdoptions['bundle'] = os.path.abspath(bundle)   path = ui.expandpath(path) + if not os.path.exists(path) or not os.path.isdir(path+'/.hg'): + print 'abort: %s is not a repository' % path + return 1   os.chdir(path)   if options['fork']:   cmdoptions['fork'] = True
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​shelve.py Stacked
 
372
373
374
 
 
375
376
377
 
372
373
374
375
376
377
378
379
@@ -372,6 +372,8 @@
  def refreshCombos(self):   shelvea, shelveb = self.currentPatchA(), self.currentPatchB()   + # Note that thgshelves returns the shelve list ordered from newest to + # oldest   shelves = self.repo.thgshelves()   disp = [_('Shelf: %s') % hglib.tounicode(s) for s in shelves]  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
471
472
473
474
 
 
 
 
475
476
477
 
471
472
473
 
474
475
476
477
478
479
480
@@ -471,7 +471,10 @@
  def thgshelves(self):   self.shelfdir = sdir = self.join('shelves')   if os.path.isdir(sdir): - return os.listdir(sdir) + def getModificationTime(x): + return os.path.getmtime(os.path.join(sdir, x)) + return sorted(os.listdir(sdir), + key=getModificationTime, reverse=True)   return []     def thginvalidate(self):