url.py: removed 'file' inheritance in the httpsendfile class Since py3k doesn't have a "file" builtin and, consequently, doesn't support inheriting from it, this patch refactors the httpsendfile class to wrap the objects returned by the builtin "open" function while adding the necessary methods (__len__ for constructing the Content-Length header and read, write, close and seek for the file-like interface).

fix undefined variables, spotted by pylint

py3kcompat: added fake ord implementation for py3k In py3k, a bytes object __getitem__ will return an int instead of a one-character bytes object. This has negative consequences when we want to ord(), like in the following example: >>> b'foo'[0] 102 >>> ord(b'foo'[0]) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: ord() expected string of length 1, but int found This patch overrides the default ord() implementation to just return an int that's what is passed as an argument for ord(). Making the above call succeed: >>> ord(b'foo'[0]) 102

commit: explicitly document the existence of "last-message.txt"

Merge with stable

tests: unify test-changelog-exec

tests: unify test-cat

tests: unify test-bundle-vs-outgoing

tests: unify test-bundle-type

tests: unify test-bundle-r

tests: unify test-bundle

tests: unify test-branch-option

tests: unify test-branches

tests: unify test-dumprevlog

tests: unify test-dirstate-future

tests: unify test-fncache

tests: unify test-bookmarks-strip

tests: unify test-bookmarks-rebase

tests: unify test-bookmarks-current

tests: unify test-bookmarks

tests: unify test-bisect2

tests: unify test-bad-pull

tests: unify test-bad-extension

tests: unify test-backwards-remove

tests: unify test-backout

tests: unify test-audit-path

tests: unify test-archive-symlinks

tests: unify test-archive

tests: unify test-annotate

tests: unify test-addremove-similar

tests: unify test-addremove

tests: unify test-acl

tests: unify test-abort-checkin

tests: unify test-1102

tests: unify test-586

mercurial.spec: gettext is a build requirement for getting proper localization

http basic auth: reset redirect counter on new requests (issue2255) On Python 2.6.6 (and patched 2.6.5 on certain Linux distros), the change that caused issue2255 was also applied to non-digest authentication; this change extends the 2ec346160783 fix accordingly.

rebase: recompute the set of skipped rev when using --continue (issue2330)

Remove variable output affected by length of TMPDIR. If the temporary directory is longer than /tmp then it's possible that the Subject line will get wrapped by the headencode function.

Merge with stable

tests: update to match "hg help resolve" output from 53fdc0989047

test-clone: f1c2de22b8a8 lost changes from b1ae33b813cb

url: limit expansion to safe auth keys (Issue2328) Mads Kiilerich pointed out that 7c9beccb0533 was too eager since the prefix and password keys may contain $-signs. So this only add the username to the list of keys that are expanded. This also updates the documentation to match.

Merge with stable

resolve: updated help documentation for improved clarity

convert: Test svn sink for a repo with tags. This test case backs the fix in changeset 7e5f5e5858f9. The subversion sink used to crash, if the source repo used tags.

hgrc.5: fix "hg hg status" -> "hg status"

url: expand vars in all [auth] settings (issue2328)

merge with stable

merge with i18n

merge with i18n

i18n: merge Romanian translation

i18n: merge with stable

i18n-it: update many broken fuzzy messages I started updating many fuzzy messages which no longer expressed the intended meaning - new translations are inserted only to keep coherence. Not all fuzzy messages have been fixed, yet.

i18n-it: readd missing non-ASCII characters Some accented vowels had disappeared.

i18n-it: avoid using two spaces after a '.' See http://en.wikipedia.org/wiki/Sentence_spacing to verify that single spacing is indeed correct.

i18n-ro: initial version

Merge with stable

test-check-code: fix test after e1359ad582f6

cmdutil: remove unnecessary parenthesis

patch: fix typo in comment

qguard: label patch names by status when listing guards

hg.clone: do not ignore branch argument when source is a repo object This is a revert of 4a70178f9bde. The "bug" mentioned in this changeset is unclear: hopefully using a test to cover this usage should prevent any bugs.

merge: fix typo in docstring