Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2013-11-25 14:58:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial (Old) and /work/SRC/openSUSE:Factory/.mercurial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial" Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2013-10-24 14:41:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2013-11-25 14:58:33.000000000 +0100 @@ -1,0 +2,41 @@ +Sun Nov 24 10:34:00 UTC 2013 - [email protected] + +- update to version 2.8 + Core features + hgweb: add revset syntax support to search + hgweb: always run search when a query is entered (BC) + hgweb (paper theme): add infinite scrolling to graph + hgweb: show full date in rfc822 format in tooltips at shortlog page + proxy: allow wildcards in the no proxy list (issue1821) + pull: for pull --update with failed update, print hint if any + rebase: preserve working directory parent (BC) + sslutil: add a config knob to support TLS (default) or SSLv23 (BC) (issue4038) + templatefilters: add short format for age formatting + templater: support using templates with non-standard names from map file + update: add error message for dirty non-linear update with no rev + addremove: don't do full walks + log: make file log slow path usable on huge repos + subrepo: let the user choose to merge, keep local or keep remote subrepo revisions + Extension features + convert-internals: introduce hg.revs to replace hg.startrev and --rev with a revset + convert-internals: update source shamap when using filemap, just as when not using filemap + factotum: clean up keychain for multiple hg repository authentication + histedit: abort if there are multiple roots in "--outgoing" revisions + mq: extract strip function as its standalone extension (issue3824) + mq: look for modified subrepos when checking for local changes + rebase: remove bailifchanged check from pullrebase (BC) + shelve: add a shelve extension to save/restore working changes + Fixes + pager: honour internal aliases + patch: ensure valid git diffs if source/destination file is missing (issue4046) + patch: Fix nullid for binary git diffs (issue4054) + progress: stop getting stuck in a nested topic during a long inner step + rebase: handle bookmarks matching revset function names (issue3950) + rebase: preserve active bookmark when not at head (issue3813) + rebase: preserve metadata from grafts of changes (issue4001) + rebase: fix selection of base used when rebasing merge (issue4041) + ui: send password prompts to stderr again (issue4056) +- recover 11.4 support by requiring docutils instead of python-docutils +- rebased mercurial-2.6.3-ssl.diff to mercurial-2.8-ssl.diff + +------------------------------------------------------------------- Old: ---- mercurial-2.6.3-ssl.diff mercurial-2.7.2.tar.gz New: ---- mercurial-2.8-ssl.diff mercurial-2.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.IKh0Lr/_old 2013-11-25 14:58:33.000000000 +0100 +++ /var/tmp/diff_new_pack.IKh0Lr/_new 2013-11-25 14:58:33.000000000 +0100 @@ -17,7 +17,7 @@ Name: mercurial -Version: 2.7.2 +Version: 2.8 Release: 0 Summary: Scalable Distributed SCM License: GPL-2.0+ @@ -34,11 +34,15 @@ # PATCH-FIX-OPENSUSE mercurial-locale-path-fix.patch [email protected] -- locales are found in /usr/share/locale Patch3: mercurial-locale-path-fix.patch # PATCH-FIX-OPENSUSE mercurial-2.6.3-ssl.diff [email protected] -- fallback to system default ca path -Patch4: mercurial-2.6.3-ssl.diff +Patch4: mercurial-2.8-ssl.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: python-devel +%if %suse_version < 1210 +BuildRequires: docutils +%else BuildRequires: python-docutils +%endif BuildRequires: python-xml Requires: python-xml %if 0%{?sles_version} ++++++ mercurial-2.6.3-ssl.diff -> mercurial-2.8-ssl.diff ++++++ --- /work/SRC/openSUSE:Factory/mercurial/mercurial-2.6.3-ssl.diff 2013-09-05 23:21:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial-2.8-ssl.diff 2013-11-25 14:58:32.000000000 +0100 @@ -1,13 +1,18 @@ -Index: mercurial-2.6.3/mercurial/sslutil.py -=================================================================== ---- mercurial-2.6.3.orig/mercurial/sslutil.py -+++ mercurial-2.6.3/mercurial/sslutil.py -@@ -83,12 +83,15 @@ def _verifycert(cert, hostname): +diff -uprN mercurial-2.8.orig/mercurial/sslutil.py mercurial-2.8/mercurial/sslutil.py +--- mercurial-2.8.orig/mercurial/sslutil.py 2013-11-24 11:43:21.326826414 +0100 ++++ mercurial-2.8/mercurial/sslutil.py 2013-11-24 11:45:24.960654510 +0100 +@@ -89,7 +89,6 @@ def _verifycert(cert, hostname): # busted on those versions. def sslkwargs(ui, host): - cacerts = ui.config('web', 'cacerts') + forcetls = ui.configbool('ui', 'tls', default=True) + if forcetls: + ssl_version = PROTOCOL_TLSv1 +@@ -98,10 +97,14 @@ def sslkwargs(ui, host): hostfingerprint = ui.config('hostfingerprints', host) + kws = {'ssl_version': ssl_version, + } - if cacerts and not hostfingerprint: - cacerts = util.expandpath(cacerts) - if not os.path.exists(cacerts): @@ -16,14 +21,14 @@ + cacerts = ui.config('web', 'cacerts') + # cacerts explicitly set to empty string means to disable + # checking. See insecure option in dispatch.py -+ if cacerts is not None and cacerts != '': -+ cacerts = util.expandpath(cacerts) -+ if not os.path.exists(cacerts): -+ raise util.Abort(_('could not find web.cacerts: %s') % cacerts) - return {'ca_certs': cacerts, - 'cert_reqs': CERT_REQUIRED, - } -@@ -137,7 +140,7 @@ class validator(object): ++ if cacerts is not None and cacerts != '': ++ cacerts = util.expandpath(cacerts) ++ if not os.path.exists(cacerts): ++ raise util.Abort(_('could not find web.cacerts: %s') % cacerts) + kws.update({'ca_certs': cacerts, + 'cert_reqs': CERT_REQUIRED, + }) +@@ -150,7 +153,7 @@ class validator(object): hint=_('check hostfingerprint configuration')) self.ui.debug('%s certificate matched fingerprint %s\n' % (host, nicefingerprint)) ++++++ mercurial-2.7.2.tar.gz -> mercurial-2.8.tar.gz ++++++ ++++ 19029 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
