Hello community, here is the log from the commit of package mercurial for openSUSE:Factory checked in at 2018-04-06 17:45:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mercurial (Old) and /work/SRC/openSUSE:Factory/.mercurial.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mercurial" Fri Apr 6 17:45:48 2018 rev:127 rq:593608 version:4.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mercurial/mercurial.changes 2018-03-20 21:51:55.275913244 +0100 +++ /work/SRC/openSUSE:Factory/.mercurial.new/mercurial.changes 2018-04-06 17:45:56.967289240 +0200 @@ -1,0 +2,12 @@ +Wed Apr 4 15:00:16 UTC 2018 - [email protected] + +- Mercurial 4.5.3 + This is a regularly-scheduled bugfix release. + + * Bug Fixes + + rebase: on abort, don't strip commits that didn't need to be rebased + (issue5822) + + hgweb: garbage collect on every request + + amend: abort if unresolved merge conflicts found (issue5805) + +------------------------------------------------------------------- Old: ---- mercurial-4.5.2.tar.gz mercurial-4.5.2.tar.gz.asc New: ---- mercurial-4.5.3.tar.gz mercurial-4.5.3.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.O7hRnU/_old 2018-04-06 17:45:58.119247638 +0200 +++ /var/tmp/diff_new_pack.O7hRnU/_new 2018-04-06 17:45:58.123247493 +0200 @@ -20,7 +20,7 @@ %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %endif Name: mercurial -Version: 4.5.2 +Version: 4.5.3 Release: 0 Summary: Scalable Distributed SCM License: GPL-2.0-or-later ++++++ mercurial-4.5.2.tar.gz -> mercurial-4.5.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/.hgsigs new/mercurial-4.5.3/.hgsigs --- old/mercurial-4.5.2/.hgsigs 2018-03-06 20:19:55.000000000 +0100 +++ new/mercurial-4.5.3/.hgsigs 2018-04-04 16:35:10.000000000 +0200 @@ -159,3 +159,4 @@ 27b6df1b5adbdf647cf5c6675b40575e1b197c60 0 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/.hgtags new/mercurial-4.5.3/.hgtags --- old/mercurial-4.5.2/.hgtags 2018-03-06 20:19:55.000000000 +0100 +++ new/mercurial-4.5.3/.hgtags 2018-04-04 16:35:10.000000000 +0200 @@ -172,3 +172,4 @@ 27b6df1b5adbdf647cf5c6675b40575e1b197c60 4.5-rc d334afc585e29577f271c5eda03378736a16ca6b 4.5 369aadf7a3264b03c8b09efce715bc41e6ab4a9b 4.5.1 +8bba684efde7f45add05f737952093bb2aa07155 4.5.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/PKG-INFO new/mercurial-4.5.3/PKG-INFO --- old/mercurial-4.5.2/PKG-INFO 2018-03-06 20:20:18.000000000 +0100 +++ new/mercurial-4.5.3/PKG-INFO 2018-04-04 16:35:28.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: mercurial -Version: 4.5.2 +Version: 4.5.3 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-4.5.2/doc/hg-ssh.8.html new/mercurial-4.5.3/doc/hg-ssh.8.html --- old/mercurial-4.5.2/doc/hg-ssh.8.html 2018-03-06 20:20:05.000000000 +0100 +++ new/mercurial-4.5.3/doc/hg-ssh.8.html 2018-04-04 16:35:17.000000000 +0200 @@ -3,7 +3,7 @@ <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.13.1: http://docutils.sourceforge.net/"; /> +<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" /> @@ -22,9 +22,9 @@ <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="manual-section field"><th class="docinfo-name">Manual section:</th><td class="field-body">8</td> +<tr class="field"><th class="docinfo-name">Manual section:</th><td class="field-body">8</td> </tr> -<tr class="manual-group field"><th class="docinfo-name">Manual group:</th><td class="field-body">Mercurial Manual</td> +<tr class="field"><th class="docinfo-name">Manual group:</th><td class="field-body">Mercurial Manual</td> </tr> </tbody> </table> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/doc/hg.1.html new/mercurial-4.5.3/doc/hg.1.html --- old/mercurial-4.5.2/doc/hg.1.html 2018-03-06 20:20:09.000000000 +0100 +++ new/mercurial-4.5.3/doc/hg.1.html 2018-04-04 16:35:20.000000000 +0200 @@ -3,7 +3,7 @@ <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.13.1: http://docutils.sourceforge.net/"; /> +<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/"; /> <title>hg</title> <meta name="author" content="Matt Mackall <mpm@selenic.com>" /> <meta name="organization" content="Mercurial" /> @@ -22,9 +22,9 @@ <td>Matt Mackall <<a class="reference external" href="mailto:mpm@selenic.com";>mpm@selenic.com</a>></td></tr> <tr><th class="docinfo-name">Organization:</th> <td>Mercurial</td></tr> -<tr class="manual-section field"><th class="docinfo-name">Manual section:</th><td class="field-body">1</td> +<tr class="field"><th class="docinfo-name">Manual section:</th><td class="field-body">1</td> </tr> -<tr class="manual-group field"><th class="docinfo-name">Manual group:</th><td class="field-body">Mercurial Manual</td> +<tr class="field"><th class="docinfo-name">Manual group:</th><td class="field-body">Mercurial Manual</td> </tr> </tbody> </table> @@ -175,7 +175,7 @@ undo an add before that, see <a class="reference external" href="hg.1.html#forget"><tt class="docutils literal">hg forget</tt></a>.</p> <p>If no names are given, add all files to the repository (except files matching <tt class="docutils literal">.hgignore</tt>).</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <blockquote> <ul> @@ -252,7 +252,7 @@ used to check which files were identified as moved or renamed. If not specified, -s/--similarity defaults to 100 and only renames of identical files are detected.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <blockquote> <ul> @@ -428,7 +428,7 @@ directory; use -r/--rev to specify a different revision.</p> <p>The archive type is automatically detected based on file extension (to override, use -t/--type).</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">create a zip file containing the 1.0 release:</p> @@ -515,12 +515,12 @@ it will be committed immediately.</p> <p>If REV is the parent of the working directory, then this new changeset is committed automatically (unless --no-commit is specified).</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last"><a class="reference external" href="hg.1.html#backout"><tt class="docutils literal">hg backout</tt></a> cannot be used to fix either an unwanted or incorrect merge.</p> </div> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">Reverse the effect of the parent of the working directory. @@ -635,7 +635,7 @@ means to skip the revision, 127 (command not found) will abort the bisection, and any other non-zero exit status means the revision is bad.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Some examples:</p> <ul> <li><p class="first">start a bisection with known bad revision 34, and good revision 12:</p> @@ -755,7 +755,7 @@ the active bookmark's name.</p> <p>A bookmark named '@' has the special property that <a class="reference external" href="hg.1.html#clone"><tt class="docutils literal">hg clone</tt></a> will check it out by default if it exists.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">create an active bookmark for a new line of development:</p> @@ -822,7 +822,7 @@ <pre class="literal-block"> hg branch [-fC] [NAME] </pre> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Branch names are permanent and global. Use <a class="reference external" href="hg.1.html#bookmark"><tt class="docutils literal">hg bookmark</tt></a> to create a light-weight bookmark instead. See <a class="reference external" href="hg.1.html#glossary"><tt class="docutils literal">hg help glossary</tt></a> for more @@ -1058,12 +1058,12 @@ a modern client may inherit legacy or inefficient storage used by the remote or a legacy Mercurial client may not be able to clone from a modern Mercurial remote.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Specifying a tag will include the tagged changeset but not the changeset containing the tag.</p> </div> -<div class="verbose docutils container"> +<div class="verbose container"> <p>For efficiency, hardlinks are used for cloning whenever the source and destination are on the same filesystem (note this applies only to the repository data, not to the working @@ -1205,7 +1205,7 @@ or changesets that have children.</p> <p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p> <p>Returns 0 on success, 1 if nothing changed.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">commit all files ending in .py:</p> @@ -1379,7 +1379,7 @@ </pre> <p>Show differences between revisions for the specified files.</p> <p>Differences between files are shown using the unified diff format.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last"><a class="reference external" href="hg.1.html#diff"><tt class="docutils literal">hg diff</tt></a> may generate unexpected results for merges, as it will default to comparing against the working directory's first @@ -1397,7 +1397,7 @@ anyway, probably with undesirable results.</p> <p>Use the -g/--git option to generate diffs in the git extended diff format. For more information, read <a class="reference external" href="hg.1.html#diffs"><tt class="docutils literal">hg help diffs</tt></a>.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">compare a file in the current working directory to its parent:</p> @@ -1517,7 +1517,7 @@ <p>The information shown in the changeset header is: author, date, branch name (if non-default), changeset hash, parent(s) and commit comment.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last"><a class="reference external" href="hg.1.html#export"><tt class="docutils literal">hg export</tt></a> may generate unexpected diff output for merge changesets, as it will compare the merge changeset against its @@ -1556,7 +1556,7 @@ format. See <a class="reference external" href="hg.1.html#diffs"><tt class="docutils literal">hg help diffs</tt></a> for more information.</p> <p>With the --switch-parent option, the diff will be against the second parent. It can be useful to review a merge.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">use export and import to transplant a bugfix to the current @@ -1624,7 +1624,7 @@ Files can be specified as filenames or filesets.</p> <p>If no files are given to match, this command prints the names of all files under Mercurial control.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">list all files under the current directory:</p> @@ -1706,7 +1706,7 @@ working directory.</p> <p>To delete the file from the working directory, see <a class="reference external" href="hg.1.html#remove"><tt class="docutils literal">hg remove</tt></a>.</p> <p>To undo a forget before the next commit, see <a class="reference external" href="hg.1.html#add"><tt class="docutils literal">hg add</tt></a>.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">forget newly-added binary files:</p> @@ -1764,12 +1764,12 @@ interrupted so that the current merge can be manually resolved. Once all conflicts are addressed, the graft process can be continued with the -c/--continue option.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">The -c/--continue option does not reapply earlier options, except for --force.</p> </div> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">copy a single change to the stable branch and edit its description:</p> @@ -2022,7 +2022,7 @@ of the working directory parent without scanning uncommitted changes.</p> <p>Specifying a path to a repository root or Mercurial bundle will cause lookup to operate on that repository/bundle.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">generate a build identifier for the working directory:</p> @@ -2131,7 +2131,7 @@ changeset. This flag exists to let people import patches that partially apply without losing the associated metadata (author, date, description, ...).</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">When no hunks apply cleanly, <a class="reference external" href="hg.1.html#import"><tt class="docutils literal">hg import <span class="pre">--partial</span></tt></a> will create an empty changeset, importing only the patch metadata.</p> @@ -2144,7 +2144,7 @@ See <a class="reference external" href="hgrc.5.html"><tt class="docutils literal">hg help config</tt></a> for more information about configuration files and how to use these options.</p> <p>See <a class="reference external" href="hg.1.html#dates"><tt class="docutils literal">hg help dates</tt></a> for a list of formats valid for -d/--date.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">import a traditional patch from a website and detect renames:</p> @@ -2260,7 +2260,7 @@ pull location. These are the changesets that would have been pulled by <a class="reference external" href="hg.1.html#pull"><tt class="docutils literal">hg pull</tt></a> at the time you issued this command.</p> <p>See pull for valid source format details.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>With -B/--bookmarks, the result of bookmark comparison between local and remote repositories is displayed. With -v/--verbose, status is also displayed for each bookmark like below:</p> @@ -2290,7 +2290,7 @@ existing only in the remote repository are treated as <tt class="docutils literal">added</tt>, even if it is in fact locally deleted.</p> </div> -<div class="verbose docutils container"> +<div class="verbose container"> <p>For remote repository, using --bundle avoids downloading the changesets twice if the incoming is followed by a pull.</p> <p>Examples:</p> @@ -2494,34 +2494,34 @@ line. Paths in the DAG are represented with '|', '/' and so forth. ':' in place of a '|' indicates one or more revisions in a path are omitted.</p> -<div class="verbose docutils container"> +<div class="verbose container"> Use -L/--line-range FILE,M:N options to follow the history of lines from M to N in FILE. With -p/--patch only diff hunks affecting specified line range will be shown. This option requires --follow; it can be specified multiple times. Currently, this option is not compatible with --graph. This option is experimental.</div> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last"><a class="reference external" href="hg.1.html#log"><tt class="docutils literal">hg log <span class="pre">--patch</span></tt></a> may generate unexpected diff output for merge changesets, as it will only compare the merge changeset against its first parent. Also, only files different from BOTH parents will appear in files:.</p> </div> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">For performance reasons, <a class="reference external" href="hg.1.html#log"><tt class="docutils literal">hg log FILE</tt></a> may omit duplicate changes made on branches and will not show removals or mode changes. To see all such changes, use the --removed switch.</p> </div> -<div class="verbose docutils container"> -<div class="admonition note"> +<div class="verbose container"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">The history resulting from -L/--line-range options depends on diff options; for instance if white-spaces are ignored, respective changes with only white-spaces in specified line range will not be listed.</p> </div> </div> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Some examples:</p> <ul> <li><p class="first">changesets with full descriptions and file lists:</p> @@ -2787,7 +2787,7 @@ or the default push location. These are the changesets that would be pushed if a push was requested.</p> <p>See pull for details of valid destination formats.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>With -B/--bookmarks, the result of bookmark comparison between local and remote repositories is displayed. With -v/--verbose, status is also displayed for each bookmark like below:</p> @@ -2953,7 +2953,7 @@ <tt class="docutils literal">default</tt> will be used for pull; otherwise <tt class="docutils literal">default</tt> is used as the fallback for both. When cloning a repository, the clone source is written as <tt class="docutils literal">default</tt> in <tt class="docutils literal">.hg/hgrc</tt>.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last"><tt class="docutils literal">default</tt> and <tt class="docutils literal"><span class="pre">default-push</span></tt> apply to all inbound (e.g. <a class="reference external" href="hg.1.html#incoming"><tt class="docutils literal">hg incoming</tt></a>) and outbound (e.g. <a class="reference external" href="hg.1.html#outgoing"><tt class="docutils literal">hg outgoing</tt></a>, <a class="reference external" href="hg.1.html#email"><tt class="docutils literal">hg email</tt></a> @@ -3089,7 +3089,7 @@ <p>Use --new-branch if you want to allow push to create a new named branch that is not present at the destination. This allows you to only create a new branch without forcing other changes.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Extra care should be taken with the -f/--force option, which will push all new heads on all branches, an action which will @@ -3103,7 +3103,7 @@ bookmark's name.</p> <p>Please see <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for important details about <tt class="docutils literal"><span class="pre">ssh://</span></tt> URLs. If DESTINATION is omitted, a default path will be used.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>The --pushvars option sends strings to the server that become environment variables prepended with <tt class="docutils literal">HG_USERVAR_</tt>. For example, <tt class="docutils literal"><span class="pre">--pushvars</span> ENABLE_FEATURE=true</tt>, provides the server side hooks with @@ -3185,7 +3185,7 @@ <p>This command schedules the files to be removed at the next commit. To undo a remove before that, see <a class="reference external" href="hg.1.html#revert"><tt class="docutils literal">hg revert</tt></a>. To undo added files, see <a class="reference external" href="hg.1.html#forget"><tt class="docutils literal">hg forget</tt></a>.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>-A/--after can be used to remove only files that have already been deleted, -f/--force can be used to force deletion, and -Af can be used to remove files from the next revision without @@ -3238,7 +3238,7 @@ </tr> </tbody> </table> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last"><a class="reference external" href="hg.1.html#remove"><tt class="docutils literal">hg remove</tt></a> never deletes files in Added [A] state from the working directory, not even if <tt class="docutils literal"><span class="pre">--force</span></tt> is specified.</p> @@ -3348,7 +3348,7 @@ You can use <tt class="docutils literal">set:unresolved()</tt> or <tt class="docutils literal">set:resolved()</tt> to filter the list. See <a class="reference external" href="hg.1.html#filesets"><tt class="docutils literal">hg help filesets</tt></a> for details.</li> </ul> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Mercurial will not let you commit files with unresolved merge conflicts. You must use <a class="reference external" href="hg.1.html#resolve"><tt class="docutils literal">hg resolve <span class="pre">-m</span> ...</tt></a> before you can @@ -3402,7 +3402,7 @@ <pre class="literal-block"> hg revert [OPTION]... [-r REV] [NAME]... </pre> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">To check out earlier revisions, you should use <a class="reference external" href="hg.1.html#update"><tt class="docutils literal">hg update REV</tt></a>. To cancel an uncommitted merge (and lose your changes), @@ -3484,7 +3484,7 @@ <p>Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>For example, the following commands are transactional, and their effects can be rolled back:</p> <ul class="simple"> @@ -3645,7 +3645,7 @@ options -mardu are used.</p> <p>Option -q/--quiet hides untracked (unknown and ignored) files unless explicitly requested with -u/--unknown or -i/--ignored.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last"><a class="reference external" href="hg.1.html#status"><tt class="docutils literal">hg status</tt></a> may appear to disagree with diff if permissions have changed or a merge has occurred. The standard diff format does @@ -3667,7 +3667,7 @@ I = ignored = origin of the previous file (with --copies) </pre> -<div class="verbose docutils container"> +<div class="verbose container"> <p>The -t/--terse option abbreviates the output by showing only the directory name if all the files in it share the same status. The option takes an argument indicating the statuses to abbreviate: 'm' for 'modified', 'a' @@ -3967,7 +3967,7 @@ aborted. With the -c/--check option, the working directory is checked for uncommitted changes; if none are found, the working directory is updated to the specified changeset.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>The -C/--clean, -c/--check, and -m/--merge options control what happens if the working directory contains uncommitted changes. At most of one of them can be specified.</p> @@ -4176,7 +4176,7 @@ color = no </pre> <p>See <a class="reference external" href="hgrc.5.html#ui"><tt class="docutils literal">hg help config.ui.color</tt></a> for details.</p> -<div class="windows docutils container"> +<div class="windows container"> The default pager on Windows does not support color, so enabling the pager will effectively disable color. See <a class="reference external" href="hgrc.5.html#ui"><tt class="docutils literal">hg help config.ui.paginate</tt></a> to disable the pager. Alternately, MSYS and Cygwin shells provide <cite>less</cite> as a pager, @@ -5237,7 +5237,7 @@ <p>Subdirectories can have their own .hgignore settings by adding <tt class="docutils literal"><span class="pre">subinclude:path/to/subdir/.hgignore</span></tt> to the root <tt class="docutils literal">.hgignore</tt>. See <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details on <tt class="docutils literal">subinclude:</tt> and <tt class="docutils literal">include:</tt>.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Patterns specified in other than <tt class="docutils literal">.hgignore</tt> are always rooted. Please see <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details.</p> @@ -5649,7 +5649,7 @@ internal <tt class="docutils literal">:merge</tt> is used.</li> <li>Otherwise, <tt class="docutils literal">:prompt</tt> is used.</li> </ol> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">After selecting a merge program, Mercurial will by default attempt to merge the files using a simple merge algorithm first. Only if it doesn't @@ -5675,7 +5675,7 @@ environment variable $PAGER. If $PAGER is not set, pager.pager from the default or system configuration is used. If none of these are set, a default pager will be used, typically <cite>less</cite> on Unix and <cite>more</cite> on Windows.</p> -<div class="windows docutils container"> +<div class="windows container"> On Windows, <cite>more</cite> is not color aware, so using it effectively disables color. MSYS and Cygwin shells provide <cite>less</cite> as a pager, which can be configured to support ANSI color codes. See <a class="reference external" href="hgrc.5.html#color"><tt class="docutils literal">hg help config.color.pagermode</tt></a> to configure @@ -5712,7 +5712,7 @@ <p>By default, Mercurial treats filenames as shell-style extended glob patterns.</p> <p>Alternate pattern notations must be specified explicitly.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Patterns specified in <tt class="docutils literal">.hgignore</tt> are not rooted. Please see <a class="reference external" href="hg.1.html#hgignore"><tt class="docutils literal">hg help hgignore</tt></a> for details.</p> @@ -5829,7 +5829,7 @@ - secret changesets are neither pushed, pulled, or cloned </pre> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Pulling a draft changeset from a publishing server does not mark it as public on the server side due to the read-only nature of pull.</p> @@ -5842,12 +5842,12 @@ publish = False </pre> <p>See <a class="reference external" href="hgrc.5.html"><tt class="docutils literal">hg help config</tt></a> for more information on configuration files.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Servers running older versions of Mercurial are treated as publishing.</p> </div> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Changesets in secret phase are not exchanged with the server. This applies to their content: file names, file contents, and changeset @@ -6385,7 +6385,7 @@ advantage over simple <tt class="docutils literal">hg</tt> process invocations in that they are likely more efficient. This is because there is significant overhead to spawn new Python processes.</p> -<div class="admonition tip"> +<div class="tip"> <p class="first admonition-title">Tip</p> <p class="last">If you need to invoke several <tt class="docutils literal">hg</tt> processes in short order and/or performance is important to you, use of a server-based interface @@ -6482,7 +6482,7 @@ example, <tt class="docutils literal">log <span class="pre">-T</span> <span class="pre">{node}\n</span></tt> can be used to print a newline delimited list of changeset nodes instead of a human-tailored output containing authors, dates, descriptions, etc.</p> -<div class="admonition tip"> +<div class="tip"> <p class="first admonition-title">Tip</p> <p class="last">If parsing raw command output is too complicated, consider using templates to make your life easier.</p> @@ -6491,7 +6491,7 @@ Mercurial ships with the machine-readable styles <tt class="docutils literal">json</tt> and <tt class="docutils literal">xml</tt>, which provide JSON and XML output, respectively. These are useful for producing output that is machine readable as-is.</p> -<div class="admonition important"> +<div class="important"> <p class="first admonition-title">Important</p> <p>The <tt class="docutils literal">json</tt> and <tt class="docutils literal">xml</tt> styles are considered experimental. While they may be attractive to use for easily obtaining machine-readable @@ -6580,7 +6580,7 @@ subrepositories to the state they were committed in a parent repository changeset. Mercurial automatically record the nested repositories states when committing in the parent repository.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">The <tt class="docutils literal">.hgsubstate</tt> file should not be edited manually.</p> </div> @@ -8684,7 +8684,7 @@ destination subrepositories contain the <dest>/<sub>/.hg/shamap file. Converting a repository with subrepositories requires converting a single repository at a time, from the bottom up.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>An example showing how to convert a repository with subrepositories:</p> <pre class="literal-block"> # so convert knows the type when it sees a non empty destination @@ -8837,7 +8837,7 @@ [repository] native = LF </pre> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">The rules will first apply when files are touched in the working directory, e.g. by updating to null and back to tip to touch all files.</p> @@ -9617,7 +9617,7 @@ default, this selects the editable history that is unique to the ancestry of the working directory.</li> </ul> -<div class="verbose docutils container"> +<div class="verbose container"> <p>If you use --outgoing, this command will abort if there are ambiguous outgoing revisions. For example, if there are multiple branches containing outgoing revisions.</p> @@ -9626,7 +9626,7 @@ such ambiguous situation. See <a class="reference external" href="hg.1.html#revsets"><tt class="docutils literal">hg help revsets</tt></a> for detail about selecting revisions.</p> </div> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <blockquote> <ul> @@ -9811,7 +9811,7 @@ # prefer svn- over cvs-like default keywordmaps svn = True </pre> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">The more specific you are in your filename patterns the less you lose speed in huge repositories.</p> @@ -10105,7 +10105,7 @@ locally, pulling from a remote repository to the local cache.</p> <p>If SOURCE is omitted, the 'default' path will be used. See <a class="reference external" href="hg.1.html#urls"><tt class="docutils literal">hg help urls</tt></a> for more information.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Some examples:</p> <ul> <li><p class="first">pull largefiles for all branch heads:</p> @@ -10681,7 +10681,7 @@ has activated it.</p> <p>With no arguments, print the currently active guards. With arguments, set guards for the named patch.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Specifying negative guards now requires '--'.</p> </div> @@ -11802,7 +11802,7 @@ deleted, there is no hook presently available for this.</p> <p>If a rebase is interrupted to manually resolve a conflict, it can be continued with --continue/-c or aborted with --abort/-a.</p> -<div class="verbose docutils container"> +<div class="verbose container"> <p>Examples:</p> <ul> <li><p class="first">move "local changes" (current commit back to branching point) @@ -12268,7 +12268,7 @@ </pre> <p>Initialize a new repository and working directory that shares its history (and optionally bookmarks) with another repository.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">using rollback or extensions that destroy/modify history (mq, rebase, etc.) can cause considerable confusion with shared @@ -12435,7 +12435,7 @@ backup directory. Only the N most recent backups are kept. N defaults to 10 but can be overridden using the <tt class="docutils literal">shelve.maxbackups</tt> configuration option.</p> -<div class="verbose docutils container"> +<div class="verbose container"> Timestamp in seconds is used to decide order of backups. More than <tt class="docutils literal">maxbackups</tt> backups are kept, if same timestamp prevents from deciding exact order of them, for safety.</div> @@ -12499,7 +12499,7 @@ <p>A requested view of repository data is displayed.</p> <p>If no view is requested, the list of available views is shown and the command aborts.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p>There are no backwards compatibility guarantees for the output of this command. Output may change in any future Mercurial release.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/doc/hgignore.5.html new/mercurial-4.5.3/doc/hgignore.5.html --- old/mercurial-4.5.2/doc/hgignore.5.html 2018-03-06 20:20:09.000000000 +0100 +++ new/mercurial-4.5.3/doc/hgignore.5.html 2018-04-04 16:35:21.000000000 +0200 @@ -3,7 +3,7 @@ <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.13.1: http://docutils.sourceforge.net/"; /> +<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/"; /> <title>hgignore</title> <meta name="author" content="Vadim Gelfer <vadim.gelfer@gmail.com>" /> <meta name="organization" content="Mercurial" /> @@ -22,9 +22,9 @@ <td>Vadim Gelfer <<a class="reference external" href="mailto:vadim.gelfer@gmail.com";>vadim.gelfer@gmail.com</a>></td></tr> <tr><th class="docinfo-name">Organization:</th> <td>Mercurial</td></tr> -<tr class="manual-section field"><th class="docinfo-name">Manual section:</th><td class="field-body">5</td> +<tr class="field"><th class="docinfo-name">Manual section:</th><td class="field-body">5</td> </tr> -<tr class="manual-group field"><th class="docinfo-name">Manual group:</th><td class="field-body">Mercurial Manual</td> +<tr class="field"><th class="docinfo-name">Manual group:</th><td class="field-body">Mercurial Manual</td> </tr> </tbody> </table> @@ -89,7 +89,7 @@ <p>Subdirectories can have their own .hgignore settings by adding <tt class="docutils literal"><span class="pre">subinclude:path/to/subdir/.hgignore</span></tt> to the root <tt class="docutils literal">.hgignore</tt>. See <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details on <tt class="docutils literal">subinclude:</tt> and <tt class="docutils literal">include:</tt>.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Patterns specified in other than <tt class="docutils literal">.hgignore</tt> are always rooted. Please see <a class="reference external" href="hg.1.html#patterns"><tt class="docutils literal">hg help patterns</tt></a> for details.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/doc/hgrc.5.html new/mercurial-4.5.3/doc/hgrc.5.html --- old/mercurial-4.5.2/doc/hgrc.5.html 2018-03-06 20:20:10.000000000 +0100 +++ new/mercurial-4.5.3/doc/hgrc.5.html 2018-04-04 16:35:22.000000000 +0200 @@ -3,7 +3,7 @@ <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.13.1: http://docutils.sourceforge.net/"; /> +<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/"; /> <title>hgrc</title> <meta name="author" content="Bryan O'Sullivan <bos@serpentine.com>" /> <meta name="organization" content="Mercurial" /> @@ -22,9 +22,9 @@ <td>Bryan O'Sullivan <<a class="reference external" href="mailto:bos@serpentine.com";>bos@serpentine.com</a>></td></tr> <tr><th class="docinfo-name">Organization:</th> <td>Mercurial</td></tr> -<tr class="manual-section field"><th class="docinfo-name">Manual section:</th><td class="field-body">5</td> +<tr class="field"><th class="docinfo-name">Manual section:</th><td class="field-body">5</td> </tr> -<tr class="manual-group field"><th class="docinfo-name">Manual group:</th><td class="field-body">Mercurial Manual</td> +<tr class="field"><th class="docinfo-name">Manual group:</th><td class="field-body">Mercurial Manual</td> </tr> </tbody> </table> @@ -116,12 +116,12 @@ appropriate configuration files yourself:</p> <p>Local configuration is put into the per-repository <tt class="docutils literal"><span class="pre"><repo>/.hg/hgrc</span></tt> file.</p> <p>Global configuration like the username setting is typically put into:</p> -<div class="windows docutils container"> +<div class="windows container"> <ul class="simple"> <li><tt class="docutils literal"><span class="pre">%USERPROFILE%\mercurial.ini</span></tt> (on Windows)</li> </ul> </div> -<div class="unix-plan9 docutils container"> +<div class="unix-plan9 container"> <ul class="simple"> <li><tt class="docutils literal"><span class="pre">$HOME/.hgrc</span></tt> (on Unix, Plan9)</li> </ul> @@ -131,7 +131,7 @@ alphabetical order, later ones overriding earlier ones. Where multiple paths are given below, settings from earlier paths override later ones.</p> -<div class="verbose-unix docutils container"> +<div class="verbose-unix container"> <p>On Unix, the following files are consulted:</p> <ul class="simple"> <li><tt class="docutils literal"><span class="pre"><repo>/.hg/hgrc</span></tt> (per-repository)</li> @@ -144,7 +144,7 @@ <li><tt class="docutils literal"><span class="pre"><internal>/default.d/*.rc</span></tt> (defaults)</li> </ul> </div> -<div class="verbose-windows docutils container"> +<div class="verbose-windows container"> <p>On Windows, the following files are consulted:</p> <ul class="simple"> <li><tt class="docutils literal"><span class="pre"><repo>/.hg/hgrc</span></tt> (per-repository)</li> @@ -157,15 +157,15 @@ <li><tt class="docutils literal"><span class="pre"><install-dir>\Mercurial.ini</span></tt> (per-installation)</li> <li><tt class="docutils literal"><span class="pre"><internal>/default.d/*.rc</span></tt> (defaults)</li> </ul> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">The registry key <tt class="docutils literal">HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial</tt> is used when running 32-bit Python on 64-bit Windows.</p> </div> </div> -<div class="windows docutils container"> +<div class="windows container"> On Windows 9x, <tt class="docutils literal">%HOME%</tt> is replaced by <tt class="docutils literal">%APPDATA%</tt>.</div> -<div class="verbose-plan9 docutils container"> +<div class="verbose-plan9 container"> <p>On Plan9, the following files are consulted:</p> <ul class="simple"> <li><tt class="docutils literal"><span class="pre"><repo>/.hg/hgrc</span></tt> (per-repository)</li> @@ -181,7 +181,7 @@ particular repository. This file is not version-controlled, and will not get transferred during a "clone" operation. Options in this file override options in all other configuration files.</p> -<div class="unix-plan9 docutils container"> +<div class="unix-plan9 container"> On Plan 9 and Unix, most of this file will be ignored if it doesn't belong to a trusted user or to a trusted group. See <a class="reference external" href="hgrc.5.html#trusted"><tt class="docutils literal">hg help config.trusted</tt></a> for more details.</div> @@ -192,7 +192,7 @@ <p>Per-installation configuration files are searched for in the directory where Mercurial is installed. <tt class="docutils literal"><span class="pre"><install-root></span></tt> is the parent directory of the <strong>hg</strong> executable (or symlink) being run.</p> -<div class="unix-plan9 docutils container"> +<div class="unix-plan9 container"> For example, if installed in <tt class="docutils literal">/shared/tools/bin/hg</tt>, Mercurial will look in <tt class="docutils literal">/shared/tools/etc/mercurial/hgrc</tt>. Options in these files apply to all Mercurial commands executed by any user in any @@ -319,7 +319,7 @@ <pre class="literal-block"> stable5 = latest -b stable </pre> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">It is possible to create aliases with the same names as existing commands, which will then override the original @@ -350,7 +350,7 @@ alias, as was done above for the purge alias. In addition, <tt class="docutils literal">$HG_ARGS</tt> expands to the arguments given to Mercurial. In the <tt class="docutils literal">hg echo foo</tt> call above, <tt class="docutils literal">$HG_ARGS</tt> would expand to <tt class="docutils literal">echo foo</tt>.</p> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Some global configuration options such as <tt class="docutils literal"><span class="pre">-R</span></tt> are processed before shell aliases and will thus not be passed to @@ -553,7 +553,7 @@ HG: Everything below will be removed. {diff()} </pre> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p>For some problematic encodings (see <a class="reference external" href="hg.1.html#win32mbcs"><tt class="docutils literal">hg help win32mbcs</tt></a> for detail), this customization should be configured carefully, to @@ -662,8 +662,8 @@ filtered by the command. The string <tt class="docutils literal">OUTFILE</tt> is replaced with the name of an empty temporary file, where the filtered data must be written by the command.</p> -<div class="windows docutils container"> -<div class="admonition note"> +<div class="windows container"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">The tempfile mechanism is recommended for Windows systems, where the standard shell I/O redirection operators often have @@ -1053,7 +1053,7 @@ parent is in <tt class="docutils literal">$HG_PARENT2</tt>. If the update succeeded, <tt class="docutils literal">$HG_ERROR=0</tt>. If the update failed (e.g. because conflicts were not resolved), <tt class="docutils literal">$HG_ERROR=1</tt>.</dd> </dl> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">It is generally better to use standard hooks rather than the generic pre- and post- command hooks, as they are guaranteed to be @@ -1061,7 +1061,7 @@ Also, hooks like "commit" will be called in all contexts that generate a commit (e.g. tag) and not just the commit command.</p> </div> -<div class="admonition note"> +<div class="note"> <p class="first admonition-title">Note</p> <p class="last">Environment variables with empty values may not be passed to hooks on platforms such as Windows. As an example, <tt class="docutils literal">$HG_PARENT2</tt> @@ -1290,7 +1290,7 @@ (default: 0)</dd> <dt><tt class="docutils literal">executable</tt></dt> <dd><p class="first">Either just the name of the executable or its pathname.</p> -<div class="windows docutils container"> +<div class="windows container"> On Windows, the path can use environment variables with ${ProgramFiles} syntax.</div> <p class="last">(default: the tool name)</p> @@ -1336,7 +1336,7 @@ <dt><tt class="docutils literal">gui</tt></dt> <dd>This tool requires a graphical interface to run. (default: False)</dd> </dl> -<div class="windows docutils container"> +<div class="windows container"> <dl class="docutils"> <dt><tt class="docutils literal">regkey</tt></dt> <dd>Windows registry key which describes install location of this @@ -1997,7 +1997,7 @@ <dt><tt class="docutils literal">false</tt></dt> <dd>Alias for <tt class="docutils literal">ignore</tt>.</dd> </dl> -<div class="windows last docutils container"> +<div class="windows last container"> On Windows, this configuration option is ignored and the command aborted.</div> </dd> <dt><tt class="docutils literal">quiet</tt></dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/hgext/rebase.py new/mercurial-4.5.3/hgext/rebase.py --- old/mercurial-4.5.2/hgext/rebase.py 2018-03-06 20:19:51.000000000 +0100 +++ new/mercurial-4.5.3/hgext/rebase.py 2018-04-04 16:35:08.000000000 +0200 @@ -1543,9 +1543,10 @@ try: # If the first commits in the rebased set get skipped during the rebase, # their values within the state mapping will be the dest rev id. The - # dstates list must must not contain the dest rev (issue4896) - dstates = [s for r, s in state.items() if s >= 0 and s != destmap[r]] - immutable = [d for d in dstates if not repo[d].mutable()] + # rebased list must must not contain the dest rev (issue4896) + rebased = [s for r, s in state.items() + if s >= 0 and s != r and s != destmap[r]] + immutable = [d for d in rebased if not repo[d].mutable()] cleanup = True if immutable: repo.ui.warn(_("warning: can't clean up public changesets %s\n") @@ -1554,17 +1555,15 @@ cleanup = False descendants = set() - if dstates: - descendants = set(repo.changelog.descendants(dstates)) - if descendants - set(dstates): + if rebased: + descendants = set(repo.changelog.descendants(rebased)) + if descendants - set(rebased): repo.ui.warn(_("warning: new changesets detected on destination " "branch, can't strip\n")) cleanup = False if cleanup: shouldupdate = False - rebased = [s for r, s in state.items() - if s >= 0 and s != destmap[r]] if rebased: strippoints = [ c.node() for c in repo.set('roots(%ld)', rebased)] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/mercurial/__version__.py new/mercurial-4.5.3/mercurial/__version__.py --- old/mercurial-4.5.2/mercurial/__version__.py 2018-03-06 20:20:12.000000000 +0100 +++ new/mercurial-4.5.3/mercurial/__version__.py 2018-04-04 16:35:23.000000000 +0200 @@ -1,2 +1,2 @@ # this file is autogenerated by setup.py -version = "4.5.2" +version = "4.5.3" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/mercurial/cmdutil.py new/mercurial-4.5.3/mercurial/cmdutil.py --- old/mercurial-4.5.2/mercurial/cmdutil.py 2018-03-06 20:19:51.000000000 +0100 +++ new/mercurial-4.5.3/mercurial/cmdutil.py 2018-04-04 16:35:08.000000000 +0200 @@ -34,6 +34,7 @@ graphmod, match as matchmod, mdiff, + mergeutil, obsolete, patch, pathutil, @@ -3212,6 +3213,11 @@ if subs: subrepo.writestate(repo, newsubstate) + # avoid cycle (TODO: should be removed in default branch) + from . import merge as mergemod + ms = mergemod.mergestate.read(repo) + mergeutil.checkunresolved(ms) + filestoamend = set(f for f in wctx.files() if matcher(f)) changes = (len(filestoamend) > 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/mercurial/hgweb/hgwebdir_mod.py new/mercurial-4.5.3/mercurial/hgweb/hgwebdir_mod.py --- old/mercurial-4.5.2/mercurial/hgweb/hgwebdir_mod.py 2018-03-06 20:19:51.000000000 +0100 +++ new/mercurial-4.5.3/mercurial/hgweb/hgwebdir_mod.py 2018-04-04 16:35:08.000000000 +0200 @@ -8,6 +8,7 @@ from __future__ import absolute_import +import gc import os import re import time @@ -224,8 +225,18 @@ def run_wsgi(self, req): profile = self.ui.configbool('profiling', 'enabled') with profiling.profile(self.ui, enabled=profile): - for r in self._runwsgi(req): - yield r + try: + for r in self._runwsgi(req): + yield r + finally: + # There are known cycles in localrepository that prevent + # those objects (and tons of held references) from being + # collected through normal refcounting. We mitigate those + # leaks by performing an explicit GC on every request. + # TODO remove this once leaks are fixed. + # TODO only run this on requests that create localrepository + # instances instead of every request. + gc.collect() def _runwsgi(self, req): try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/mercurial/hgweb/server.py new/mercurial-4.5.3/mercurial/hgweb/server.py --- old/mercurial-4.5.2/mercurial/hgweb/server.py 2018-03-06 20:19:51.000000000 +0100 +++ new/mercurial-4.5.3/mercurial/hgweb/server.py 2018-04-04 16:35:08.000000000 +0200 @@ -118,6 +118,14 @@ self.sent_headers = False path, query = _splitURI(self.path) + # Ensure the slicing of path below is valid + if (path != self.server.prefix + and not path.startswith(self.server.prefix + b'/')): + self._start_response(common.statusmessage(404), []) + self._write("Not Found") + self._done() + return + env = {} env[r'GATEWAY_INTERFACE'] = r'CGI/1.1' env[r'REQUEST_METHOD'] = self.command diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/tests/test-commit-amend.t new/mercurial-4.5.3/tests/test-commit-amend.t --- old/mercurial-4.5.2/tests/test-commit-amend.t 2018-03-06 20:19:51.000000000 +0100 +++ new/mercurial-4.5.3/tests/test-commit-amend.t 2018-04-04 16:35:08.000000000 +0200 @@ -415,6 +415,23 @@ [255] $ hg ci -m 'merge' +Refuse to amend if there is a merge conflict (issue5805): + + $ hg up -q foo + $ echo c > a + $ hg up default -t :fail + 0 files updated, 0 files merged, 0 files removed, 1 files unresolved + use 'hg resolve' to retry unresolved file merges + [1] + $ hg resolve -l + U a + + $ hg ci --amend + abort: unresolved merge conflicts (see 'hg help resolve') + [255] + + $ hg up -qC . + Follow copies/renames: $ hg mv b c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/tests/test-rebase-partial.t new/mercurial-4.5.3/tests/test-rebase-partial.t --- old/mercurial-4.5.2/tests/test-rebase-partial.t 2018-03-06 20:19:51.000000000 +0100 +++ new/mercurial-4.5.3/tests/test-rebase-partial.t 2018-04-04 16:35:08.000000000 +0200 @@ -69,6 +69,36 @@ |/ o 0: 426bada5c675 A +Abort doesn't lose the commits that were already in the right place + + $ hg init abort + $ cd abort + $ hg debugdrawdag <<EOF + > C + > | + > B D # B/file = B + > |/ # D/file = D + > A + > EOF + $ hg rebase -r C+D -d B + rebasing 2:ef8c0fe0897b "D" (D) + merging file + warning: conflicts while merging file! (edit, then use 'hg resolve --mark') + unresolved conflicts (see hg resolve, then hg rebase --continue) + [1] + $ hg rebase --abort + rebase aborted + $ hg tglog + o 3: 79f6d6ab7b14 C + | + | o 2: ef8c0fe0897b D + | | + o | 1: 594087dbaf71 B + |/ + o 0: 426bada5c675 A + + $ cd .. + Rebase with "holes". The commits after the hole should end up on the parent of the hole (B below), not on top of the destination (A). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mercurial-4.5.2/tests/test-serve.t new/mercurial-4.5.3/tests/test-serve.t --- old/mercurial-4.5.2/tests/test-serve.t 2018-03-06 20:19:51.000000000 +0100 +++ new/mercurial-4.5.3/tests/test-serve.t 2018-04-04 16:35:08.000000000 +0200 @@ -78,4 +78,24 @@ listening at http://localhost/foo/ (bound to *$LOCALIP*:HGPORT1) (glob) (?) % errors + $ $PYTHON $RUNTESTDIR/killdaemons.py $DAEMON_PIDS + +With out of bounds accesses + + $ rm access.log + $ hg serve -a localhost -p $HGPORT -d --prefix some/dir \ + > --pid-file=hg.pid -E errors.log + $ cat hg.pid >> "$DAEMON_PIDS" + + $ hg id http://localhost:$HGPORT/some/dir7 + abort: HTTP Error 404: Not Found + [255] + $ hg id http://localhost:$HGPORT/some + abort: HTTP Error 404: Not Found + [255] + + $ cat access.log errors.log + $LOCALIP - - [$LOGDATE$] "GET /some/dir7?cmd=capabilities HTTP/1.1" 404 - (glob) + $LOCALIP - - [$LOGDATE$] "GET /some?cmd=capabilities HTTP/1.1" 404 - (glob) + $ cd ..
