ui: only fix config if the relevant section has changed In particular, when extensions add hooks, or add non-ui and non-paths configuration items during their setups, we really have no reason to re-"fix" the config dictionaries.

test-tags: use printf instead of echo '...\n'

discovery: findincoming() is no longer used

discovery: use set instead of dict

discovery: remove unused "base" argument from find.*incoming()

discovery: do not use the implicit updating of the "base" arg

tags: do not fail if tags.cache is corrupted (issue2444) This file is not critical for hg, so we can safely swallow the ValueError

merge: make 'diverging renames' diagnostic a more helpful note. See the Hg Book on why we actually want to detect this case: http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290 Before: $ hg up deadbeef warning: detected divergent renames of X to: ... After: $ hg up deadbeef note: possible conflict - X was renamed multiple times to: ... No functionality change.

gendoc: refactor get_cmd Refactors the get_cmd to take the table as argument, instad of just referencing the global table, thereby enabling reuse for extension command tables.

mq: switched to `` around * * * So it can be parsed by rst.

Revert: capitalization doc fix

subrepo: abort instead of pushing/pulling to the repo itself _abssource will now abort (or return None) in the rare cases where no push/pull path can be found.

subrepo: rename relpath to subrelpath and introduce reporelpath

mdiff: carriage return (\r) is also ignorable whitespace

merge: add --tool argument to merge and resolve These arguments are shorthand for --config ui.merge, but they also override HGMERGE if it is found in the user's environment.

patchbomb: move command option help from the extension (patchbomb) to the command (email)

alias: fail gracefully when invalid global options are given (issue2442) This patch modifies the check for shell aliases to prevent crashing when an invalid global option is given. When an invalid global option is given the check will simply return and let the normal error handling for this case happen.

bookmarks: better fix for issue2016 (lookup infinite recursion) 741290486877 partially reverted by Patrick Mézard <pmezard@gmail.com>

merge/progress: marking strings for localization

verify/progress: using gerund to indicate action and adding units

progress: dropping superfluous space from units

check-code: add 'no tab indent' check for unified tests and fix the offending tests accordingly

url: validity (notBefore/notAfter) is checked by OpenSSL (issue2407) Removing the check from our code makes https with cacerts check work with Python < 2.6.

test-https: test web.cacerts functionality

serve: fix https mode and add test The https mode failed in super because BaseRequestHandler is an old-style class. This introduces the first test of https client/server functionality - and "hghave ssl". The test is currently only run on Python 2.6.

hgweb: don't send a body or illegal headers during 304 response Without this fix, mod_wsgi and spawning get in a wedged state after sending a 304 response. Not sending a body fixed that problem. The header change was discovered by using wsgiref.validate.validator to check for other errors.

merge with stable

test-url: skip test when ssl module is unavailable

revset: use 'requires' instead of 'wants' in error message

outgoing: unify common graphlog.outgoing and hg.outgoing code

bundlerepo: unify common code into a new getremotechanges The pattern where we fetch incoming remote changes and return them as a local bundlerepo seems common. It's nicer to have this code unified.

revset id(): fix error text to say "id wants..." instead of "rev wants..."

keyword: only use expensive fctx.cmp when needed Restrict expensive cmp to cases when: - comparing against working directory and - encode filters active or - path is configured for keyword expansion

context: narrow down filter special case in filectx.cmp() cmp via filelog when encode filters are present, but only when actually comparing to the working directory.

incoming: unify code for incoming and graphlog.incoming

incoming: rename variable Groundwork so that incoming and graphlog.incoming code look the same and get easier to unify.

import: only the first hg patch marker should be processed (issue2417) Proper use of the hgpatch state variable had been lost in the final edits of d7452292f9d3 - now it works more like intended.

backout: provide linear backout as a default (without --merge option) This changes backouts changeset to retain linear history, .e. it is committed as a child of the working directory parent, not the reverted changeset parent. The default behavior was previously to just commit a reverted change as a child of the backed out changeset - thus creating a new head. Most of the time, you would use the --merge option, as it does not make sense to keep this dangling head as is. The previous behavior could be obtained by using 'hg update --clean .' after a 'hg backout --merge'. The --merge option itself is not affected by this change. There is also still an autocommit of the backout if a merge is not needed, i.e. in case the backout is the parent of the working directory. Previously we had (pwd = parent of the working directory): pwd older backout auto merge backout --merge auto commit With the new linear approach: pwd older backout auto commit backout --merge auto commit auto: commit done by the backout command merge: backout also already committed but explicit merge and commit needed commit: user need to commit the update/merge

update: use revsingle to enable use of revsets as update targets (issue1993)

test-url: skip test when ssl module is unavailable

test-url: remove trailing whitespace

keyword: code cleanup - move preselection of expansion candidates for rollback and record into helper function - same overwrite order in rollback and record: 1. modified, 2. added - self.wlock() inside kwrepo class instead of repo.wlock()

tests: asciify output of test-encoding-align.t

tests: accept \-escaped test output It changes tsttest to accept expected outputs in python-style \-escapes. It aims to avoid trouble with outputs for non-ascii, color and progress tests.

merge with crew

parentdelta: compress.py extension is no longer necessary Using `hg --config format.parentdelta=True clone --pull src dst` is equivalent.

merge with stable

convert/darcs: support changelogs with bytes 0x7F-0xFF (issue2411) This is a followup to 4481f8a93c7a, which only fixed the conversion of patches with UTF-8 metadata. This patch allows a changelog to have any bytes with values 0x7F-0xFF. It parses the XML changelog as Latin-1 and uses converter_source.recode() to decode the data as UTF-8/Latin-1. Caveats: - Since the convert extension doesn't provide any way to specify the source encoding, users are still limited to UTF-8 and Latin-1. - etree will still complain if the changelog has bytes with values 0x00-0x19. XML only allows printable characters.

revset: add id() and rev() to allow explicitly referring to changes by hash or rev

revset: rename tagged() to tag() and allow it to take an optional tag name

bookmarks: add revset for referencing bookmarks

hgweb help: fix double help links

tests: add testcase for --config format.dotencode=false

fetch: fix and document exit codes (issue2356)

doc: add [format] dotencode description

filectx: use ctx.size comparisons to speed up ctx.cmp Comparing sizes is cheaper than comparing file contents, as it does not involve reading the file on disk or from the filelog. It is however not always possible: some extensions, or encode filters, change data when extracting it to the working directory.

localrepo: use propertycaches to access encode/decode filters

localrepo: load filter patterns outside of _filter

localrepo: have _loadfilter return the loaded filter patterns

merge with mpm