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