alias: abort on missing positional args (issue3331)

phases: fix a non-standard debug message - add missing newline - ditch gratuitous use of string formatting with dict - fix so it actually does string formatting ('%' rather than ',') - inline unnecessary local variable - downcase first word

convert/git: abort if git submodules are detected (issue2150) This improves the error message when convert encounters a git submodule. Now, instead of a git-cat-file error, we'll directly report the lack of support for git submodules.

merge with stable

qfinish: comply with the phases.new-commit option in secret mode (issue3335) In secret mode qfinished changeset were move to the draft phase in all case[1] without regard to phases.new-commit value This changeset ensure qfinish does not automatically promote a changeset further than the phases.new-commit value. Note: This may also result in qfinished changeset made public if phases.new-commit is set to public. [1] "In all case" where parent have a compatible phase. Qfinish keep never altering phases of changeset not involved in the qfinish.

test-gpg: make sure gpg does not modify the trustdb.gpg file Tests really should not modify files in the Mercurial working dir where they ran from! I suspect that trustdb.gpg is now old enough that GPG thinks it should update it automatically. Suppress that feature with --no-auto-check-trustdb.

tests: remove case-folding false positive

merge with i18n

i18n-ja: synchronized with 900eee0778d1

merge with stable

merge: fix unknown file merge detection for case-folding systems This was triggering some test failures on Mac.

rename: handle case-changing (issue1717)

largefiles: use 'dirstate.dirs()' for 'directory pattern' relation check original implementation queries whether specified pattern is related or not to largefiles in target context by 'dirstate.__contains__()'. but this can't recognize 'directory pattern' correctly, so this patch uses 'dirstate.dirs()' for it. this patch uses dirstate instead of lfdirstate in 'working' route (second patch hunk for 'hgext/largefiles/reposetup.py'), because 'dirs()' information may be already built for dirstate but not yet for lfdirstate at this point. this prevents lfdirstate from building up and having 'dirs()' information.

largefiles: suppress unexpected warning of 'hg status' for removed files original implementation queries whether specified pattern is related or not to largefiles, to target context. but changectx/workingctx returns False about relationship with files marked as removed. So, 'hg status' with 'file pattern' for removed file shows unexpected warning message in below process: 1. 'tostandin()' returns non-STANDIN filename for removed file, because changectx/workingctx returns False about relationship with it 2. 'match.files()' contains non-STANDIN filename, which is already removed from working directory 3. 'dirstate.walk()' invoked via 'localrepository.status()' treats non-STANDIN filename as bad filename, because there is no entry for it in dirstate: only STANDIN is managed in dirstate 4. 'dirstate.walk()' invokes 'match.bad()', which is defined in 'localrepository.status()' as 'bad()' 5. 'bad()' shows warning message for non-STANDIN, because it is not related to source context: only STANDIN is related to it this patch queries to dirstate instead of changectxt/workingctx, because dirstate returns expected result for removed files. 'match.files()' is used by 'localrepository.status()' only in 'working' case, so this patched code also works correctly in non-'working' case.

rebase: properly calculate descendant set when aborting (issue3332) Checking for descendants of target being public was also wrong.

merge with stable

strip: ignore -n (issue3326) (BC) -n could be confused for --dry-run by foolhardy users, resulting in permanent data loss. As leaving a backup when none was requested is significantly less disastrous, the short option is silently ignored. Old scripts continue to work, users only get lightly burned.

aliases: use empty string for missing position parameters (issue3331)

bookmarks: clone non-divergent bookmarks with @ in them

i18n-ja: synchronized with 2338ab19b236

encoding: tune fast-path of tolocal a bit

eol: remove left-over print statements

eol: document why os.utime doesn't work here I wanted to use os.utime(self.join("eol.cache"), None) as a cleaner way of touching the cache file -- but this fails when the cache doesn't exist.

merge with stable

merge with i18n

i18n-pt_BR: fix format.dotencode help section

i18n-pt_BR: synchronized with 3d26d69ef822

changelog: micro-optimizations to changelog.read()

perf: add a changeset test

convert: deal with empty splicemap path (issue3311)