serve: catch and log all Exceptions, not only StandardException Other exceptions than StandardExceptions were left to the default error handler which was muted when running in daemon mode. Now all Exceptions are handled and logged to the log file.

test-i18n: make test conditional on msgfmt availability

match: fix subtle error in _buildmatch The trailing comma was causing a ValueError. See https://bitbucket.org/tortoisehg/thg/issue/132

statichttprepo: don't modify localrepo class variables This happened to crash in subrepo setups when the base class variable was modified twice. Now we don't modify the class variable but an instance copy.

util: flush stdout before calling external processes stdout could have content in its buffer while a subprocess ran and emitted output. Flushing stdout ensures that output now comes in the right order.

tests: update test-https.t output I must have lost the insecure cert warning in a last minute patch series cleanup of 08f9c587141f.

Do not allow merging with uncommitted changes in a subrepo

hgwebdir: reduce memory usage for index generation The archive list generator was holding a reference to each temporary ui copy passed by rawentries(), so the memory usage for index generation growed proportionally to the ui object size and the amount of repositories. By returning a list instead, the temporary reference is dropped immediately.

pure: fix index parsing on empty repositories

alias: add test cases for $ escaping in shell aliases

bookmarks: verify switching bookmarks works properly

subrepo: break long line found by check-code

test-convert: update output to match 0079fb98e8d0

dispatch: fix typo in debug message

convert: fix typos in docstring

subrepos: print short git changeset ids This changes the prompts on git subrepos to show only the first seven digits of git changeset IDs (as git's command line does): $ hg update subrepository sources for s differ (in checked out version) use (l)ocal source (32a3438) or (r)emote source (da5f5b1)?

merge default into stable for 1.8 code freeze

store: remove pointless pathjoiner parameter We can stop pretending that we have to support anything else than '/' for concatenating path elements anywhere. Windows deals just fine with '/' in file paths and we already have plenty of places which produce paths containing '/' anyway when running on Windows.

bookmarks: forbid \0 \r \n : in bookmark names (BC) We restrict : to 1. make it easer to convert bookmarks to git branches, 2. use : later for a syntax to push a local bookmark to a remote bookmark of a different name. \0, \n, \r are fobbidden they are used to separate bookmarks in the bookmark file. This change breaks backward compatbility as ':' was an allowed character in previous versions.

url: merge BetterHTTPS with httpsconnection to get some proxy https validation

tests: test https through http proxy These tests fails for me with Python 2.6(.nothing)

url: always create BetterHTTPS connections the same way

url: refactor BetterHTTPS.connect

url: refactor _gen_sendfile

url: remove test for self.ui in BetterHTTPS We use self.ui unconditionally anyway so we would have noticed if it in some cases wasn't set.

tests: update ssl requirement for test-https.t hgweb requires OpenSSL for serving https.

subrepos: prompt on conflicts on update with dirty subrepos Consider a repository with a single subrepository. The changesets in the main repository reference the subrepository changesets like this: m0 -> s0 m1 -> s1 m2 -> s2 Starting from a state (m1, s0), doing 'hg update m2' in the main repository will yield a conflict: the subrepo is at revision s0 but the target revision says it should be at revision s2. Before this change, Mercurial would do (m1, s0) -> (m2, s2) and thus ignore the conflict between the working copy and the target revision. With this change, the user is prompted to resolve the conflict by choosing which revision he wants. This is consistent with 'hg merge', which also prompts the user when it detects conflicts in the merged .hgsubstate files. The prompt looks like this: $ hg update tip subrepository sources for my-subrepo differ use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)?

bookmarks: make track.current=True default behaviour and remove option (BC)

update: preserve possible bookmark name to set current bookmark correctly

test-i18n: test translations