merge stable in default

authorDavid Douard <david.douard@logilab.fr>
changesetebdaabf52b73
branchdefault
phasepublic
hiddenno
parent revision#f475bc6966e8 [qt] re-enable "reselect currently visited rev and file on reload" (closes #93641), #df0bd07d63bc [tui] enable "reselect currently visited rev and file on reload" (closes #93653)
child revision#33d2b342c3a2 [tui] set attribute '_walker' to RepoViewer (closes #98686)
files modified by this revision
.hgtags
debian/changelog
hgviewlib/qt4/hgrepoview.py
hgviewlib/qt4/hgrepoviewer.py
hgviewlib/qt4/quickbar.py
# HG changeset patch
# User David Douard <david.douard@logilab.fr>
# Date 1338822303 -7200
# Mon Jun 04 17:05:03 2012 +0200
# Node ID ebdaabf52b73e635d2c9348005e4529c2218d041
# Parent df0bd07d63bccc087f563cf6e29a4918caa554b5
# Parent f475bc6966e8d97fe4476de67ffda9ce92c35cb9
merge stable in default

diff --git a/.hgtags b/.hgtags
@@ -19,5 +19,6 @@
1  846104aaa0ceea947963bcc0c7d7abd3d2a3eee1 hgview-debian-version-1.4.0-2
2  9246f0e562415e89a9fcbcf8529564b22a63791d hgview-version-1.5.0
3  09ed7f71fac79b05e71611b85ef0da7dbd8327fa hgview-debian-version-1.5.0-1
4  ca12fd67dc852bc72a607348fabb1ac82e9cf4b7 hgview-debian-version-1.5.0-2
5  d67cbb4e5651605a679302653914cfe517fd6b16 hgview-debian-version-1.5.0-3
6 +8a812760e40d225204fb6ea289518908ac6893e3 hgview-debian-version-1.5.0-4
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,12 @@
7 +hgview (1.5.0-4) unstable; urgency=low
8 +
9 +  * Rebuild the source package with the .install files so Ubuntu doesn't get
10 +    empty binary packages (LP: #929741).  Oops.
11 +
12 + -- Julien Cristau <jcristau@debian.org>  Tue, 29 May 2012 18:13:58 +0200
13 +
14  hgview (1.5.0-3) unstable; urgency=low
15 
16    * Remove logilab.org ticket references from debian/changelog
17 
18   -- Julien Cristau <jcristau@debian.org>  Fri, 23 Dec 2011 17:39:27 +0100
diff --git a/hgviewlib/qt4/hgrepoview.py b/hgviewlib/qt4/hgrepoview.py
@@ -385,18 +385,16 @@
19      """
20      def __init__(self, parent=None):
21          QtGui.QTextBrowser.__init__(self, parent)
22          self.descwidth = 60 # number of chars displayed for parent/child descriptions
23 
24 -        self._context_menu = self.createStandardContextMenu()
25          if rst2html:
26              self.rst_action = QtGui.QAction(self.tr('Fancy Display'), self)
27              self.rst_action.setCheckable(True)
28              self.rst_action.setChecked(True)
29              self.rst_action.setToolTip(self.tr('Interpret ReST comments'))
30              self.rst_action.setStatusTip(self.tr('Interpret ReST comments'))
31 -            self._context_menu.addAction(self.rst_action)
32 
33              connect(self.rst_action, SIGNAL('triggered()'),
34                      self.refreshDisplay)
35          else:
36              self.rst_action = None
@@ -569,11 +567,13 @@
37              desc = raw2html(desc)
38          buf += '<div class="diff_desc">%s</div>\n' % desc
39          self.setHtml(buf)
40 
41      def contextMenuEvent(self, event):
42 -        self._context_menu.exec_(event.globalPos())
43 +        _context_menu = self.createStandardContextMenu()
44 +        _context_menu.addAction(self.rst_action)
45 +        _context_menu.exec_(event.globalPos())
46 
47  if __name__ == "__main__":
48      from mercurial import ui, hg
49      from optparse import OptionParser
50      from hgviewlib.qt4.hgrepomodel import FileRevModel, HgRepoListModel
diff --git a/hgviewlib/qt4/hgrepoviewer.py b/hgviewlib/qt4/hgrepoviewer.py
@@ -494,12 +494,10 @@
51          self._reload_file = self.tableView_filelist.currentFile()
52          self.repo = hg.repository(self.repo.ui, self.repo.root)
53          self._repodate = self._getrepomtime()
54          self.setupBranchCombo()
55          self.setupModels()
56 -        # XXX workaround: see refreshRevisionTable method
57 -        self.refreshRevisionTable()
58 
59      #@timeit
60      def refreshRevisionTable(self, *args, **kw):
61          """Starts the process of filling the HgModel"""
62          branch = str(self.branch_comboBox.currentText())
diff --git a/hgviewlib/qt4/quickbar.py b/hgviewlib/qt4/quickbar.py
@@ -108,11 +108,17 @@
63          connect(self._actions['findnext'], SIGNAL('triggered()'), self.find)
64          self._actions['cancel'] = QtGui.QAction("Cancel", self)
65          connect(self._actions['cancel'], SIGNAL('triggered()'), self.cancel)
66 
67      def find(self, *args):
68 +        '''Scan the repository metadata and search for occurence of the
69 +        text in tre entry.
70 +        :note: do not scan if no text was provided'''
71          text = unicode(self.entry.text())
72 +        if not text: # do not strip() as user may want to find space sequences
73 +            self.emit(SIGNAL('showMessage'), 'Nothing to look for.', 1000)
74 +            return
75          if text == self.currenttext:
76              self.emit(SIGNAL('findnext'), text)
77          else:
78              self.currenttext = text
79              self.emit(SIGNAL('find'), text)