color: be silent when falling back to ECMA-48 mode if "auto" mode was desired Don't warn about missing setab/setaf terminfo entries unless we explicitly asked for terminfo mode; fallback to ECMA-48 mode silently.

tests: hardcode terminfo entry for the terminfo color test For the terminfo color test, make sure that the terminfo entry used is one of our own choosing, by delivering a special "hgterm" entry (a copy of ncurses' xterm-color), compiling it, and specifically pointing curses to it using the TERMINFO and TERM environment variables. This means we can ignore the variability in different terminal definitions on different platforms.

localrepo: mark progress step for translation

revert: improve hints on abort when reverting to parent without --all BEFORE: $ hg revert abort: no files or directories specified (use --all to discard all changes) AFTER: Uncommitted changes (using --all *will* nuke edits): $ hg revert abort: no files or directories specified (uncommitted changes, use --all to discard all changes) Clean working directory (using --all won't discard anything): $ hg revert abort: no files or directories specified (use --all to revert all files)

dispatch: set config options on the request repo.ui

dispatch: return read config options

dispatch: set global options on the request repo.ui If the request has a repo, and global options such as --verbose are passed, we need to set those explicitly on the repo.ui.

cmdserver: assign repo.baseui before running commands There are places in the code that use localrepository.baseui (see hg.remoteui), we need the ui descriptors (and possibly other things) to be set correctly on it, so output written to the remoteui descriptors ends up at the right place. Before this change, tests such as 'test-bookmarks-pushpull.t' didn't work.

cmdserver: copy repo.ui before running commands

filemerge: use ui out descriptor when calling util.system

dispatch: make sure unspecified global ui options don't override old values

merge with stable

requirements: show all missing features in the error message. Displaying all missing featureis help people to solve the issue (choosing the right version, creation the right repo)

test-revert: add case for nothing changed

dispatch: set descriptors on the request repo.ui

dispatch: pass the correct ui to runcommand For commands that take a repo, repo.ui is passed as the ui to runcommand. This restores that behaviour when the request has a repo.

archive: wrap the ui descriptor so it doesn't get closed archival.tarit closes the fileobj if one is passed to it, which is undesired when reading from '-'.

transplant: use ui out descriptor when calling util.system

bisect: use ui out descriptor when calling util.system

extdiff: use ui out descriptor when calling util.system

ui: use ui out descriptor when calling util.system

call reposetup for repositories returned from peer (issue2864) Extension setup functions were not being called when repositories were obtained using the peer function instead of the repository function.

tests: solaris [ doesn't know -e

convert: fix git convert on solaris - it cannot remove environment variables

tests: HGRCPATH must be exported after assignment - at least on Solaris

merge with stable

backout of d04ba50e104d: allow to qpop/push with a dirty working copy The new behavior was breaking existing tools that relied on a sequence such as this: 1) start with a dirty working copy 2) qimport some patch 3) try to qpush it 4) old behavior would fail at this point due to outstanding changes. (new behavior would only fail if the outstanding changes and the patches changes intersect) 5) innocent user qrefreshes, gets his local changes in the imported patch It's worth considering if we can move this behavior to -f in the future.

merge with stable

merge with stable

update: do not use the term 'update' when mentioning reverting one file and give a more precise hint for how to revert such a file I'm using the term 'revision' instead of 'changeset' in this change to be consistent with the REV we use in the synopsis.

cmdserver: fix read-loop string concatenation

dispatch: check for None before closing repo We were trying to call close() if repo == None and req.repo != None. This can happen when running commands that don't take a repo.

revert: mention update in hint of abort when reverting to non-parent and explicitly warn about uncommitted changes Examples: BEFORE: $ hg par -q 7:e81a2efd53d4 $ hg revert -r 2 abort: no files or directories specified (use --all to discard all changes) AFTER: Clean working directory (revert can be easily undone, no edits to be lost): $ hg revert -r 2 abort: no files or directories specified (use --all to revert all files, or 'hg update 2' to update) Uncommitted changes (revert --all *does* discard edits and is pretty hard to undo or even impossible if --no-backup is specified): $ hg revert -r 2 abort: no files or directories specified (uncommitted changes, use --all to discard all changes, or 'hg update 2' to update)

update: clarify that update changes the parent revison

merge with stable

revset: fix aliases with 0 or more than 2 parameters The existing code seemed to have incorrect assumptions about how parameter lists are represented by the parser. Now the match and replace functions have been merged and simplified by using getlist().

match: fix bug caused by refactoring in cfc89398f710

revert: be more helpful on uncommitted merges BEFORE: $ hg revert abort: no files or directories specified (use --all to discard all changes) AFTER: $ hg revert abort: no files or directories specified (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)

opener: add self._audit (issue2862)

cmdserver: write the hello message as one chunk on the 'o' channel This is a guaranteed by the protocol: clients know they need to read one chunk off of the 'o' channel and treat that as the hello message. They should ignore fields they don't recognize so they stay compatible with new versions of the server in case we decide to add something.

fileset: copied takes no arguments

revset and fileset: fix typos in parser error messages

fileset: use ParseError pos field correctly The pos field is intended to describe the position of the error - it should not be used for other potentially interesting information.

revset: fix parameter name in implementation of follow()

merge with stable

revert: be more explicit that changes are lost BEFORE: $ hg revert abort: no files or directories specified (use --all to revert all files) AFTER: $ hg revert abort: no files or directories specified (use --all to discard all changes)

dispatch: do not close the request repo Closing here means we've closed the repo passed to us in the request, which is not our responsibility. This is essential for bundlerepo, and possibly other localrepository subclasses who do something in their close().

hook: write hook output to ui fout descriptor output on stderr will also be written to ui.fout, unless sys.__stdout__ is passed in (see util.system), thus not changing previous behavior. This fixes a bug where hooks run through the command server would mess up with the command protocol, sending non-channeled data to the client.

merge with stable

check-code: don't mark debug messages for translation

i18n: remove translation of debug messages

cmdserver, runcommand: properly handle the client sending no arguments No real reason for a client to do this, but still possible. Previously if the client sent no arguments, a list with an empty string [''] would be used as the arguments to dispatch, which would cause hg to complain about an ambiguous command. Instead, we simply check for no arguments and use an empty list instead (which is equivalent to invoking hg with no args on the command line).

cmdserver: don't raise EOFError when trying to read 0 bytes from the client

i18n: extract docstrings from fileset module

Backed out changeset 1ec8bd909ac3 Debug messages should not be translated.

merge with stable

dispatch: translate alias debugging messages

parsers: fix localization markup of parser errors

fileset: use correct function name for hgignore in docstring docstring refereed to "resolved" instead of "hgignore"

url: catch UNC paths as yet another Windows special case (issue2808)

treediscovery: always return all remote heads Old discovery only returned incoming heads, not all of them (for changegroupsubset). New discovery must always return all of the remote heads (for getbundle). I failed to properly adjust treediscovery in cb98fed52495 when introducing setdiscovery. The actual observable problem was 'remote: unsynced changes' when trying to push a cset on one named branch to a server with a new cset on another named branch. This scenario is now tested in test-treediscovery.t.

merge with stable

config.sortdict: override clear method Overrides dict.clear. It's not currently used, but was broken for sortdict. Contributed by Stepan Koltsov <yozh@mx1.ru>

patch: fix typo in variable name

merge with stable

help/revsets: revset aliases can be defined on any config file

help/revsets: clean up whitespace between paragraphs

help/config: mention [revsetalias] section

fileset: add missing whitespace around operator

fileset: drop backwards SI size units - the power of 2 ones should be kiB, MiB, etc. - the power of 10 ones (SI standard) should be kB, MB, but we're currently using the industry traditional units elsewhere

remove bogus test copy

merge default branch into stable to mark the start of the code freeze

fileset: add a help topic Add crosslinking with patterns topic.

fileset: add copied predicate

fileset: add encoding() predicate

fileset: add size() predicate

fileset: add grep predicate

fileset: add some function help text

fileset: add hgignore

fileset: add resolved and unresolved predicates

fileset: prescan parse tree to optimize status usage We only call status if needed to avoid walking the working directory or comparing manifests. Similarly, we scan for whether unknown or ignored files are mentioned so we can include them.

fileset: add support for file status predicates This forcibly walks the tree looking for unknown and ignored files, which is suboptimal. A better approach would scan the tree first to find required status components and skip the status check entirely if it's unused.

fileset: add some basic predicates

match: introduce basic fileset support

match: allow passing a context object to match core

fileset: drop matchfn This is now built into contexts

scmutil: match no longer accepts repo objects

scmutil: switch match users to supplying contexts The most appropriate context is not always clearly defined. The obvious cases: For working directory commands, we use None For commands (eg annotate) with single revs, we use that revision The less obvious cases: For commands (eg status, diff) with a pair of revs, we use the second revision For commands that take a range (like log), we use None

scmutil: match now accepts a context or a repo

context: add a match builder method This is groundwork for matching against filesets in contexts

help/hgignore: refer to the builtin help instead of external URLs

sslutil: make messages for Python without certificate handling more helpful We now explain why there is no certificate to verify and do not give hints about cacerts when they can't be used anyway.

sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798) Any entries in subjectAltName would prevent fallback to using commonName, but RFC 2818 says: If a subjectAltName extension of type dNSName is present, that MUST be used as the identity. Otherwise, the (most specific) Common Name field in the Subject field of the certificate MUST be used. We now only consider dNSNames in subjectAltName. (dNSName is known as 'DNS' in OpenSSL/Python.)

merge with i18n

svn subrepos: work around checkout obstructions (issue2752) We do this by ensuring the working copy is clean and then blowing away the working copy and replacing it with one from the desired path. We could probably use 'svn switch' to do this more efficiently, but there's some subtle logic required to get that right and this is more likely to work reliably.

update: check wc.dirty() before setting overwrite=True merge.update() was missing a few dirtiness checks from workingcontext, including subrepo cleanliness checks. Using wc.dirty() instead of one-off checks for various forms of dirtiness will be significantly safer.