merge with stable

convert: improve exception reporting for SVN logstream - catch all exceptions - pickle a stringified version of the exception - use a normal abort Hopefully this will result in less mysterious convert exceptions

fetch: fix unneeded commit when no merge attempted (issue2847)

fetch: patch cornercase in children calculation (issue2773)

merge with stable

merge with i18n

i18n-ja: synchronized with 32a6e00e4cfe

rollback: clarify --force text (issue3175)

largefiles: clarify help when options are ignored until first add is done

phases: prevent rebase to rebase immutable changeset.

phases: on copy clone, do not copy phases data if repote is publishing

phases: copy phases data on local clone

largefiles: tiny code clean up lfutil.islfilesrepo is a preffered way for testing if repo is largefiles enabled

context: add isbinary function

rebase: add a "D" short option for detach Detach is usually what I want when I use --source or (in particular) --rev. Having a shorter option make it less an hassle to use it.

rebase: allow --detach when --rev is used --rev is only a more specific --source and there is no reason to refuse to use detach with it.

merge with stable

merge with i18n

i18n-ru: translated notify, pager

i18n-ru: translated inotify, interhg; skipped strings added

i18n-ru: translated convert messages

i18n-ru: translated bugzilla

i18n-ru: synchronized with d976b1ef6760

icasefs: add test for case preservation on case insensitive filesystem "hg qpush" causes unexpected behavior, if case preservation on case insensitive filesystem is not enough. this patch adds the test using mixed-case filenames to reproduce this problem on any case insensitive filesystems.

i18n: use "encoding.lower()" to normalize string in hgweb search query some problematic encoding (e.g.: cp932) uses ASCII alphabet characters in byte sequence of multi byte characters. "str.lower()" on such byte sequence may treat distinct characters as same one, and cause unexpected log matching. this patch uses "encoding.lower()" instead of "str.lower()" to normalize strings for compare.

i18n: use "encoding.lower()" to normalize specified string for revset some problematic encoding (e.g.: cp932) uses ASCII alphabet characters in byte sequence of multi byte characters. "str.lower()" on such byte sequence may treat distinct characters as same one, and cause unexpected log matching. this patch uses "encoding.lower()" instead of "str.lower()" to normalize strings for compare.

i18n: use "encoding.lower()" to normalize specified keywords for log searching some problematic encoding (e.g.: cp932) uses ASCII alphabet characters in byte sequence of multi byte characters. "str.lower()" on such byte sequence may treat distinct characters as same one, and cause unexpected log matching. this patch uses "encoding.lower()" instead of "str.lower()" to normalize strings for compare.

win32mbcs: allow win32mbcs extension to be enabled on cygwin platform this patch allows win32mbcs extension to be enabled on cygwin platform for problematic character encodings. on recent cygwin platform, even though "os.path.supports_unicode_filenames" is False, "os.listdir()" and other path manipulation functions can return the result correctly decoded in unicode for invocations with unicode arguments, if locale is configured properly. existing code to check "os.path.supports_unicode_filenames" is kept to prevent win32mbcs from being enabled on unexpected platform.

windows: use normalized path as path to subrepo path to subrepo is used to identify or check location of subrepo. it should be normalized (in "/" delimiter form), because it is also used with narrowmatcher which uses only normalized path even on Windows environment. this patch applies "util.pconvert()" on path to subrepo (called "subpath") to normalize it. for this patch, referers of below were checked. - subrepo.state() - subrepo.itersubrepos() - subrepo.subrepo() - context.sub() - context.substate() typical usecase is: for subpath in ctx.substate: sub = ctx.sub(subpath) ... ctx.substate[subpath] .... in this case, normalization has no side effect, because keys given from substate are used as key itself. other cases shown below also seem to require subpath to be normalized. - path components are joined by "/", in "commands.forget()": for subpath in ctx.substate: subforget[subpath + '/' + fsub] = (fsub, sub) - normalized "file" is used to check below condition, in "commands.revert()", "localrepository.commit()", and "localrepository._checknested()" file in ctx.substate - substate.keys() is passed to dirstate.walk()/status() which use only normalized pathes

windows: use normalized path to check repository nesting current "localrepository._checknested()" uses specified path itself to compare against subrepo pathes. it is invoked from "hgsubrepo.subrepo()" or pathauditor (as callback), and both use "os.sep" as separator. this causes unexpected nesting check result, if subrepo configuration uses "/" as path separator for sub repo path. this path uses "/" to join path components (or apply "util.pconvert()" on path) to normalize.