hgk: display bookmark in commit diff window

hgk: display bookmarks as gray labels in the commitline

hgk: read bookmarks

subrepo: expand relative sources for git subrepos

changegroup: fix typo introduced in 9f2c407caf34

changegroup: don't accept odd chunk headers

changegroup: verify all stream reads Mercurial often failed with struct.error or mpatch.mpatchError if incomplete data was received from a server. Now we validate all changegroup reads and aborts with abort: stream ended unexpectedly (got %d bytes, expected %d) if less than requested was read.

changegroup: don't accept streams without proper termination Streams should be terminated with a zero size changegroup, and read should never be permitted to return less than requested.

rollback, i18n: avoid parameterized message

summary: add bookmarks to summary

bookmarks: issue a warning if remote doesn't support comparing bookmarks We want to issue a warning and abort comparing bookmarks if remote doesn't support it. Otherwise hg out -B will list you outgoing bookmarks that cannot be pushed to the remote repository using hg push -B.

merge with i18n

i18n-pt_BR: synchronized with ed720c7cc97d

wireproto: catch possible cast error in pushkey The server can return an unexpected answer like 'ssl required'. We catch those possible cast errors and abort the operation.

test-push-http: use killdaemons.py instead of kill to avoid test unreliability

bookmarks: mark new bookmark as current if it points to the current dirstate hg bookmark -r ancestorrev X will not mark X as the current bookmark anymore. If you want to point a bookmark to a ancestor rev you will use hg update to move to it. This will set the current bookmark.

introduce new RequirementError (issue2649) This improves the misleading error message $ hg identify abort: there is no Mercurial repository here (.hg not found)! to the more explicit $ hg identify abort: requirement 'fake' not supported! for all commands in commands.optionalrepo, which includes the identify and serve commands in particular. This is for the case when a new entry in .hg/requires will be defined in a future Mercurial release.

rollback: clarifies the message about the reverted state (issue2628) Previously, when rolling back a transaction, some users could be confused between the level to which the store is rolled back, and the new parents of the working directory. $ hg rollback rolling back to revision 4 (undo commit) With this change: $ hg rollback repository tip rolled back to tip revision 4 (undo commit) working directory now based on revision 2 and 1 So now the user can realize that the store has been rolled back to an older tip, but also that the working directory may not on the tip (here we are rolling back the merge of the heads 2 and 1)

hgweb: handle invalid requests with both form data and querystring Invalid requests could give an unhandled ErrorResponse. Now this ErrorResponse is handled like other ErrorResponses so the client gets an error message which also is logged on the server.

hgweb: give ErrorResponse a descriptive string/Exception representation Very handy if the exception should appear in output.

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