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 2975e8e472f1…

Parents 565fd98b9bfc…

Parents 7479281234ea…

by Steve Borho

Changes to 2 files · Browse files at 2975e8e472f1 Showing diff from parent 565fd98b9bfc 7479281234ea Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
360
361
362
 
363
364
365
 
661
662
663
664
665
666
667
 
360
361
362
363
364
365
366
 
662
663
664
 
665
666
667
@@ -360,6 +360,7 @@
  def repositoryChanged(self):   'Repository has detected a changelog / dirstate change'   self.refresh() + self.stwidget.refreshWctx() # Trigger reload of working context     def configChanged(self):   'Repository is reporting its config files have changed' @@ -661,7 +662,6 @@
  self.msgte.clear()   self.msgte.setModified(False)   self.commitComplete.emit() - self.stwidget.refreshWctx()    class DetailsDialog(QDialog):   'Utility dialog for configuring uncommon settings'
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​revset.py Stacked
 
381
382
383
384
 
 
 
 
385
386
387
 
381
382
383
 
384
385
386
387
388
389
390
@@ -381,7 +381,10 @@
  l = []   for c in func(self.repo, range(len(self.repo))):   l.append(c) - self.showMessage.emit(_('%d matches found') % len(l)) + if len(l): + self.showMessage.emit(_('%d matches found') % len(l)) + else: + self.showMessage.emit(_('No matches found'))   self.queryIssued.emit(self.query, l)   except error.ParseError, e:   if len(e.args) == 2: