hgwebdir_mod: use fake termwidth to avoid mod_wsgi's wrath

termwidth: move to ui.ui from util

help: improve description of update --check

store: encode first period or space in filenames (issue1713) - Mac OS X has problems with filenames starting with '._' (e.g. '.FOO' -> '._f_o_o' is now encoded as '~2e_f_o_o') - Explorer of Windows Vista and Windows 7 strip leading spaces of path elements of filenames when copying trees Above problems are avoided by encoding the first space (as '~20') or period (as '~2e') of all path elements. This introduces a new entry 'dotencode' in .hg/requires, that is, a new repository filename layout (inside .hg/store). Newly created repositories require 'dotencode' by default. Specifying [format] dotencode = False in a config file will use the old format instead. Prior Mercurial versions will abort with the message abort: requirement 'dotencode' not supported! when trying to access a local repository that requires 'dotencode'. New 'dotencode' repositories can be converted to the previous repository format with hg --config format.dotencode=0 clone --pull repoA repoB

demandimport: fix an obscure corner-case. Python's __import__() function has 'level' as the fourth argument, not the third. The code path in question probably never worked. (This was seen trying to run Mercurial in PyPy. Fixing this made it die somewhere else...)

keyword: enforce subn method via boolean switch There are only 2 patterns to choose, and so far only 1 case where kwtemplater.re_kw.subn is applied on data read from the working directory: when recording added files. With this change the code reflects more closely the boolean character of the switch and underlines the special case.

keyword: fix weeding of expansion candidates when recording Rearrange tests to check this, i.e. that there are changes in other files, not only the recorded one.

copies: don't detect copies as "divergent renames" (For the purposes of this patch copy is defined as a rename where the source continues to exist.)

strip: add --keep flag to avoid modifying wc during strip Fixes issue1564.

update: use higher level wording for "crosses branches" error When using "hg update" to update to a revision on another branch, if the user has uncommitted changes in the working directory, hg aborts with the following message: abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) If the user isn't trying to update to tip and they follow the command examples verbatim, they would end up updating to the wrong revision. This patch removes the command examples in favor of just telling the user to either merge or use --clean: abort: crosses branches (merge branches or use --clean to discard changes) hg also aborts if the user tries to use "hg update" to get to tip (without specifying a revision) and tip is on another branch: abort: crosses branches (use 'hg merge' or use 'hg update -c') This message is changed in the same fashion: abort: crosses branches (merge branches or use --check to force update)

hgweb: add help link to templates missed in ead4e21f49f1

test-convert-svn-encoding.t: ignore that subversion %-encodes $TESTTMP Use a glob instead of expecting $TESTTMP.

run-tests.py: remove support for .bat files

run-tests.py: do not install hg when the tests do no exist

setup.py: write libdir as a python string literal

patch: fails immediately upon malformed hunk patch(1) does silently ignore malformed hunks but this is not something we want to copy.

patch: always raise PatchError with a message, simplify handling

patch: simplify externalpatch() arguments

util: remove needbinary(), no longer used for external patching

patch: remove internal patcher fallback and NoHunk error By now the internal patcher is probably more reliable than anything we might find on the command line.

patch: remove unused patchmeta.lineno

patch: remove unused flags from readgitpatch()

test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP Use a glob instead of expecting $TESTTMP.

revsets: fix stray * in help topic

web: add a help view for getting hg help output

fix indentation error

merge: handle no file parent in backwards merge (issue2364)

merge with crew

ui.paths: expand paths directly in fixconfig (issue2373) var and home expansion should be done first.

setup/hg: always load Mercurial from where it was installed. This provides two new features: - Mercurial may be installed into a non-standard location without having to set PYTHONPATH. - Multiple installations can use Mercurial from different locations.