Hello community, here is the log from the commit of package hgview for openSUSE:Factory checked in at 2014-05-27 12:00:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hgview (Old) and /work/SRC/openSUSE:Factory/.hgview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hgview" Changes: -------- --- /work/SRC/openSUSE:Factory/hgview/hgview.changes 2014-03-14 15:16:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hgview.new/hgview.changes 2014-05-27 12:00:44.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 26 14:44:59 UTC 2014 - g...@opensuse.org + +- update to 1.8.1 + - no changelog provided, see + http://hg.logilab.org/review/hgview/shortlog/08c8f9749a6f + for a detailed list of changes + +------------------------------------------------------------------- Old: ---- hgview-1.8.0.tar.gz New: ---- hgview-1.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hgview.spec ++++++ --- /var/tmp/diff_new_pack.SV4b40/_old 2014-05-27 12:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.SV4b40/_new 2014-05-27 12:00:45.000000000 +0200 @@ -18,7 +18,7 @@ Name: hgview -Version: 1.8.0 +Version: 1.8.1 Release: 0 Summary: Visual Log Navigator for Mercurial License: GPL-2.0+ @@ -71,6 +71,7 @@ --root=%{buildroot} mkdir -p %{buildroot}%{_datadir} mv %{buildroot}%{_prefix}/man %{buildroot}%{_datadir}/ +rm -rf %{buildroot}%{_datadir}/doc/hgview chmod 644 %{buildroot}%{_mandir}/man1/hgview.1* %clean @@ -84,7 +85,6 @@ %{python_sitelib}/hgviewlib/ %exclude %{python_sitelib}/hgviewlib/qt4/ %{_bindir}/hgview -%{_datadir}/hgview/ %{_mandir}/man1/hgview.1* %files qt4 ++++++ hgview-1.8.0.tar.gz -> hgview-1.8.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hgview-1.8.0/PKG-INFO new/hgview-1.8.1/PKG-INFO --- old/hgview-1.8.0/PKG-INFO 2014-01-31 20:40:11.000000000 +0100 +++ new/hgview-1.8.1/PKG-INFO 2014-05-15 15:27:17.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: hgview -Version: 1.8.0 +Version: 1.8.1 Summary: a Mercurial interactive history viewer Home-page: http://www.logilab.org/projects/hgview Author: Logilab diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hgview-1.8.0/hgviewlib/__pkginfo__.py new/hgview-1.8.1/hgviewlib/__pkginfo__.py --- old/hgview-1.8.0/hgviewlib/__pkginfo__.py 2014-01-31 20:40:05.000000000 +0100 +++ new/hgview-1.8.1/hgviewlib/__pkginfo__.py 2014-05-15 15:27:12.000000000 +0200 @@ -18,7 +18,7 @@ import glob from os.path import join as joinpath distname = modname = 'hgview' -numversion = (1, 8, 0) +numversion = (1, 8, 1) version = '.'.join([str(num) for num in numversion]) @@ -61,6 +61,6 @@ include_dirs = [] data_files = [ - [joinpath('share', 'hgview'), + [joinpath('share', 'doc', 'hgview', 'examples'), [joinpath('hgviewlib', 'qt4', 'resources', 'description.css')]] ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hgview-1.8.0/hgviewlib/application.py new/hgview-1.8.1/hgviewlib/application.py --- old/hgview-1.8.0/hgviewlib/application.py 2014-01-31 20:40:05.000000000 +0100 +++ new/hgview-1.8.1/hgviewlib/application.py 2014-05-15 15:27:12.000000000 +0200 @@ -23,6 +23,7 @@ from mercurial import hg, ui as uimod from mercurial.error import RepoError +from hgviewlib import __pkginfo__ from hgviewlib.util import find_repository, rootpath, build_repo from hgviewlib.config import HgConfig @@ -194,7 +195,7 @@ revision. ''' - parser = OptionParser(usage) + parser = OptionParser(usage, version=__pkginfo__.version) parser.add_option('-I', '--interface', dest='interface', help=('which GUI interface to use (among "qt", "raw"' ' and "curses")'), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hgview-1.8.0/hgviewlib/config.py new/hgview-1.8.1/hgviewlib/config.py --- old/hgview-1.8.0/hgviewlib/config.py 2014-01-31 20:40:05.000000000 +0100 +++ new/hgview-1.8.1/hgviewlib/config.py 2014-05-15 15:27:12.000000000 +0200 @@ -94,8 +94,8 @@ """ descriptionstylepath: stylesheet file path used to format the revision description. - You should found a copy of the default style sheet in the shared - files location of your system (ex. /usr/share/hgview). + You should found a copy of the default style sheet in the documentation + files location of your system (ex. /usr/share/doc/hgview/examples). """ return self._fromconfig('descriptionstylepath', default) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hgview-1.8.0/hgviewlib/curses/application.py new/hgview-1.8.1/hgviewlib/curses/application.py --- old/hgview-1.8.0/hgviewlib/curses/application.py 2014-01-31 20:40:05.000000000 +0100 +++ new/hgview-1.8.1/hgviewlib/curses/application.py 2014-05-15 15:27:12.000000000 +0200 @@ -59,9 +59,9 @@ def get_screen(self): """return the screen instance to use""" if self.opts.interface == 'curses' and \ - map(int, URWID_VERSION.split('.')) < (1,0,0): + tuple(map(int, URWID_VERSION.split('.'))) < (1,0,0): raise ApplicationError('The "curses" interface could not be use ' - 'with old urwid version ()%s < 1.0.0.' + 'with old urwid version (%s) < 1.0.0.' 'Use the"raw" interface' % URWID_VERSION) if self.opts.interface == 'raw': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hgview-1.8.0/hgviewlib/hggraph.py new/hgview-1.8.1/hgviewlib/hggraph.py --- old/hgview-1.8.0/hgviewlib/hggraph.py 2014-01-31 20:40:05.000000000 +0100 +++ new/hgview-1.8.1/hgviewlib/hggraph.py 2014-05-15 15:27:12.000000000 +0200 @@ -198,7 +198,7 @@ if getattr(repo, 'revs', None) is None: # pre 2.1 hg revs = [c.rev() for c in repo.set(revset, *revset_args)] else: - revs = _repo.revs(revset, *revset_args) + revs = repo.revs(revset, *revset_args) excluded = () if view is None else hiddenrevs(repo) if excluded: revs = [r for r in revs if r not in excluded] @@ -242,7 +242,11 @@ revset, args = _build_filter(start_rev, branch, follow, closed) view = None if show_hidden else 'visible' - included = _revset_revs(repo, revset, args, view=view) + included = _revset_revs(repo, revset, args, view=view) + if getattr(included, 'append', None) is None: + # _revset_revs returned a smartset (new in Mercurial 3.0) + # translate it back to list for now + included = list(included) # working directory if start_rev is None and _dirty_wc(repo): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hgview-1.8.0/hgviewlib/util.py new/hgview-1.8.1/hgviewlib/util.py --- old/hgview-1.8.0/hgviewlib/util.py 2014-01-31 20:40:05.000000000 +0100 +++ new/hgview-1.8.1/hgviewlib/util.py 2014-05-15 15:27:12.000000000 +0200 @@ -12,7 +12,7 @@ import os.path as osp import string from functools import partial -from mercurial import hg, config +from mercurial import hg, config, error from hgviewlib.hgpatches.scmutil import match from hgviewlib.hgpatches import precursorsmarkers, successorsmarkers @@ -239,9 +239,12 @@ if not osp.exists(confpath): return None conf = config.config() - conf.read(confpath) - return conf - + try: + conf.read(confpath) + out = conf + except error.ParseError: + out = None + return out def _get_subrepo(repo_path): """Get subrepo style nested repo""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hgview-1.8.0/setup.py new/hgview-1.8.1/setup.py --- old/hgview-1.8.0/setup.py 2014-01-31 20:40:05.000000000 +0100 +++ new/hgview-1.8.1/setup.py 2014-05-15 15:27:12.000000000 +0200 @@ -27,11 +27,26 @@ from os.path import isdir, exists, join, walk, splitext, basename, dirname from subprocess import check_call, call as sub_call -from distutils.core import setup +with_setuptools = False +if 'USE_SETUPTOOLS' in os.environ or 'pip' in __file__: + try: + from setuptools import setup + from setuptools.command.install import install as _install + from setuptools.command.build_py import build_py as _build_py + from setuptools.command.install_lib import install_lib + with_setuptools = True + except: + with_setuptools = False + +if with_setuptools is False: + import warnings + from distutils.command.install import install as _install + from distutils.core import setup + from distutils.command.build_py import build_py as _build_py + from distutils.command.install_lib import install_lib + + from distutils.command.build import build as _build -from distutils.command.build_py import build_py as _build_py -from distutils.command.install import install as _install -from distutils.command.install_lib import install_lib from distutils.command.install_data import install_data as _install_data py2exe, innosetup = None, None -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
