Merge with mpm

discovery: fix description line

Merge with stable

Merge backout

Backed out changeset: e1dde7363601

ui: handle leading newlines/spaces/commas in configlist Thanks to Greg Ward for spotting the problem introduced in 0a548640e012 and for supplying the test case.

mergetools: add configuration for Ultra Compare (issue2226) Initial config provided by Tim Pietzcker

mq: use hg reST role some more

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

merge with i18n stable

i18n-pt_BR: synchronized with 0bb67503ad4b

Merge with stable

clone: save hardlink state of util.copyfiles() When trying to do hardlink-cloning, the os_link() call of the first file tried already fails on Windows, if the source is on a UNC path. This change avoids calling os_link() for the rest of files, leaving us with a *single* failed os_link() call per clone operation, if the source can't do hardlinks.

util.copyfiles: don't try os_link() again if it failed before If the os_link() call on the first file in the directory fails [1], we switch mode to using shutil.copy() for all remaining files. [1] happens for example on Windows for every file when cloning from a UNC path without specifying --pull.

keyword: retrieve added and modified files from commitctx

keyword: force dirstate normal when all changes in a file are recorded Before this bugfix a file whose changes were entirely recorded was still considered modified by "hg status". Note: the test must use hg record -l/--logfile, because this is not reproducible with hg record -m/--message.

clone: print number of linked/copied files on --debug

Merge with stable

eol: extension for managing file EOLs

Merge with stable

Merge with i18n

Merge with i18n

merge with i18n stable

i18n-pt_BR: added message from 1b8aa9ffa7dc

merge with i18n stable

i18n-pt_BR: synchronized with ed71cb07d7b2

Merge with stable

pager: exec pager using /bin/sh -c This mimics the behavior of popen() and ensures setting the pager to something like "LESS=FSRX less" will work.

hgweb: fix race in refreshing repo list (issue2188)

Merge with stable

record: check that we are not committing a merge before patch selection It might sound like a good idea to use record to filter changes when merging. If someone attemps this, it's better to tell her "no" right ahead, before the patch generation/line selection, so she does not spend time doing it just to receive a red light after that (sometimes rather long) process.

record: better way to find help in docstring This outputs only the lines in the verbatim block without relying on the translator to have translated the little 'y - record this change' string.

record: docstring typo

mq: mention qqueue in module docstring

clone: save hardlink state of util.copyfiles() When trying to do hardlink-cloning, the os_link() call of the first file tried already fails on Windows, if the source is on a UNC path. This change avoids calling os_link() for the rest of files, leaving us with a *single* failed os_link() call per clone operation, if the source can't do hardlinks.

util.copyfiles: don't try os_link() again if it failed before If the os_link() call on the first file in the directory fails [1], we switch mode to using shutil.copy() for all remaining files. [1] happens for example on Windows for every file when cloning from a UNC path without specifying --pull.

cmdutil: cleanup imports

make transactions work on non-refcounted python implementations

mq: support multiple patch queues using qqueue

Merge with stable

status: avoid performance regression when no .hgsub is present (introduced by 24ce8f0c0a39)

doc: document expansion of %include and ui.username

ui.username(): expand environment variables in username configuration value. note: expansion of config variables must be handled on a case-by-case basis because they can contain arbitrary data that may not be desirable to expand.

config: expand hgrc %include paths

rename: make --after work if source is already in R state I routinely want to use `hg addrem` and then fix up missed renames manually using `hg mv -A`. This patch allows me to record such renames from a source in state R to a target in state A.

Merge with stable

doc: clarify that sections can be split

doc: clarify that keys can be overridden

commands: document --new-branch flag for push

Merge with stable

commands: updates to push docstring. With contributions from mg, hstuart, timeless, and vsh.

mq: remove unneeded local variable in delete

pager: exec pager using /bin/sh -c This mimics the behavior of popen() and ensures setting the pager to something like "LESS=FSRX less" will work.

keyword: offer svn-like default keywordmaps svn-like default keywords can be set in a new configuration section called [keywordset] -- thanks to timeless for the name. Move setup of default keywordmaps into dedicated function used by kwtemplater.__init__ and demo. HeadURL/URL is not supported (by default).

keyword: add 2 svn-like date filters svnisodate yields the format the date in svn's Id keyword expands to. svnutcdate yields the format svn's Date/LastChangedDate expands to. http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html

util: give appropriate default args to atomictempfile() mode='w+b' is the default of python's TemporaryFile().

push: add --new-branch option to allow intial push of new branches Compare this to --force which allows anything to be pushed. With --new-branch, only changesets to named branches not present on the and changesets not introducing additional heads on existing branches are allowed. Developed by Henrik Stuart <henrik.stuart@edlund.dk> Sune Foldager <cryo@cyanite.org>

check-code: add check for 'source'

Merge with stable

tests: fix bashism to load helpers.sh `source` isn't available at POSIX sh.

color: bring back colors with pager It's introduced by 3c368a1c962d, but missing in merge changeset at a890cc501501.

dispatch: include Python version in traceback

rebase: add error codes Suggested by Dirk Hasselbalch

rebase: improve --abort failure message

rebase: only show "rebase completed" message with -v

strip: hide unbundle messages by default Unbundling is an internal implementation detail for strip, only show them with --verbose.

Fix up rebase's handling of strip backups

strip: improve full backup message

strip: drop deprecated -b from synopsis

rebase: use helpers.sh in tests

strip: be quiet about temporary internal bundle

Merge with crew-stable

convert/svn: close gettags() log stream (issue2196)