Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2016-05-24 09:33:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-05-17 17:08:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2016-05-24 09:33:52.000000000 +0200 @@ -1,0 +2,19 @@ +Tue May 17 07:05:53 UTC 2016 - [email protected] + +- Mercurial v3.8.2 + This is an unscheduled bugfix release. 3.8.1 contained a noisy deprecation + warning that was only intended for Mercurial developers, sorry. + + * bookmarks: properly invalidate volatile sets when writing bookmarks + * builddeb: add distroseries to tagged versions + * bundle2: properly request phases during getbundle + * debian: add wish to suggests + * debian: forgot to make debian/rules executable in 6b95a623ec90 + * deprecation: gate deprecation warning behind devel configuration + * help: fix the display for hg help internals.revlogs (issue5227) + * help: search section of help topic by translated section name correctly + * hg-ssh: copy doc string to man page + * patch: show lower-ed translated message correctly + * progress: stop excessive clearing (issue4801) + +------------------------------------------------------------------- Old: ---- mercurial-3.8.1.tar.gz New: ---- mercurial-3.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.PIcum6/_old 2016-05-24 09:33:53.000000000 +0200 +++ /var/tmp/diff_new_pack.PIcum6/_new 2016-05-24 09:33:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: mercurial -Version: 3.8.1 +Version: 3.8.2 Release: 0 Summary: Scalable Distributed SCM License: GPL-2.0+ @@ -124,6 +124,7 @@ %{_mandir}/man1/hg.1* %{_mandir}/man5/hgignore.5* %{_mandir}/man5/hgrc.5* +%{_mandir}/man8/hg-ssh.8* %{python_sitearch}/* %changelog ++++++ mercurial-3.8.1.tar.gz -> mercurial-3.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/.hgsigs new/mercurial-3.8.2/.hgsigs --- old/mercurial-3.8.1/.hgsigs 2016-05-01 21:36:13.000000000 +0200 +++ new/mercurial-3.8.2/.hgsigs 2016-05-17 00:21:26.000000000 +0200 @@ -125,3 +125,4 @@ ae279d4a19e9683214cbd1fe8298cf0b50571432 0 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/.hgtags new/mercurial-3.8.2/.hgtags --- old/mercurial-3.8.1/.hgtags 2016-05-01 21:36:13.000000000 +0200 +++ new/mercurial-3.8.2/.hgtags 2016-05-17 00:21:26.000000000 +0200 @@ -138,3 +138,4 @@ ae279d4a19e9683214cbd1fe8298cf0b50571432 3.7.3 740156eedf2c450aee58b1a90b0e826f47c5da64 3.8-rc f85de28eae32e7d3064b1a1321309071bbaaa069 3.8 +a56296f55a5e1038ea5016dace2076b693c28a56 3.8.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/PKG-INFO new/mercurial-3.8.2/PKG-INFO --- old/mercurial-3.8.1/PKG-INFO 2016-05-01 21:36:25.000000000 +0200 +++ new/mercurial-3.8.2/PKG-INFO 2016-05-17 00:21:39.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: mercurial -Version: 3.8.1 +Version: 3.8.2 Summary: Fast scalable distributed SCM (revision control, version control) system Home-page: https://mercurial-scm.org/ Author: Matt Mackall and many others diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/contrib/builddeb new/mercurial-3.8.2/contrib/builddeb --- old/mercurial-3.8.1/contrib/builddeb 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/contrib/builddeb 2016-05-17 00:21:18.000000000 +0200 @@ -58,6 +58,10 @@ fi if [ -n "$distance" ] ; then debver="$debver+$distance-$CODENAME-$node" +elif [ "$DEBFLAGS" = "-S" ] ; then + # for building a ppa (--source-only) for a release (distance == 0), we need + # to version the distroseries so that we can upload to launchpad + debver="$debver~${CODENAME}1" fi control=debian/control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/contrib/debian/control new/mercurial-3.8.2/contrib/debian/control --- old/mercurial-3.8.1/contrib/debian/control 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/contrib/debian/control 2016-05-17 00:21:18.000000000 +0200 @@ -42,6 +42,7 @@ ${misc:Depends}, ${python:Depends}, Recommends: mercurial (= ${source:Version}), ca-certificates +Suggests: wish Breaks: mercurial (<< ${source:Version}) Replaces: mercurial (<< 2.6.3) Description: easy-to-use, scalable distributed version control system (common files) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/doc/gendoc.py new/mercurial-3.8.2/doc/gendoc.py --- old/mercurial-3.8.1/doc/gendoc.py 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/doc/gendoc.py 2016-05-17 00:21:18.000000000 +0200 @@ -136,6 +136,7 @@ extrahelptable = [ (["common"], '', loaddoc('common')), (["hg.1"], '', loaddoc('hg.1')), + (["hg-ssh.8"], '', loaddoc('hg-ssh.8')), (["hgignore.5"], '', loaddoc('hgignore.5')), (["hgrc.5"], '', loaddoc('hgrc.5')), (["hgignore.5.gendoc"], '', loaddoc('hgignore')), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/doc/hg-ssh.8 new/mercurial-3.8.2/doc/hg-ssh.8 --- old/mercurial-3.8.1/doc/hg-ssh.8 1970-01-01 01:00:00.000000000 +0100 +++ new/mercurial-3.8.2/doc/hg-ssh.8 2016-05-17 00:21:27.000000000 +0200 @@ -0,0 +1,86 @@ +.\" Man page generated from reStructuredText. +. +.TH HG-SSH 8 "" "" "Mercurial Manual" +.SH NAME +hg-ssh \- restricted ssh login shell for Mercurial +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. +.SH SYNOPSIS +.sp +\fBhg\-ssh\fP repositories... +.SH DESCRIPTION +.sp +\fBhg\-ssh\fP is a wrapper for ssh access to a limited set of mercurial repos. +.sp +To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8): +command="hg\-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh\-dss ... +(probably together with these other useful options: +no\-port\-forwarding,no\-X11\-forwarding,no\-agent\-forwarding) +.sp +This allows pull/push over ssh from/to the repositories given as arguments. +.sp +If all your repositories are subdirectories of a common directory, you can +allow shorter paths with: +command="cd path/to/my/repositories && hg\-ssh repo1 subdir/repo2" +.sp +You can use pattern matching of your normal shell, e.g.: +command="cd repos && hg\-ssh user/thomas/* projects/{mercurial,foo}" +.sp +You can also add a \-\-read\-only flag to allow read\-only access to a key, e.g.: +command="hg\-ssh \-\-read\-only repos/*" +.SH BUGS +.sp +Probably lots, please post them to the mailing list (see \%Resources\: +below) when you find them. +.SH SEE ALSO +.sp +\%\fBhg\fP(1)\: +.SH AUTHOR +.sp +Written by Matt Mackall <\%[email protected]\:> +.SH RESOURCES +.sp +Main Web Site: \%https://mercurial\-scm.org/\: +.sp +Source code repository: \%http://selenic.com/hg\: +.sp +Mailing list: \%http://selenic.com/mailman/listinfo/mercurial\: +.SH COPYING +.sp +Copyright (C) 2005\-2016 Matt Mackall. +Free use of this software is granted under the terms of the GNU General +Public License version 2 or any later version. +.\" Common link and substitution definitions. +. +.SH AUTHOR +Thomas Arendsen Hein <[email protected]> + +Organization: Mercurial +.\" Generated by docutils manpage writer. +.\" +. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/doc/hg-ssh.8.html new/mercurial-3.8.2/doc/hg-ssh.8.html --- old/mercurial-3.8.1/doc/hg-ssh.8.html 1970-01-01 01:00:00.000000000 +0100 +++ new/mercurial-3.8.2/doc/hg-ssh.8.html 2016-05-17 00:21:31.000000000 +0200 @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> +<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/"; /> +<title>hg-ssh</title> +<meta name="author" content="Thomas Arendsen Hein <thomas@intevation.de>" /> +<meta name="organization" content="Mercurial" /> +<link rel="stylesheet" href="style.css" type="text/css" /> +</head> +<body> +<div class="document" id="hg-ssh"> +<span id="hg-ssh-8"></span> +<h1 class="title">hg-ssh</h1> +<h2 class="subtitle" id="restricted-ssh-login-shell-for-mercurial">restricted ssh login shell for Mercurial</h2> +<table class="docinfo" frame="void" rules="none"> +<col class="docinfo-name" /> +<col class="docinfo-content" /> +<tbody valign="top"> +<tr><th class="docinfo-name">Author:</th> +<td>Thomas Arendsen Hein <<a class="reference external" href="mailto:thomas@intevation.de";>thomas@intevation.de</a>></td></tr> +<tr><th class="docinfo-name">Organization:</th> +<td>Mercurial</td></tr> +<tr class="field"><th class="docinfo-name">Manual section:</th><td class="field-body">8</td> +</tr> +<tr class="field"><th class="docinfo-name">Manual group:</th><td class="field-body">Mercurial Manual</td> +</tr> +</tbody> +</table> +<div class="contents htmlonly topic" id="contents"> +<p class="topic-title first">Contents</p> +<ul class="simple"> +<li><a class="reference internal" href="#synopsis" id="id1">Synopsis</a></li> +<li><a class="reference internal" href="#description" id="id2">Description</a></li> +<li><a class="reference internal" href="#bugs" id="id3">Bugs</a></li> +<li><a class="reference internal" href="#see-also" id="id4">See Also</a></li> +<li><a class="reference internal" href="#author" id="id5">Author</a></li> +<li><a class="reference internal" href="#resources" id="id6">Resources</a></li> +<li><a class="reference internal" href="#copying" id="id7">Copying</a></li> +</ul> +</div> +<div class="section" id="synopsis"> +<h1><a class="toc-backref" href="#contents">Synopsis</a></h1> +<p><strong>hg-ssh</strong> repositories...</p> +</div> +<div class="section" id="description"> +<h1><a class="toc-backref" href="#contents">Description</a></h1> +<p><strong>hg-ssh</strong> is a wrapper for ssh access to a limited set of mercurial repos.</p> +<p>To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8): +command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-dss ... +(probably together with these other useful options: +no-port-forwarding,no-X11-forwarding,no-agent-forwarding)</p> +<p>This allows pull/push over ssh from/to the repositories given as arguments.</p> +<p>If all your repositories are subdirectories of a common directory, you can +allow shorter paths with: +command="cd path/to/my/repositories && hg-ssh repo1 subdir/repo2"</p> +<p>You can use pattern matching of your normal shell, e.g.: +command="cd repos && hg-ssh user/thomas/* projects/{mercurial,foo}"</p> +<p>You can also add a --read-only flag to allow read-only access to a key, e.g.: +command="hg-ssh --read-only repos/*"</p> +</div> +<div class="section" id="bugs"> +<h1><a class="toc-backref" href="#contents">Bugs</a></h1> +<p>Probably lots, please post them to the mailing list (see <a class="reference internal" href="#resources">Resources</a> +below) when you find them.</p> +</div> +<div class="section" id="see-also"> +<h1><a class="toc-backref" href="#contents">See Also</a></h1> +<p><a class="reference external" href="hg.1.html"><strong>hg</strong>(1)</a></p> +</div> +<div class="section" id="author"> +<h1><a class="toc-backref" href="#contents">Author</a></h1> +<p>Written by Matt Mackall <<a class="reference external" href="mailto:mpm@selenic.com";>mpm@selenic.com</a>></p> +</div> +<div class="section" id="resources"> +<h1><a class="toc-backref" href="#contents">Resources</a></h1> +<p>Main Web Site: <a class="reference external" href="https://mercurial-scm.org/";>https://mercurial-scm.org/</a></p> +<p>Source code repository: <a class="reference external" href="http://selenic.com/hg";>http://selenic.com/hg</a></p> +<p>Mailing list: <a class="reference external" href="http://selenic.com/mailman/listinfo/mercurial";>http://selenic.com/mailman/listinfo/mercurial</a></p> +</div> +<div class="section" id="copying"> +<h1><a class="toc-backref" href="#contents">Copying</a></h1> +<p>Copyright (C) 2005-2016 Matt Mackall. +Free use of this software is granted under the terms of the GNU General +Public License version 2 or any later version.</p> +<span class="target" id="common"></span><!-- Common link and substitution definitions. --> +</div> +</div> +</body> +</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/__version__.py new/mercurial-3.8.2/mercurial/__version__.py --- old/mercurial-3.8.1/mercurial/__version__.py 2016-05-01 21:36:23.000000000 +0200 +++ new/mercurial-3.8.2/mercurial/__version__.py 2016-05-17 00:21:36.000000000 +0200 @@ -1,2 +1,2 @@ # this file is autogenerated by setup.py -version = "3.8.1" +version = "3.8.2" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/bookmarks.py new/mercurial-3.8.2/mercurial/bookmarks.py --- old/mercurial-3.8.1/mercurial/bookmarks.py 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/mercurial/bookmarks.py 2016-05-17 00:21:18.000000000 +0200 @@ -181,6 +181,7 @@ for name, node in self.iteritems(): fp.write("%s %s\n" % (hex(node), encoding.fromlocal(name))) self._clean = True + self._repo.invalidatevolatilesets() def expandname(self, bname): if bname == '.': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/commands.py new/mercurial-3.8.2/mercurial/commands.py --- old/mercurial-3.8.1/mercurial/commands.py 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/mercurial/commands.py 2016-05-17 00:21:18.000000000 +0200 @@ -4590,7 +4590,7 @@ subtopic = None if name and '.' in name: name, section = name.split('.', 1) - section = section.lower() + section = encoding.lower(section) if '.' in section: subtopic, section = section.split('.', 1) else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/exchange.py new/mercurial-3.8.2/mercurial/exchange.py --- old/mercurial-3.8.1/mercurial/exchange.py 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/mercurial/exchange.py 2016-05-17 00:21:18.000000000 +0200 @@ -1290,7 +1290,7 @@ kwargs['heads'] = pullop.heads or pullop.rheads kwargs['cg'] = pullop.fetch if 'listkeys' in pullop.remotebundle2caps: - kwargs['listkeys'] = ['phase'] + kwargs['listkeys'] = ['phases'] if pullop.remotebookmarks is None: # make sure to always includes bookmark data when migrating # `hg incoming --bundle` to using this function. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/help/hg-ssh.8.txt new/mercurial-3.8.2/mercurial/help/hg-ssh.8.txt --- old/mercurial-3.8.1/mercurial/help/hg-ssh.8.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/mercurial-3.8.2/mercurial/help/hg-ssh.8.txt 2016-05-17 00:21:18.000000000 +0200 @@ -0,0 +1,71 @@ +======== + hg-ssh +======== + +---------------------------------------- +restricted ssh login shell for Mercurial +---------------------------------------- + +:Author: Thomas Arendsen Hein <[email protected]> +:Organization: Mercurial +:Manual section: 8 +:Manual group: Mercurial Manual + +.. contents:: + :backlinks: top + :class: htmlonly + :depth: 1 + +Synopsis +"""""""" +**hg-ssh** repositories... + +Description +""""""""""" +**hg-ssh** is a wrapper for ssh access to a limited set of mercurial repos. + +To be used in ~/.ssh/authorized_keys with the "command" option, see sshd(8): +command="hg-ssh path/to/repo1 /path/to/repo2 ~/repo3 ~user/repo4" ssh-dss ... +(probably together with these other useful options: +no-port-forwarding,no-X11-forwarding,no-agent-forwarding) + +This allows pull/push over ssh from/to the repositories given as arguments. + +If all your repositories are subdirectories of a common directory, you can +allow shorter paths with: +command="cd path/to/my/repositories && hg-ssh repo1 subdir/repo2" + +You can use pattern matching of your normal shell, e.g.: +command="cd repos && hg-ssh user/thomas/* projects/{mercurial,foo}" + +You can also add a --read-only flag to allow read-only access to a key, e.g.: +command="hg-ssh --read-only repos/\*" + +Bugs +"""" +Probably lots, please post them to the mailing list (see Resources_ +below) when you find them. + +See Also +"""""""" +|hg(1)|_ + +Author +"""""" +Written by Matt Mackall <[email protected]> + +Resources +""""""""" +Main Web Site: https://mercurial-scm.org/ + +Source code repository: http://selenic.com/hg + +Mailing list: http://selenic.com/mailman/listinfo/mercurial + +Copying +""""""" +Copyright (C) 2005-2016 Matt Mackall. +Free use of this software is granted under the terms of the GNU General +Public License version 2 or any later version. + +.. include:: common.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/help/internals/revlogs.txt new/mercurial-3.8.2/mercurial/help/internals/revlogs.txt --- old/mercurial-3.8.1/mercurial/help/internals/revlogs.txt 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/mercurial/help/internals/revlogs.txt 2016-05-17 00:21:18.000000000 +0200 @@ -1,5 +1,5 @@ -Revisions Logs -============== +Revlogs +======= Revision logs - or *revlogs* - are an append only data structure for storing discrete entries, or *revisions*. They are the primary storage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/minirst.py new/mercurial-3.8.2/mercurial/minirst.py --- old/mercurial-3.8.1/mercurial/minirst.py 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/mercurial/minirst.py 2016-05-17 00:21:18.000000000 +0200 @@ -724,7 +724,7 @@ x = b['key'] else: x = b['lines'][0] - x = x.lower().strip('"') + x = encoding.lower(x).strip('"') if '(' in x: x = x.split('(')[0] return x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/patch.py new/mercurial-3.8.2/mercurial/patch.py --- old/mercurial-3.8.1/mercurial/patch.py 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/mercurial/patch.py 2016-05-17 00:21:18.000000000 +0200 @@ -1010,7 +1010,7 @@ ui.write("\n") if r == 8: # ? for c, t in ui.extractchoices(resps)[1]: - ui.write('%s - %s\n' % (c, t.lower())) + ui.write('%s - %s\n' % (c, encoding.lower(t))) continue elif r == 0: # yes ret = True diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/progress.py new/mercurial-3.8.2/mercurial/progress.py --- old/mercurial-3.8.1/mercurial/progress.py 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/mercurial/progress.py 2016-05-17 00:21:18.000000000 +0200 @@ -163,7 +163,7 @@ sys.stderr.flush() def clear(self): - if not shouldprint(self.ui): + if not self.printed or not self.lastprint or not shouldprint(self.ui): return sys.stderr.write('\r%s\r' % (' ' * self.width())) if self.printed: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/mercurial/ui.py new/mercurial-3.8.2/mercurial/ui.py --- old/mercurial-3.8.1/mercurial/ui.py 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/mercurial/ui.py 2016-05-17 00:21:18.000000000 +0200 @@ -1161,6 +1161,9 @@ - msg: message explaining what is deprecated and how to upgrade, - version: last version where the API will be supported, """ + if not (self.configbool('devel', 'all-warnings') + or self.configbool('devel', 'deprec-warn')): + return msg += ("\n(compatibility will be dropped after Mercurial-%s," " update your code.)") % version self.develwarn(msg, stacklevel=2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-clone-uncompressed.t new/mercurial-3.8.2/tests/test-clone-uncompressed.t --- old/mercurial-3.8.1/tests/test-clone-uncompressed.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-clone-uncompressed.t 2016-05-17 00:21:18.000000000 +0200 @@ -44,12 +44,10 @@ sending getbundle command bundle2-input-bundle: with-transaction bundle2-input-part: "listkeys" (params: 1 mandatory) supported + bundle2-input-part: total payload size 58 bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-bundle: 1 parts total checking for updated bookmarks - preparing listkeys for "phases" - sending listkeys command - received listkey for "phases": 58 bytes Stream clone while repo is changing: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-clonebundles.t new/mercurial-3.8.2/tests/test-clonebundles.t --- old/mercurial-3.8.1/tests/test-clonebundles.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-clonebundles.t 2016-05-17 00:21:18.000000000 +0200 @@ -32,8 +32,7 @@ $ cat server/access.log * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob) * - - [*] "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob) - * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=phase%2Cbookmarks (glob) - * - - [*] "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases (glob) + * - - [*] "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=aaff8d2ffbbf07a46dd1f05d8ae7877e3f56e2a2&listkeys=phases%2Cbookmarks (glob) Empty manifest file results in retrieval (the extension only checks if the manifest file exists) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-commit-interactive.t new/mercurial-3.8.2/tests/test-commit-interactive.t --- old/mercurial-3.8.1/tests/test-commit-interactive.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-commit-interactive.t 2016-05-17 00:21:18.000000000 +0200 @@ -878,6 +878,32 @@ abort: user quit [255] +#if gettext + +Test translated help message + +str.lower() instead of encoding.lower(str) on translated message might +make message meaningless, because some encoding uses 0x41(A) - 0x5a(Z) +as the second or later byte of multi-byte character. + +For example, "\x8bL\x98^" (translation of "record" in ja_JP.cp932) +contains 0x4c (L). str.lower() replaces 0x4c(L) by 0x6c(l) and this +replacement makes message meaningless. + +This tests that translated help message is lower()-ed correctly. + + $ LANGUAGE=ja + $ export LANGUAGE + + $ hg commit -i --encoding cp932 2>&1 <<EOF | grep '^y - ' + > ? + > q + > EOF + y - \x82\xb1\x82\xcc\x95\xcf\x8dX\x82\xf0\x8bL\x98^(yes) (esc) + + $ LANGUAGE= +#endif + Skip $ hg commit -i <<EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-help.t new/mercurial-3.8.2/tests/test-help.t --- old/mercurial-3.8.1/tests/test-help.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-help.t 2016-05-17 00:21:18.000000000 +0200 @@ -1524,6 +1524,78 @@ files List of strings. All files modified, added, or removed by this changeset. +Test section lookup by translated message + +str.lower() instead of encoding.lower(str) on translated message might +make message meaningless, because some encoding uses 0x41(A) - 0x5a(Z) +as the second or later byte of multi-byte character. + +For example, "\x8bL\x98^" (translation of "record" in ja_JP.cp932) +contains 0x4c (L). str.lower() replaces 0x4c(L) by 0x6c(l) and this +replacement makes message meaningless. + +This tests that section lookup by translated string isn't broken by +such str.lower(). + + $ python <<EOF + > def escape(s): + > return ''.join('\u%x' % ord(uc) for uc in s.decode('cp932')) + > # translation of "record" in ja_JP.cp932 + > upper = "\x8bL\x98^" + > # str.lower()-ed section name should be treated as different one + > lower = "\x8bl\x98^" + > with open('ambiguous.py', 'w') as fp: + > fp.write("""# ambiguous section names in ja_JP.cp932 + > u'''summary of extension + > + > %s + > ---- + > + > Upper name should show only this message + > + > %s + > ---- + > + > Lower name should show only this message + > + > subsequent section + > ------------------ + > + > This should be hidden at "hg help ambiguous" with section name. + > ''' + > """ % (escape(upper), escape(lower))) + > EOF + + $ cat >> $HGRCPATH <<EOF + > [extensions] + > ambiguous = ./ambiguous.py + > EOF + + $ python <<EOF | sh + > upper = "\x8bL\x98^" + > print "hg --encoding cp932 help -e ambiguous.%s" % upper + > EOF + \x8bL\x98^ (esc) + ---- + + Upper name should show only this message + + + $ python <<EOF | sh + > lower = "\x8bl\x98^" + > print "hg --encoding cp932 help -e ambiguous.%s" % lower + > EOF + \x8bl\x98^ (esc) + ---- + + Lower name should show only this message + + + $ cat >> $HGRCPATH <<EOF + > [extensions] + > ambiguous = ! + > EOF + Test dynamic list of merge tools only shows up once $ hg help merge-tools Merge Tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-hook.t new/mercurial-3.8.2/tests/test-hook.t --- old/mercurial-3.8.1/tests/test-hook.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-hook.t 2016-05-17 00:21:18.000000000 +0200 @@ -255,9 +255,8 @@ pulling from ../a listkeys hook: HG_NAMESPACE=bookmarks HG_VALUES={'bar': '0000000000000000000000000000000000000000', 'foo': '0000000000000000000000000000000000000000'} no changes found - listkeys hook: HG_NAMESPACE=phase HG_VALUES={} - adding remote bookmark bar listkeys hook: HG_NAMESPACE=phases HG_VALUES={'cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b': '1', 'publishing': 'True'} + adding remote bookmark bar $ cd ../a test that prepushkey can prevent incoming keys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-http-proxy.t new/mercurial-3.8.2/tests/test-http-proxy.t --- old/mercurial-3.8.1/tests/test-http-proxy.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-http-proxy.t 2016-05-17 00:21:18.000000000 +0200 @@ -110,21 +110,16 @@ * - - [*] "GET http://localhost:$HGPORT/?cmd=branchmap HTTP/1.1" - - (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" - - (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D83180e7845de420a1bb46896fd5fe05294f8d629 (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob) + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=83180e7845de420a1bb46896fd5fe05294f8d629&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob) + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob) + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob) + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1" - - (glob) * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phase%2Cbookmarks (glob) - * - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - - x-hgarg-1:namespace=phases (glob) + * - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629&listkeys=phases%2Cbookmarks (glob) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-http.t new/mercurial-3.8.2/tests/test-http.t --- old/mercurial-3.8.1/tests/test-http.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-http.t 2016-05-17 00:21:18.000000000 +0200 @@ -262,13 +262,11 @@ "GET /?cmd=stream_out HTTP/1.1" 401 - "GET /?cmd=stream_out HTTP/1.1" 200 - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D5fed3813f7f5e1824344fdc9cf8f63bb662c292d - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phase%2Cbookmarks - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=0&common=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks "GET /?cmd=capabilities HTTP/1.1" 200 - "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D - "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phase%2Cbookmarks - "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phase%2Cbookmarks - "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases + "GET /?cmd=getbundle HTTP/1.1" 401 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks + "GET /?cmd=getbundle HTTP/1.1" 200 - x-hgarg-1:bundlecaps=HG20%2Cbundle2%3DHG20%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtagsfnodes%250Alistkeys%250Apushkey%250Aremote-changegroup%253Dhttp%252Chttps&cg=1&common=0000000000000000000000000000000000000000&heads=5fed3813f7f5e1824344fdc9cf8f63bb662c292d&listkeys=phases%2Cbookmarks "GET /?cmd=capabilities HTTP/1.1" 200 - "GET /?cmd=lookup HTTP/1.1" 200 - x-hgarg-1:key=tip "GET /?cmd=listkeys HTTP/1.1" 401 - x-hgarg-1:namespace=namespaces diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-install.t new/mercurial-3.8.2/tests/test-install.t --- old/mercurial-3.8.1/tests/test-install.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-install.t 2016-05-17 00:21:18.000000000 +0200 @@ -126,6 +126,7 @@ $ python wixxml.py help Not installed: help/common.txt + help/hg-ssh.8.txt help/hg.1.txt help/hgignore.5.txt help/hgrc.5.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-obsolete-changeset-exchange.t new/mercurial-3.8.2/tests/test-obsolete-changeset-exchange.t --- old/mercurial-3.8.1/tests/test-obsolete-changeset-exchange.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-obsolete-changeset-exchange.t 2016-05-17 00:21:18.000000000 +0200 @@ -130,11 +130,11 @@ 1 changesets found list of changesets: bec0734cd68e84477ba7fc1d13e6cff53ab70129 - listing keys for "phase" + listing keys for "phases" listing keys for "bookmarks" bundle2-output-bundle: "HG20", 3 parts total bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload - bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload + bundle2-output-part: "listkeys" (params: 1 mandatory) 58 bytes payload bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload bundle2-input-bundle: with-transaction bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported @@ -146,9 +146,9 @@ added 1 changesets with 1 changes to 1 files (+1 heads) bundle2-input-part: total payload size 474 bundle2-input-part: "listkeys" (params: 1 mandatory) supported + bundle2-input-part: total payload size 58 bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-bundle: 2 parts total checking for updated bookmarks - listing keys for "phases" updating the branch cache (run 'hg heads' to see heads, 'hg merge' to merge) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-obsolete.t new/mercurial-3.8.2/tests/test-obsolete.t --- old/mercurial-3.8.1/tests/test-obsolete.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-obsolete.t 2016-05-17 00:21:18.000000000 +0200 @@ -982,17 +982,21 @@ bookmarks change $ cd .. $ cat >$TESTTMP/test_extension.py << EOF + > import weakref > from mercurial import cmdutil, extensions, bookmarks, repoview > def _bookmarkchanged(orig, bkmstoreinst, *args, **kwargs): - > repo = bkmstoreinst._repo - > ret = orig(bkmstoreinst, *args, **kwargs) - > hidden1 = repoview.computehidden(repo) - > hidden = repoview.filterrevs(repo, 'visible') - > if sorted(hidden1) != sorted(hidden): - > print "cache inconsistency" - > return ret + > reporef = weakref.ref(bkmstoreinst._repo) + > def trhook(tr): + > repo = reporef() + > hidden1 = repoview.computehidden(repo) + > hidden = repoview.filterrevs(repo, 'visible') + > if sorted(hidden1) != sorted(hidden): + > print "cache inconsistency" + > bkmstoreinst._repo.currenttransaction().addpostclose('test_extension', trhook) + > orig(bkmstoreinst, *args, **kwargs) > def extsetup(ui): - > extensions.wrapfunction(bookmarks.bmstore, 'write', _bookmarkchanged) + > extensions.wrapfunction(bookmarks.bmstore, 'recordchange', + > _bookmarkchanged) > EOF $ hg init repo-cache-inconsistency @@ -1013,6 +1017,10 @@ (use --hidden to access hidden revisions) [255] +Empty out the test extension, as it isn't compatible with later parts +of the test. + $ echo > $TESTTMP/test_extension.py + Test ability to pull changeset with locally applying obsolescence markers (issue4945) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-remove.t new/mercurial-3.8.2/tests/test-remove.t --- old/mercurial-3.8.1/tests/test-remove.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-remove.t 2016-05-17 00:21:18.000000000 +0200 @@ -322,8 +322,6 @@ \r (no-eol) (esc) deleting [===========================================>] 2/2\r (no-eol) (esc) \r (no-eol) (esc) - \r (no-eol) (esc) - \r (no-eol) (esc) removing test/bar (glob) removing test/foo (glob) exit code: 0 @@ -348,8 +346,6 @@ \r (no-eol) (esc) deleting [===========================================>] 2/2\r (no-eol) (esc) \r (no-eol) (esc) - \r (no-eol) (esc) - \r (no-eol) (esc) removing test/bar (glob) removing test/foo (glob) exit code: 0 @@ -374,8 +370,6 @@ \r (no-eol) (esc) deleting [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) - \r (no-eol) (esc) - \r (no-eol) (esc) removing test/bar (glob) not removing test/foo: file still exists (glob) exit code: 1 @@ -400,8 +394,6 @@ \r (no-eol) (esc) deleting [===========================================>] 2/2\r (no-eol) (esc) \r (no-eol) (esc) - \r (no-eol) (esc) - \r (no-eol) (esc) removing test/bar (glob) removing test/foo (glob) exit code: 0 @@ -429,8 +421,6 @@ \r (no-eol) (esc) deleting [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) - \r (no-eol) (esc) - \r (no-eol) (esc) removing issue1861/b/c/y (glob) $ hg ci -m remove $ ls issue1861 @@ -465,8 +455,6 @@ \r (no-eol) (esc) deleting [===========================================>] 1/1\r (no-eol) (esc) \r (no-eol) (esc) - \r (no-eol) (esc) - \r (no-eol) (esc) removing d1/a (glob) $ hg rm --after nosuch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-ssh.t new/mercurial-3.8.2/tests/test-ssh.t --- old/mercurial-3.8.1/tests/test-ssh.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-ssh.t 2016-05-17 00:21:18.000000000 +0200 @@ -465,13 +465,11 @@ sending getbundle command bundle2-input-bundle: with-transaction bundle2-input-part: "listkeys" (params: 1 mandatory) supported + bundle2-input-part: total payload size 15 bundle2-input-part: "listkeys" (params: 1 mandatory) supported bundle2-input-part: total payload size 45 bundle2-input-bundle: 1 parts total checking for updated bookmarks - preparing listkeys for "phases" - sending listkeys command - received listkey for "phases": 15 bytes $ cd .. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-3.8.1/tests/test-subrepo-deep-nested-change.t new/mercurial-3.8.2/tests/test-subrepo-deep-nested-change.t --- old/mercurial-3.8.1/tests/test-subrepo-deep-nested-change.t 2016-05-01 21:36:10.000000000 +0200 +++ new/mercurial-3.8.2/tests/test-subrepo-deep-nested-change.t 2016-05-17 00:21:18.000000000 +0200 @@ -214,8 +214,6 @@ \r (no-eol) (esc) deleting [===========================================>] 2/2\r (no-eol) (esc) \r (no-eol) (esc) - \r (no-eol) (esc) - \r (no-eol) (esc) removing sub1/sub2/folder/test.txt (glob) removing sub1/sub2/test.txt (glob) $ hg status -S
