tests: ignore inotify extension in test-duplicateoptions.py The inotify extension is only available on linux and setup.py will not install it on other platforms - but it will of course always be there in the source. test-duplicateoptions.py tried to load most extensions (including inotify if available). When the local uninstalled Mercurial was used it would thus always load the inotify extension and cause a warning on unsupported platforms. The inotify extension is not relevant for this test, so now we explicitly ignore it.

error: Add a hint argument to RepoError This use the same mechanism than Abort. Except clause stay distinct because RepoError add "!" at the end of the message.

test-revert: add revert --all case when nothing changed supposed to succeed without notice

merge with stable

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