[Python-apps-commits] r13253 - in packages/mercurial/branches/jessie-backports/debian (12 files)
vicho at users.alioth.debian.org
vicho at users.alioth.debian.org
Sat May 28 09:20:10 UTC 2016
Date: Saturday, May 28, 2016 @ 09:20:08
Author: vicho
Revision: 13253
Update to 3.7.3-1~bpo8+1
Modified:
packages/mercurial/branches/jessie-backports/debian/changelog
packages/mercurial/branches/jessie-backports/debian/control
packages/mercurial/branches/jessie-backports/debian/mercurial.test_blacklist
packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch
packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies
packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch
packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
packages/mercurial/branches/jessie-backports/debian/rules
packages/mercurial/branches/jessie-backports/debian/tests/control
packages/mercurial/branches/jessie-backports/debian/tests/hgsubversion
packages/mercurial/branches/jessie-backports/debian/tests/mercurial-git
Modified: packages/mercurial/branches/jessie-backports/debian/changelog
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/changelog 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/changelog 2016-05-28 09:20:08 UTC (rev 13253)
@@ -1,3 +1,78 @@
+mercurial (3.7.3-1~bpo8+1) jessie-backports; urgency=high
+
+ * Rebuild for jessie-backports.
+
+ -- Julien Cristau <jcristau at debian.org> Wed, 06 Apr 2016 12:31:09 +0200
+
+mercurial (3.7.3-1) unstable; urgency=medium
+
+ * New security upstream release fixes CVE-2016-3068, CVE-2016-3069
+ and CVE-2016-3630.
+ * Fix "FTBFS when built with dpkg-buildpackage -A". Thanks Julien
+ Cristau for the patch (Closes: #807021)
+ * Avoid allow-stderr in mercurial-git autopkgtest
+
+ -- Javi Merino <vicho at debian.org> Wed, 30 Mar 2016 08:20:07 +0100
+
+mercurial (3.7.2-2) unstable; urgency=medium
+
+ * Don't run test-clonebundle.t when building. Reproducible builds don't
+ setup name resolution (Closes: #809770)
+
+ -- Javi Merino <vicho at debian.org> Sat, 05 Mar 2016 12:08:37 +0000
+
+mercurial (3.7.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * Blacklist test-parse-date.t . It fails on some of the chroots of
+ some architectures
+ * Bump standards-version to 3.9.6 (no change needed)
+ * Use https for vcs-browser. Thanks lintian
+ * Update homepage
+
+ -- Javi Merino <vicho at debian.org> Wed, 02 Mar 2016 22:28:36 +0000
+
+mercurial (3.7.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * Fix "mercurial-git autopkgtest fails because of stderr" by allowing
+ the test to output to stderr (Closes: #808376)
+ * Allow the hgsubversion test to output to stderr
+
+ -- Javi Merino <vicho at debian.org> Thu, 11 Feb 2016 22:43:27 +0000
+
+mercurial (3.6.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * Improve autopkgtest for mercurial-git to test pushing commits from the
+ mercurial clone to git
+ * Update breaks of hgsubversion. hgsubversion 1.8.3-2 works with
+ mercurial 3.6
+
+ -- Javi Merino <vicho at debian.org> Fri, 04 Dec 2015 07:37:49 +0000
+
+mercurial (3.6.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * mercurial 3.6 breaks mercurial-crecord 0.20150626-1
+ * mercurial 3.6 breaks mercurial-git prior to 0.8.3-1
+
+ -- Javi Merino <vicho at debian.org> Thu, 26 Nov 2015 08:30:18 +0000
+
+mercurial (3.6-1) unstable; urgency=medium
+
+ * New upstream release
+ * Update hgsubversion breaks. 1.8.3-1 is not compatible with mercurial
+ 3.6-1
+
+ -- Javi Merino <vicho at debian.org> Thu, 05 Nov 2015 10:43:33 +0000
+
+mercurial (3.6~rc1-1) experimental; urgency=medium
+
+ * First release candidate for mercurial 3.6
+
+ -- Javi Merino <vicho at debian.org> Sun, 25 Oct 2015 17:31:59 +0000
+
mercurial (3.5.2-2~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports.
Modified: packages/mercurial/branches/jessie-backports/debian/control
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/control 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/control 2016-05-28 09:20:08 UTC (rev 13253)
@@ -16,10 +16,10 @@
unzip,
bash-completion,
netbase,
-Standards-Version: 3.9.6
-Homepage: http://mercurial.selenic.com/
+Standards-Version: 3.9.7
+Homepage: https://www.mercurial-scm.org/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/mercurial/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/mercurial/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/mercurial/trunk/
X-Python-Version: >= 2.4
Package: mercurial-common
@@ -50,10 +50,11 @@
Recommends: openssh-client,
Suggests: qct,
kdiff3 | kdiff3-qt | kompare | meld | tkcvs | mgdiff
-Breaks: hgsubversion (<< 1.8.2-1),
+Breaks: hgsubversion (<< 1.8.3-2),
hgview-common (<< 1.8.1),
- mercurial-git (<< 0.8.1-3),
+ mercurial-git (<< 0.8.3-1),
qct (<< 1.7-2~),
+ mercurial-crecord (<= 0.20140626-1),
Description: easy-to-use, scalable distributed version control system
Mercurial is a fast, lightweight Source Control Management system designed
for efficient handling of very large distributed projects.
Modified: packages/mercurial/branches/jessie-backports/debian/mercurial.test_blacklist
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/mercurial.test_blacklist 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/mercurial.test_blacklist 2016-05-28 09:20:08 UTC (rev 13253)
@@ -1,2 +1,24 @@
+# A bug in glibc doesn't take DST into account under specific
+# circumstances in 32-bit systems
+# https://sourceware.org/bugzilla/show_bug.cgi?id=19738
+test-parse-date.t
+
+# test-clonebundles.t fails in the reproducible-builds setup due to no
+# name resolution:
+# --- /build/mercurial-3.7.2/tests/test-clonebundles.t
+# +++ /build/mercurial-3.7.2/tests/test-clonebundles.t.err
+# @@ -52,7 +52,7 @@
+# $ echo 'http://does.not.exist/bundle.hg' > server/.hg/clonebundles.manifest
+# $ hg clone http://localhost:$HGPORT 404-url
+# applying clone bundle from http://does.not.exist/bundle.hg
+# - error fetching bundle: (.* not known|getaddrinfo failed) (re)
+# + error fetching bundle: Temporary failure in name resolution
+# abort: error applying bundle
+# (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false")
+# [255]
+#
+# ERROR: test-clonebundles.t output changed
+test-clonebundles.t
+
# upstream don't run this test and it only fails when pyflakes is installed
test-check-pyflakes.t
Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__disable_libdir_replacement.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__disable_libdir_replacement.patch 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__disable_libdir_replacement.patch 2016-05-28 09:20:08 UTC (rev 13253)
@@ -11,8 +11,8 @@
--- a/setup.py
+++ b/setup.py
-@@ -471,7 +471,6 @@ cmdclass = {'build': hgbuild,
- 'build_py': hgbuildpy,
+@@ -531,7 +531,6 @@ cmdclass = {'build': hgbuild,
+ 'build_scripts': hgbuildscripts,
'build_hgextindex': buildhgextindex,
'install_lib': hginstalllib,
- 'install_scripts': hginstallscripts,
Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__fix_fhs_paths.patch 2016-05-28 09:20:08 UTC (rev 13253)
@@ -9,8 +9,8 @@
--- a/mercurial/util.py
+++ b/mercurial/util.py
-@@ -697,6 +697,8 @@ def mainfrozen():
- if mainfrozen():
+@@ -886,6 +886,8 @@ def mainfrozen():
+ if mainfrozen() and getattr(sys, 'frozen', None) != 'macosx_app':
# executable version (py2exe) doesn't support __file__
datapath = os.path.dirname(sys.executable)
+elif __file__.startswith("/usr/lib/python"):
Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__optional-dependencies 2016-05-28 09:20:08 UTC (rev 13253)
@@ -6,9 +6,9 @@
import MySQLdb as mysql
bzmysql._MySQLdb = mysql
except ImportError as err:
-- raise util.Abort(_('python mysql support not available: %s') % err)
-+ raise util.Abort(_('python mysql support not available: %s') % err +
-+ _(' (try installing the %s package)') % 'python-mysqldb')
+- raise error.Abort(_('python mysql support not available: %s') % err)
++ raise error.Abort(_('python mysql support not available: %s') % err +
++ _(' (try installing the %s package)') % 'python-mysqldb')
bzaccess.__init__(self, ui)
@@ -35,12 +35,12 @@
name = name or exe
if not util.findexe(exe):
if abort:
- exc = util.Abort
+ exc = error.Abort
else:
exc = MissingTool
- raise exc(_('cannot find required "%s" tool') % name)
+ raise exc(_('cannot find required "%s" tool') % name +
-+ (debname and _(' (try installing the %s package)') % debname or ''))
++ (debname and _(' (try installing the %s package)') % debname or ''))
class NoRepo(Exception):
pass
@@ -65,21 +65,21 @@
+ checktool('darcs', debname='darcs')
version = self.run0('--version').splitlines()[0].strip()
if version < '2.1':
- raise util.Abort(_('darcs version 2.1 or newer needed (found %r)') %
- version)
+ raise error.Abort(_('darcs version 2.1 or newer needed (found %r)')
+ % version)
if "ElementTree" not in globals():
-- raise util.Abort(_("Python ElementTree module is not available"))
-+ raise util.Abort(_("Python ElementTree module is not available") +
-+ _(" (try installing the %s package)") % 'python-celementtree')
+- raise error.Abort(_("Python ElementTree module is not available"))
++ raise error.Abort(_("Python ElementTree module is not available") +
++ _(" (try installing the %s package)") % 'python-celementtree')
self.path = os.path.realpath(path)
--- a/hgext/convert/git.py
+++ b/hgext/convert/git.py
-@@ -107,7 +107,7 @@ class convert_git(converter_source):
+@@ -75,7 +75,7 @@ class convert_git(converter_source, comm
else:
- self.simopt = ''
+ self.simopt = []
- checktool('git', 'git')
+ checktool('git', 'git', debname='git-core')
@@ -92,9 +92,9 @@
if util.findexe('tla'):
self.execmd = 'tla'
else:
-- raise util.Abort(_('cannot find a GNU Arch tool'))
-+ raise util.Abort(_('cannot find a GNU Arch tool') +
-+ _(' (try installing the %s package)') % 'tla')
+- raise error.Abort(_('cannot find a GNU Arch tool'))
++ raise error.Abort(_('cannot find a GNU Arch tool') +
++ _(' (try installing the %s package)') % 'tla')
commandline.__init__(self, ui, self.execmd)
@@ -153,23 +153,13 @@
commandline.__init__(self, ui, 'svn')
--- a/mercurial/hgweb/server.py
+++ b/mercurial/hgweb/server.py
-@@ -208,7 +208,8 @@ class _httprequesthandleropenssl(_httpre
- import OpenSSL
- OpenSSL.SSL.Context
- except ImportError:
-- raise util.Abort(_("SSL support is unavailable"))
-+ raise util.Abort(_("SSL support is unavailable") +
-+ _(" (try installing the %s package)") % 'python-openssl')
- ctx = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
- ctx.use_privatekey_file(ssl_cert)
- ctx.use_certificate_file(ssl_cert)
-@@ -249,7 +250,8 @@ class _httprequesthandlerssl(_httpreques
+@@ -225,7 +225,8 @@ class _httprequesthandlerssl(_httpreques
import ssl
ssl.wrap_socket
except ImportError:
-- raise util.Abort(_("SSL support is unavailable"))
-+ raise util.Abort(_("SSL support is unavailable") +
-+ _(" (try installing the %s package)") % 'python-openssl')
+- raise error.Abort(_("SSL support is unavailable"))
++ raise error.Abort(_("SSL support is unavailable") +
++ _(" (try installing the %s package)") % 'python-openssl')
httpserver.socket = ssl.wrap_socket(
httpserver.socket, server_side=True,
certfile=ssl_cert, ssl_version=ssl.PROTOCOL_TLSv1)
Modified: packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/patches/deb_specific__use_sensible-editor.patch 2016-05-28 09:20:08 UTC (rev 13253)
@@ -13,7 +13,7 @@
EDITOR="$EDITOR -nw"
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
-@@ -2385,8 +2385,8 @@ def debuginstall(ui):
+@@ -2724,8 +2724,8 @@ def debuginstall(ui):
editor = util.expandpath(editor)
cmdpath = util.findexe(shlex.split(editor)[0])
if not cmdpath:
@@ -26,7 +26,7 @@
else:
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
-@@ -882,7 +882,7 @@ class ui(object):
+@@ -981,7 +981,7 @@ class ui(object):
# avoid confusion.
editor = 'E'
else:
@@ -170,7 +170,7 @@
msgid ""
--- a/i18n/ja.po
+++ b/i18n/ja.po
-@@ -12627,8 +12627,8 @@ msgstr " (テンプレートã®ã‚¤ãƒ³ã‚¹
+@@ -13602,8 +13602,8 @@ msgstr " (テンプレートã®ã‚¤ãƒ³ã‚¹
msgid "checking commit editor...\n"
msgstr "メッセージ入力用エディタã®ç¢ºèªä¸...\n"
@@ -181,22 +181,22 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr " (コミットãƒã‚°ç”¨ã‚¨ãƒ‡ã‚£ã‚¿ã‚’è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§è¨å®šã—ã¦ãã ã•ã„)\n"
-@@ -20372,11 +20372,12 @@ msgstr ""
+@@ -21925,10 +21925,12 @@ msgstr ""
msgid ""
"``editor``\n"
--" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
-+" The editor to use during a commit. Default is ``$EDITOR`` or\n"
-+" ``sensible-editor``."
+-" The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)"
++" The editor to use during a commit. (default: ``$EDITOR`` or\n"
++" ``sensible-editor``)"
msgstr ""
"``editor``\n"
- " コミットãƒã‚°å…¥åŠ›ç”¨ã‚¨ãƒ‡ã‚£ã‚¿ã€‚ 無指定ã®å ´åˆã€ ``$EDITOR`` ã¾ãŸã¯\n"
--" ``vi`` ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
-+" ``sensible-editor`` ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
+-" コミットãƒã‚°å…¥åŠ›ç”¨ã‚¨ãƒ‡ã‚£ã‚¿ã€‚ (デフォルト値: ``$EDITOR`` ã¾ãŸã¯ ``vi``)"
++" コミットãƒã‚°å…¥åŠ›ç”¨ã‚¨ãƒ‡ã‚£ã‚¿ã€‚ (デフォルト値: ``$EDITOR`` ã¾ãŸã¯\n"
++" ``sensible-editor``)"
msgid ""
"``fallbackencoding``\n"
-@@ -21619,7 +21620,7 @@ msgid ""
+@@ -23314,7 +23316,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -205,7 +205,7 @@
msgstr ""
"EDITOR\n"
" コミットãƒã‚°å…¥åŠ›æ™‚ã®ã‚ˆã†ã«ã€ エディタã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã€\n"
-@@ -21627,7 +21628,7 @@ msgstr ""
+@@ -23322,7 +23324,7 @@ msgstr ""
" ãã“ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã¯ã€ HGEDITOR〠VISUAL\n"
" ã‚ã‚‹ã„㯠EDITOR 環境変数ã«è¨å®šã•ã‚ŒãŸã‚‚ã®ã‚’(ã“ã®é †åºã§)使用ã—ã¾ã™ã€‚\n"
" 最åˆã®ç©ºã§ç„¡ã„値ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’使用ã—ã¾ã™ã€‚\n"
@@ -216,7 +216,7 @@
"PYTHONPATH\n"
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
-@@ -12814,10 +12814,10 @@ msgstr " (modelos parecem ter sido insta
+@@ -13805,10 +13805,10 @@ msgstr " (modelos parecem ter sido insta
msgid "checking commit editor...\n"
msgstr "verificando editor para consolidação...\n"
@@ -229,22 +229,22 @@
msgid " (specify a commit editor in your configuration file)\n"
msgstr ""
-@@ -20777,10 +20777,12 @@ msgstr ""
+@@ -22398,11 +22398,12 @@ msgstr ""
msgid ""
"``editor``\n"
--" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
-+" The editor to use during a commit. Default is ``$EDITOR`` or\n"
-+" ``sensible-editor``."
+-" The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)"
++" The editor to use during a commit. (default: ``$EDITOR`` or\n"
++" ``sensible-editor``)"
msgstr ""
"``editor``\n"
--" O editor usado durante um commit. O padrão é ``$EDITOR`` ou ``vi``."
-+" O editor usado durante um commit. O padrão é ``$EDITOR`` ou\n"
-+" ``sensible-editor``."
+ " O editor usado durante um commit.\n"
+-" (padrão: ``$EDITOR`` ou ``vi``)"
++" (padrão: ``$EDITOR`` ou ``sensible-editor``)"
msgid ""
"``fallbackencoding``\n"
-@@ -22058,7 +22060,7 @@ msgid ""
+@@ -23867,7 +23868,7 @@ msgid ""
" editor it uses is determined by looking at the environment\n"
" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
" non-empty one is chosen. If all of them are empty, the editor\n"
@@ -253,7 +253,7 @@
msgstr ""
"EDITOR\n"
" Algumas vezes o Mercurial precisa abrir em um editor um arquivo\n"
-@@ -22066,7 +22068,7 @@ msgstr ""
+@@ -23875,7 +23876,7 @@ msgstr ""
" mensagens de consolidação. O editor usado é determinado pela\n"
" consulta às variáveis de ambiente HGEDITOR, VISUAL e EDITOR,\n"
" nessa ordem. O primeiro valor não vazio é escolhido. Se todos\n"
@@ -338,7 +338,7 @@
msgid ""
--- a/mercurial/help/environment.txt
+++ b/mercurial/help/environment.txt
-@@ -94,7 +94,7 @@ EDITOR
+@@ -100,7 +100,7 @@ EDITOR
editor it uses is determined by looking at the environment
variables HGEDITOR, VISUAL and EDITOR, in that order. The first
non-empty one is chosen. If all of them are empty, the editor
@@ -349,13 +349,13 @@
This is used by Python to find imported modules and may need to be
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
-@@ -1409,7 +1409,8 @@ User interface controls.
- Print debugging information. True or False. Default is False.
+@@ -1567,7 +1567,8 @@ User interface controls.
+ Print debugging information. (default: False)
``editor``
-- The editor to use during a commit. Default is ``$EDITOR`` or ``vi``.
-+ The editor to use during a commit. Default is ``$EDITOR`` or
-+ ``sensible-editor``.
+- The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
++ The editor to use during a commit. (default: ``$EDITOR`` or
++ ``sensible-editor``)
``fallbackencoding``
Encoding to try if it's not possible to decode the changelog using
Modified: packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/patches/for_upstream__dont_rm_usr_bin_python_when_running_testsuite.patch 2016-05-28 09:20:08 UTC (rev 13253)
@@ -9,7 +9,7 @@
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
-@@ -1994,7 +1994,7 @@ class TestRunner(object):
+@@ -2143,7 +2143,7 @@ class TestRunner(object):
sys.executable)
mypython = os.path.join(self._tmpbindir, pyexename)
try:
Modified: packages/mercurial/branches/jessie-backports/debian/rules
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/rules 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/rules 2016-05-28 09:20:08 UTC (rev 13253)
@@ -85,7 +85,9 @@
override_dh_python2:
dh_python2
- find debian/mercurial/usr/share -type d -empty -delete
+ if test -d debian/mercurial; then \
+ find debian/mercurial/usr/share -type d -empty -delete ; \
+ fi
override_dh_auto_clean: mercurial/__version__.py
cp -a mercurial/__version__.py mercurial/__version__.py.save
Modified: packages/mercurial/branches/jessie-backports/debian/tests/control
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/tests/control 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/tests/control 2016-05-28 09:20:08 UTC (rev 13253)
@@ -4,6 +4,7 @@
Tests: hgsubversion
Depends: @, hgsubversion
+Restrictions: allow-stderr
Tests: mercurial-git
Depends: @, mercurial-git, git
Modified: packages/mercurial/branches/jessie-backports/debian/tests/hgsubversion
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/tests/hgsubversion 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/tests/hgsubversion 2016-05-28 09:20:08 UTC (rev 13253)
@@ -31,7 +31,7 @@
svn add trunk/people
svn commit -m "Add people"
cd ..
-rm -r celesteville
+rm -rf celesteville
# Now test hgsubversion
hg --config extensions.hgsubversion= clone svn://127.0.0.1/celesteville
Modified: packages/mercurial/branches/jessie-backports/debian/tests/mercurial-git
===================================================================
--- packages/mercurial/branches/jessie-backports/debian/tests/mercurial-git 2016-05-27 20:01:40 UTC (rev 13252)
+++ packages/mercurial/branches/jessie-backports/debian/tests/mercurial-git 2016-05-28 09:20:08 UTC (rev 13253)
@@ -1,16 +1,26 @@
#!/bin/sh
-
+#
# Basic test to see if the mercurial-git extension still works.
+set -e
+
# Setup a git repository with some content
-git init try
-cd try
+git init --bare git_server
+git clone git_server git_clone 2>&1
+cd git_clone
git config user.name Babar
git config user.email babar at jungle.org
echo a >a
git add a
git commit -m a
+git push origin master 2>&1
cd ..
# Now try to clone it with mercurial-git
-exec hg --config extensions.git= clone try try2
+hg --config extensions.git= clone git_server hg_clone
+
+# Do some changes and push them to the git server
+cd hg_clone
+echo b >>a
+hg commit -u "Babar <babar at jungle.org>" -m "more content to a"
+exec hg --config extensions.git= push
More information about the Python-apps-commits
mailing list