merge back stable 1.6.2

authorAlain Leufroy <alain.leufroy@logilab.fr>
changeset732b464cf33d
branchdefault
phasepublic
hiddenno
parent revision#38ee2a68d59c Added tag hgview-debian-version-1.6.2-1 for changeset fbdd0bcc8831, #c91925266c2c Added tag hgview-debian-version-1.6.0-1 for changeset 94b961892fa3
child revision#fc542bd01f56 [qt] add an action to export changeset metadata to clipboard (closes #101945)
files modified by this revision
.hgtags
ChangeLog
MANIFEST.in
debian/changelog
hgviewlib/__pkginfo__.py
hgviewlib/curses/graphlog.py
setup.py
# HG changeset patch
# User Alain Leufroy <alain.leufroy@logilab.fr>
# Date 1346847114 -7200
# Wed Sep 05 14:11:54 2012 +0200
# Node ID 732b464cf33dfbaba23f3a02ec35b2f67a9cc709
# Parent c91925266c2cf35f3d5f7047bf96edc25c9c2a5c
# Parent 38ee2a68d59cbc2c9c7601bedd34498f20c894d9
merge back stable 1.6.2

diff --git a/.hgtags b/.hgtags
@@ -22,5 +22,9 @@
1  ca12fd67dc852bc72a607348fabb1ac82e9cf4b7 hgview-debian-version-1.5.0-2
2  d67cbb4e5651605a679302653914cfe517fd6b16 hgview-debian-version-1.5.0-3
3  8a812760e40d225204fb6ea289518908ac6893e3 hgview-debian-version-1.5.0-4
4  bfb04dc8ee733a0d759284da8835f8b4d75c6fc2 hgview-version-1.6.0
5  94b961892fa3daffffbc33fa4d3b0737b21b784f hgview-debian-version-1.6.0-1
6 +c1473c36b074f785b80d8ec77d27aa2c444ea29e hgview-version-1.6.1
7 +0cc1496d79e05d552c21979bfdd23b7c63e21be1 hgview-debian-version-1.6.1-1
8 +dc7d520807e75ee4dc11e28bce50ec456294cb03 hgview-version-1.6.2
9 +fbdd0bcc8831869cb3308bfb327ef8edd9f46333 hgview-debian-version-1.6.2-1
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,84 @@
10 +2011-08-08 -- 1.6.2
11 +
12 +    * generate hgqv.qrc to hgqv_rc.py not hgqv_qrc.py (#103538)
13 +
14 +2011-08-08 -- 1.6.1
15 +
16 +    * Include missing hgviewlib/qt4/application.py (#103444)
17 +
18 +2011-08-08 -- 1.6.0
19 +
20 +
21 +    * compat> improve compatibility with Mercurial 2.2 and 2.3
22 +
23 +    * compat> improve compatibility with Python 2.5
24 +
25 +    * graph> support for changesets obsolescence
26 +
27 +    * graph> support for hiding closed branches
28 +
29 +    * graph> improve support for hidden changeset
30 +
31 +    * graph> select current working directory parent at startup instead of tip
32 +	     (#82231)
33 +
34 +    * graph> allow to reorder mutable changeset on top (#92312)
35 +
36 +    * graph> add some basic support for bookmarks (#92295, #92750)
37 +
38 +    * config> allow overriding ``maxfilesize`` config value in the UIs (#20597)
39 +
40 +    * config> allow to hide changeset content at startup (#92204)
41 +
42 +    * config> allow per-interface configuration
43 +
44 +    * GUI> allow to mimic the raw text layout by adding "description" to the
45 +	   files list (#83294)
46 +
47 +    * GUI> move "start" and "follow" actions from toolbar to context menu
48 +	   (#87901)
49 +
50 +    * GUI> move diff actions from toolbar to context menu  and hide toolbar
51 +	   diff at startup (#87901)
52 +
53 +    * GUI> add icon to "show/hide" hidden changesets action (#87901)
54 +
55 +    * GUI> allow to pass node/rev/tag as link anchor (#87902)
56 +
57 +    * TUI> phases support (#87899)
58 +
59 +    * TUI> use short hash
60 +
61 +    * TUI> goto command now accept any changeid, not only the rev (#92736)
62 +
63 +    * bugfix> Do not reload data from locked repository (#92297)
64 +
65 +    * bugfix> fix encoding error while browsing the content of an unapplied
66 +	      mqpatch that contains unicode chars (#87210)
67 +
68 +    * bugfix> fix OSError while focusing on removed file on mq patches (#87839)
69 +
70 +    * bugfix> fix ``dev/null`` file entry appearing with removed files on
71 +	      unapplied mq patches (#89335)
72 +
73 +    * bugfix> Raw-UI prevent over refreshing with mercurial 2.1 (#89336)
74 +
75 +    * bugfix> do not swallow exception with ``--traceback`` (#89337)
76 +
77 +    * bugfix> Fix some unicode issue in raw text ui (#98647)
78 +
79 +    * bugfix> Properly keep currently visited rev and file on reload (#93641)
80 +
81 +    * bugfix> re-enable copy action in right click menu of the description
82 +	      (#93421)
83 +
84 +    * bugfix> do nothing if the entry of ``find`` is empty in the GUI (#93422)
85 +
86 +    * bugfix> Fix a typo leading to a name error when using bfile.
87 +
88 +
89  2011-12-23 -- 1.5.0
90 
91      * GUI> replace text in description for fancy display (#84465)
92 
93      * GUI> links in fancy view opens browser (#76254)
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -11,10 +11,11 @@
94 
95  include bin/hgview
96  include bin/hgview.bat
97 
98  include hgviewlib/qt4/*.ui
99 +include hgviewlib/qt4/*.py
100  include hgviewlib/qt4/hgqv.qrc
101  include hgviewlib/qt4/icons/*
102 
103  include hgviewlib/curses/*.py
104 
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,17 @@
105 +hgview (1.6.2-1) unstable; urgency=low
106 +
107 +  * New Upstream Release.
108 +
109 + -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Wed, 08 Aug 2012 17:39:49 +0200
110 +
111 +hgview (1.6.1-1) unstable; urgency=low
112 +
113 +  * New upstream release
114 +
115 + -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Wed, 08 Aug 2012 14:41:03 +0200
116 +
117  hgview (1.6.0-1) unstable; urgency=low
118 
119    * New Upstream Release
120 
121   -- Pierre-Yves David <pierre-yves.david@logilab.fr>  Mon, 06 Aug 2012 15:09:10 +0200
diff --git a/hgviewlib/__pkginfo__.py b/hgviewlib/__pkginfo__.py
@@ -15,11 +15,11 @@
122  http://www.logilab.fr/ -- mailto:contact@logilab.fr
123  """
124 
125  import glob
126  distname = modname = 'hgview'
127 -numversion = (1, 6, 0)
128 +numversion = (1, 6, 2)
129  version = '.'.join([str(num) for num in numversion])
130 
131 
132  license = 'GPL'
133  copyright = '''Copyright � 2007-2010 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
diff --git a/hgviewlib/curses/graphlog.py b/hgviewlib/curses/graphlog.py
@@ -17,11 +17,12 @@
134  Contains a listbox definition that walk the repo log and display an ascii graph
135  '''
136 
137  try:
138      from itertools import izip_longest as zzip
139 -except ImportError: # python2.5 support
140 +    zzip(()) # force check over lazy import
141 +except (ImportError, TypeError): # python2.5 support
142      from itertools import repeat, chain
143      class ZipExhausted(Exception):
144          pass
145      def zzip(*args, **kwds):
146          # izip_longest('ABCD', 'xy', fillvalue='-') --> Ax By C- D-
diff --git a/setup.py b/setup.py
@@ -84,16 +84,17 @@
147      return scripts_
148 
149 
150  class build_qt(_build_py):
151 
152 -    description = "build every qt related resources (.uic and .qrc)"
153 +    description = "build every qt related resources (.uic and .qrc and .pyc)"
154 
155      PACKAGE = 'hgviewlib.qt4'
156 
157 -    def dir2pkg(self, dirpath):
158 -        os.sep.join(dispath.split('.'))
159 +    def finalize_options(self):
160 +        _build_py.finalize_options(self)
161 +        self.packages = ['hgviewlib.qt4']
162 
163      def compile_src(self, src, dest):
164          compiler = self.get_compiler(src)
165          if not compiler:
166              return
@@ -104,19 +105,18 @@
167              compiler(src, dest)
168          except Exception, e:
169              sys.stderr.write('[Error] %r\n' % str(e))
170 
171      def run(self):
172 -        # be sure to compile man page
173 -        _package = self.PACKAGE.split('.')
174          for dirpath, _, filenames in os.walk(self.get_package_dir(self.PACKAGE)):
175 -            package =  dirpath.split(os.sep)
176 +            package = dirpath.split(os.sep)
177              for filename in filenames:
178 -                module = '_'.join(filename.split(os.extsep))
179 +                module = self.get_module_name(filename)
180                  module_file = self.get_module_outfile(self.build_lib, package, module)
181                  src_file = os.path.join(dirpath, filename)
182                  self.compile_src(src_file, module_file)
183 +        _build_py.run(self)
184 
185      @staticmethod
186      def compile_ui(ui_file, py_file):
187          from PyQt4 import uic
188          with open(py_file, 'w') as fp:
@@ -128,13 +128,18 @@
189 
190      def get_compiler(self, source_file):
191          name = 'compile_' + source_file.rsplit(os.extsep, 1)[-1]
192          return getattr(self, name, None)
193 
194 +    @staticmethod
195 +    def get_module_name(src_filename):
196 +        name, ext = os.path.splitext(src_filename)
197 +        return {'.qrc': '%s_rc', '.ui': '%s_ui'}.get(ext, '%s') % name
198 +
199  class build_curses(_build_py):
200 
201 -    description = "build every qt related curses"
202 +    description = "build every curses related resource"
203 
204      def finalize_options(self):
205          _build_py.finalize_options(self)
206          self.packages = ['hgviewlib.curses']
207