fix encoding bug in 05ac42e56452

cleanups: undefined variables

cleanups: unused variables

move working dir/dirstate methods from localrepo to workingctx

color: labeled text should be passed to ui.write() as ui.labeled Some implementations of ui.label() (HTML versions in particular) must escape the provided text and then markup the text with their tags. When this marked up text is then passed to ui.write(), we must label the text as 'ui.labeled' so the implementation knows not to escape it a second time (exposing the initial markup). This required the addition of a 'ui.plain' label for text that is purposefully not marked up. I was a little pedantic here, passing even ' ' strings to ui.label() when it would be included with other labeled text in a ui.write() call. But it seemed appropriate to lean to the side of caution.

move discovery methods from localrepo into new discovery module

merge with stable

push/pull: fix bug in "--branch ." handling The branch wasn't expanded, so only the tip was operated on.

shrink-repo: wrong variable name

replace Python standard textwrap by MBCS sensitive one for i18n text Mercurial has problem around text wrapping/filling in MBCS encoding environment, because standard 'textwrap' module of Python can not treat it correctly. It splits byte sequence for one character into two lines. According to unicode specification, "east asian width" classifies characters into: W(ide), N(arrow), F(ull-width), H(alf-width), A(mbiguous) W/N/F/H can be always recognized as 2/1/2/1 bytes in byte sequence, but 'A' can not. Size of 'A' depends on language in which it is used. Unicode specification says: If the context(= language) cannot be established reliably they should be treated as narrow characters by default but many of class 'A' characters are full-width, at least, in Japanese environment. So, this patch treats class 'A' characters as full-width always for safety wrapping. This patch focuses only on MBCS safe-ness, not on writing/printing rule strict wrapping for each languages MBCS sensitive textwrap class is originally implemented by ITO Nobuaki <daydream.trippers@gmail.com>.

keyword: use context to detect uncommitted merge

tests: use --debug on test-clone

shrink-revlog: use util.mktempcopy() to preserve mode of index file. (There's still a chmod() call to manually preserve the mode of the data file.)

revset: delay import of hg to avoid start-up import loops

error: fix up test-hgrc

error: update test-trusted.py

revset: fix test failure with qfinish

revset: raise ParseError exceptions

error: add new ParseError for various parsing errors

error: change ParseError to CommandError

hgrc: improve docs for the trusted section

rebase: use usual util.abort rather than error.ParseError

revset: sort the predicate list

revset: fix - handling in the optimizer

revset: fix up tests

walkchangerevs: allow empty query sets

revset: add tagged predicate

revset: optimize the parse tree directly Rather than dynamically optimize in methods, we pre-optimize the parse tree directly. This also lets us do some substitution on some of the symbols like - and ::.

revset: add support for prefix and suffix versions of : and ::

revset: hook into revrange

revset: add a debugrevspec command

revset: introduce revset core

revset: introduce basic parser

remoteui: move from cmdutil to hg

mq: better qqueue test for troublesome names

mq: prevent the creation of a queue whose name is already taken Each check is moved under the code handling the relevant option, and a new one is added for --create. This fixes duplicated entries being added to the queues list.

mq: fix naming issues for qqueue directories

win32text: mark this extension as deprecated

Merge with stable

shrink-revlog: preserve mode of the shrunken index and data file. Otherwise, the shrunken index file always has mode 0600 thanks to mkstemp(). This is annoying on a server, where multiple users may need to read/write the manifest. chmod()ing the data file is not strictly necessary, but it's nice for consistency.

Fixed a bashism with the use of $RANDOM in hgeditor. The variable $RANDOM is not POSIX so a portable /bin/sh may not define it. When creating a directory with a random name it's better to use mktemp, which, even though is not POSIX, exists in common Unixes including Linux, OpenBSD, FreeBSD and MacOS X.

churn: add possibility to include/exclude paths

churn: support spaces in aliases (issue2222)

Merge with stable

Merge with i18n

Added signature for changeset 24fe2629c6fd

Added tag 1.5.4 for changeset 24fe2629c6fd

Merge with i18n