py3: convert server-string to unicode to make http library happy

py3: fix dumbhttp.py to convert --daemon-postexec arguments back to bytes

py3: use bytes.endswith() instead of bytes[n]

diff: graduate word-diff option from experimental Per 4.6 Sprint notes. I've also made it gated by "formatchanging" since it could change the output if we had an option to highlight words without using colors.

fix: add test case that shows why --whole with --base is useful Differential Revision: https://phab.mercurial-scm.org/D3894

context: raise ProgrammingError on repo['my-tag'] We had an internal extension that I had failed to migrate off of the deprecated API and its "'my-tag' in repo" check just started returning False. It took a while to figure out that that was what was happening. This patch would have helped. Differential Revision: https://phab.mercurial-scm.org/D3895

diffutil: move the module out of utils package mercurial.utils modules inherit the property of the mercurial.util, which is no dependency on ui, repo, ctx, etc. As the diffutil module seems to reside in the scmutil layer, it's probably better to not put it under the utils package.

diffutil: remove diffopts() in favor of diffallopts() patch.diffopts() exists only for backward compatibility. We don't need it in new module.

obsutil: use public interface to access to repo.ui

hgweb: pass ui to diffstatgen() explicitly

synthrepo: simply use the ui passed as a function argument

templatekw: obtain ui directly from the template context

context: remove unneeded alias of diffopts

match: remove ctx argument from code path down to _buildmatch() 'ctx' was there only for filesets.

match: compose 'set:' pattern as matcher Baby step towards porting fileset to matcher composition. We can't use the exactmatcher since it would provide a computed set as exact paths. That's why we use the predicatematcher with fset.__contains__. This will be cleaned up later. The test change in test-glog.t means that the "set:copied()" pattern is no longer be processed as a slow path. That's because the fset is empty. This will also change in future patches.

match: resolve 'set:' patterns first in _buildmatch() This just makes the next patch less complicated. The order of 'set:' and 'subinclude:' expansion doesn't matter.

match: explode if unsupported pattern passed down to _regex() builder

match: add basic wrapper for boolean function This serves as a generic wrapper for fileset predicates. In future patches, a fileset expression will be mapped to a tree of matchers for a better support of match attributes such as visitdir(). For example, $ hg debugwalk -v 'set:contrib/** and binary()' * matcher: <intersectionmatcher m1=<patternmatcher patterns='(?:contrib/.*$)'>, m2=<predicatematcher pred=binary>> ...

stringutil: move _formatsetrepr() from smartset I'll add a matcher subclass wrapping a boolean function, which will use buildrepr() to provide debugging information in a similar way to smartset.filteredset.

pycompat: move rapply() from util I want to use rapply() in utils.* modules, but that would introduce a reference cycle util -> utils.* -> util. Moving rapply() to pycompat should be okay since it mostly serves as a compatibility helper.

strip: improve help text for --no-backup option Help text is modified to clearly define the meaning of --no-backup option. Differential Revision: https://phab.mercurial-scm.org/D3886

test-convert: demonstrate an unstable hash issue for bzr -> hg -> hg It looks like the manifest value changing is the only difference, but I'm not sure why it's happening. I've got a similar divergence in a production repo that was also converted from bzr and has an octopus merge[1]. Unlike here, the manifest values for the destination merge commits reflect the initial merge only, instead of all four merges agreeing like this test. $ hg -R src_repo manifest -r 310 --debug | grep file # octopus fixup merge 2d8775bc2481bd28ac87038ecdf33e1dbddc80e9 644 file1 6adb9353a55bb8be76e71382efc724ec3ccf7ed5 644 file2 $ hg -R src_repo manifest -r 309 --debug | grep file # first merge 362e7cb5163153c4989daad1a834871ae849f205 644 file1 2c65d947191938c3ea616b7ceb7648ff3843261f 644 file2 $ hg -R dst_repo manifest -r 273 --debug | grep file # octopus fixup merge 362e7cb5163153c4989daad1a834871ae849f205 644 file1 2c65d947191938c3ea616b7ceb7648ff3843261f 644 file2 $ hg -R dst_repo manifest -r 272 --debug | grep file # first merge 362e7cb5163153c4989daad1a834871ae849f205 644 file1 2c65d947191938c3ea616b7ceb7648ff3843261f 644 file2 This divergence is espcially annoying because unlike changelog differences, I haven't figured out a way to fix this in code. The only way I found to work around it is to convert up to the point of divergence, `hg bundle` the bad revision in the source, apply it to the destination, add a line to the shamap, and fire off the conversion again. But I suspect that there's more to it than just the octopus merge because I also have a commit in the same repo, done in Mercurial (well after the conversion) that is exhibiting a similar issue (and it's not a merge commit). I'm almost positive that it was created with 4.4 or later. Any ideas? [1] https://www.mercurial-scm.org/pipermail/mercurial/2018-June/050924.html

convert: add a config knob for not saving the bzr revision Now that the timestamp is fixed, the log of the Mercurial repo is still unstable with --debug, because the bzr commit ID keeps changing. Both hg and git implement `convert.*.saverev`, so do the same here.

test-bzr: use a fixed commit time This will help stabilize the hashes when converting to a Mercurial repo.

diff: use `context.diff` to produce diff We want to make sure `context.diff` if full featured. Using it in the main diff code path is a good way to do so. The end goal is to be able to easily compute diff between in-memory context.

context: no longer accept diff options as dictionnary Since we already broke the API earlier in this stack, there are no point to introducing a new deprecation warning.

obsutil: pass a diffopts object to context.diff

synthrepo: pass a diffopts object to context.diff

webutil: pass a diffopts object to context.diff

revset: pass an explicit `diffopts` objet to context.diff

template: directly instantiate diff options for diffstat

tests: update test-context.py to use diffopts as diff argument

diffutil: extract diff options code into a dedicated util-module We want to be able to create and use diffoptions in more places. Currently the official function to instantiate diffoptions live into `mercurial.patch`. A module too high level to be easily imported in some places. So we extract the diff options related function in their own utility module.

packaging: add fedora 28 Differential Revision: https://phab.mercurial-scm.org/D3892

packaging: add missing path segments in cp statements in fedora build Differential Revision: https://phab.mercurial-scm.org/D3891

packaging: fix misplaced ( in docker-fedora rule definition Differential Revision: https://phab.mercurial-scm.org/D3890

packaging: make help output correct for fedora and centos targets Differential Revision: https://phab.mercurial-scm.org/D3889

packaging: remove stray = that confuses make(1) on my Mac Differential Revision: https://phab.mercurial-scm.org/D3888

manifest: define and implement addgroup() on manifestlog Changegroup code was bypassing our manifest interface and calling a method on the private revlog attribute. This commit formalizes the interface for adding a group of revisions from deltas and changes the changegroup code to use it. This enables alternate manifest storage to work with changegroup application operations (like `hg unbundle` and `hg pull`). Differential Revision: https://phab.mercurial-scm.org/D3883

manifest: define and implement rev() on manifestlog Various code is accessing repo.manifestlog._revlog - a private attribute. This bypasses our interface and makes it difficult to implement non-revlog manifest storage. This commit adds a rev() method to the manifestlog interface and class and teaches callers to use it. Ideally this method wouldn't exist, as very few consumers should need to resolve the revision number of a manifest. Again, the primary goal of interface work is to establish and use interfaces first and to improve them later. Differential Revision: https://phab.mercurial-scm.org/D3882

tests: don't allow reodering of glob/re lines across non-glob/re lines As shown in the test case added in the previous patch, it can be really hard to interpret diffs from the test runner if there are multiple lines that would match a given glob or regular expression. It looks like this has been the case since 1ad0ddf8cccc (run-tests: teach _processoutput to handle multiple lines of churn, 2016-03-17). It seems like the point of that was to preserve the "(glob)" annotation on lines even if they got moved. This patch tries to preserve that but only allows the lines to be moved past other glob/re lines. Differential Revision: https://phab.mercurial-scm.org/D3881

tests: add test showing puzzling test output with (glob) lines When using multiple (glob) lines, the test runner often moves the lines around in the output on failure. I have run into this problem many times. The added test shows one example of this. Note that it doesn't show the mismatching lines and instead shows diff hunks that appear to replace a literal by a glob, and other hunks that should clearly match. Differential Revision: https://phab.mercurial-scm.org/D3880

tests: move handling of None "el" out of linematch() It just seems odd for linematch() to know what None means. Differential Revision: https://phab.mercurial-scm.org/D3879

tests: remove some redundant code in run-tests These two lines also happen below if "r" is truthy, which it is in this case since it's equal to "retry". Differential Revision: https://phab.mercurial-scm.org/D3878

tests: don't reimplement enumerate() in run-tests Differential Revision: https://phab.mercurial-scm.org/D3877

histedit: improve help text for --no-backup option Improved help text for --no-backup option to clearly define it's meaning. Differential Revision: https://phab.mercurial-scm.org/D3885

histedit: add --no-backup option (issue5825) This option provides a functionality to not store a backup while aborting histedit in between. Also added tests for the same. Differential Revision: https://phab.mercurial-scm.org/D3872

tests: use interfaceutil in simplestorerepo Without it, we crash at module import time. This has likely been busted since 856f381ad74b. Differential Revision: https://phab.mercurial-scm.org/D3884

rebase: improve output of --dry-run Improved output when in dryrun, for user to make sure that no change will be written to repository. Differential Revision: https://phab.mercurial-scm.org/D3764

status: add support for log-like template keywords and functions It's bound to ctx2 since "hg status" can be considered to show the status of the files at ctx2 given ctx1 as the base.

resolve: add support for log-like template keywords and functions It uses wctx as the associated revision since "hg resolve" is the command to manipulate the working directory files.

manifest: add support for log-like template keywords and functions "hg manifest --all" isn't supported since it has no single associated revision.

files: add support for log-like template keywords and functions Note that the ctx does not point to the revision where the file was last changed, but the revision specified by -rREV option.

files: automatically populate fields referenced from template

grep: add support for log-like template keywords and functions

cat: add support for log-like template keywords and functions