largefiles: remove a chunk of commented out code

Remove FSF mailing address from GPL headers The GPLv3 FAQ suggests to upgrade by [...] replace all your existing v2 license notices (usually at the top of each file) with the new recommended text available on the GNU licenses howto. It's more future-proof because it no longer includes the FSF's postal mailing address. This removes the postal address, but leaves the version number at 2+.

dispatch: lowercase abort message

merge with stable

commands: add link to addremove in commit help text

largefiles: display remote errors from putlfile (issue3123) (issue3149)

cmdutil: simplify duplicatecopies

hgcia: fix diffstat support

copies: rewrite copy detection for non-merge users The existing copy detection API was designed with merge in mind and was ill-suited for doing status/diff. The new pathcopies implementation gives more accurate, easier to use results for comparing two revisions, and is much simpler to understand. Test notes: - test-mv-cp-st.t results finds more renames in the reverse direction now - test-mq-merge.t was always wrong and duplicated a copy in diff that was already present in one of the parent revisions

copies: split the copies api for "normal" and merge cases (API)

merge with stable

progress: Use the same GPL boilerplate as most hg files

color: Use the same GPL boilerplate as most hg files

tests: patch up silly new year's bug

encoding: use hint markup for "please check your locale settings" This will also make test-encoding.t pass on windows. The test would hit some other code path that already used hint markup.

tests: make simple single quotes work with dummyssh on windows Mercurial assumes that the shell on remote servers over ssh servers uses unix quoting rules. Tests using dummyssh are however also run on windows where cmd doesn't parse single quotes like on unix. This hack replaces the single quotes with double quotes on windows - that is enough to make test-ssh.t pass after d8fa35c28335.

tests: ensure platform independent revision hashes in test-notify.t Makes the test pass again on windows after ca572e94d8e7.

tests: ignore slash direction in paths in test-notify-changegroup.t Fixes testing on windows after 2a7fa7c641d8.

grep: make multiline mode the default (BC) This is a much more logical way to deal with ^ and $. Old ^ and $ behavior are available with \A and \Z.

wix: add map-commandline.bisect

merge with stable

Added signature for changeset 634404392449

Added tag 2.0.2 for changeset 634404392449

merge with stable

merge with i18n

merge with i18n

i18n-ru: translated commands output up to the end

i18n-ru: added missing strings in Mercurial help

i18n-ja: synchronized with be3173353094

i18n-ru: translated missing commands output up to line 13868

i18n-ru: synchronized with 9cf1620e1e75, translated patchbomb

i18n-pt_BR: synchronized with 5a20115e7397

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.

windows: force specified path to be audited in localpath form pathauditor is invoked not only for localpath form using "os.sep" as separator, but also for normalized form using "/": for example, hg internal path like "store/data" under ".hg", or ones normalized by match object this causes insufficient repository nesting check, because current pathauditor implementation divides specified path into components by "os.sep", and this causes to treat multiple path components joined by "/" as single one on Windows environment. this patch applies "util.localpath()" on specified path to force it to be divided into components correctly. in fact, root for pathauditor also uses multiple path separator on Windows. but this does not affect audit itself, so "util.localpath()" is not applied on it.

icasefs: rewrite comment to explain situtation precisely

icasefs: follow standard cache look up pattern

icasefs: disuse length check against un-normcase()-ed filenames this patch disuses length check against un-normcase()-ed filenames gotten by "os.listdir()", because there is no assurance that filesystem stores filenames normalized except in letter case, even though some case insensitive filesystems (in some environment, for some language setting) store them in such manner.

merge with stable

merge with i18n

i18n-de: Translations and fixes until line 6000; more annotations

i18n-de: New translations, mostly largefiles extension

phases: do not exchange secret changesets Any secret changesets will be excluded from pull and push. Phase data are properly synchronized on pull and push if a changeset is seen as secret locally but is non-secret remote side. This patch does not handle the case of a changeset secret on remote but known locally.

phases: test the new-commit option and proper inheritence of phase

cygwin: add cygwin specific normcase logic in cygwin environment, mount point part of path is treated as case sensitive, even though underlying NTFS is case insensitive. this patch preserves mount point part of specified path, only if it is absolute one. there is no easy way to get list of current mount points from python program, other than to execute "mount" external command, because cygwin does not store current mount points into Unix/Linux like /etc/XXXtab file. so, this patch introduces cygwinmountpoints variable to list mount points to be preserved case. this allows some other extensions to customize mount point configuration.

icasefs: avoid path-absoluteness/existance check in util.fspath() for efficiency 'dirstate._normalize()', the only caller of 'util.fspath()', has already confirmed exsistance of specified file as relative to root. so, this patch omits path-absoluteness/existance check from 'util.fspath()'.

icasefs: retry directory scan once for already invalidated cache some hg operation (e.g.: qpush) create new files after first dirstate.walk()-ing, and it invalidates _fspathcache for fspath(). then, fspath() will fail to look up specified name in _fspathcache. this causes case preservation breaking, because parts of already normcase()-ed path are used as result at that time. in this case, file creation and writing out should be done before fspath() invocation, so the second invocation of os.listdir() has not so much impact on runtime performance.

push: propagate --new-branch and --ssh options when pushing subrepos Up until now the all the push command options were ignored when pushing subrepos. In particular, the fact that the --new-branch command was not passed down to subrepos made it not possible to push a repo when any of its subrepos had a new branch, even if you used the --new-branch option of the push command. In addition the error message was confusing since it showed the following hint: "--new-branch hint: use 'hg push --new-branch' to create new remote branches". However using the --new_branch flag did not fix the problem, as it was ignored when pushing subrepos. This patch passes the --new-branch and --ssh flags to every subrepo that is pushed. Issues/Limitations: - All subrepo types get these flags, but only the mercurial subrepos use them. - It is no longer possible to _not_ pass down these flags to subrepos when pushing: * An alternative would be to introduce a --subrepos flag that should be used to pass down these flags to the subrepos. * If we did this, it could make sense to make the --force flag respect this new --subrepos flag as well for consistency's sake. - Matt suggested that the ssh related flags could also be passed down to subrepos during pull and clone. However it seems that it would be the "update" command that would need to get those, since subrepos are only pulled on update. In any case I'd prefer to leave that for a later patch.

phases: implement ``phase()`` and ``hidden()`` method for workingctx Working ctx don't have revision number and need a dedicated implementation.

Add a phases.new-commit option to control minimal phase of new commit this option is both intended for human and internal code usage.

phases: update doc to mention secret phase

phases: prevent mq to qimport immutable change.

phases: add a mutable boolean property on context

ignore: add files present in the hackable-hg windows distribution

graft: use consistent language in help Removes the word 'aborted' from the 3rd paragraph in favor of 'interrupted', the same word used in the description of the -c/--continue switch. The word 'interrupted' is also consistent with the help for rebase.

merge with stable

largefiles: copy files in binary mode (issue3164)

diff: when diffing a revision with a deleted subrepo, maintain the node context (issue3153)

phases: add a function to compute visible heads This function will be used to hide secret changeset.

phases: Add a third phase for secret changeset

phases: fix advanceboundary behavior when targetphase !=0 Changeset was properly removed from upper phase but was not explicitly added to target phase. If advanced changesets had not pwasnt in target phase they was considered public (0-phase).

phases: add a bit more test for local phase movement.

merge with stable

merge with i18n

merge with i18n

i18n-de: several new translations

merge with i18n stable

i18n-pt_BR: synchronized with dc5d1394ecd1

merge with i18n

i18n-ru: translated purge, progress, rebase

i18n-ru: editing for 'push' and 'pull'

i18n-ru: editing for 'commit'

i18n-ru: editing for 'directory'

i18n-ru: editing for 'remote'

i18n-ru: editing for 'repository'

i18n-ru: editing for 'store' (largefiles concept)

i18n-ru: editing for 'branch'

i18n-ru: spellcheck

i18n-ru: glossary synchronized with wiki, still requires fixing

i18n-ru: mq translated

i18n-ru: largefiles strings fixed

merge with stable

merge: check filename case collision between changesets for branch merging this patch makes branch merging abort when merged changesets have same file in different case on case insensitive filesystem. this patch does not prevent linear update which merges between target and working contexts, because 'branchmerge' is False in such case.

i18n: use encoding.lower/upper for encoding aware case folding this patch uses encoding.lower/upper for case folding, because ones of str can not fold case of non ascii characters correctly. to avoid cyclic dependency and to encapsulate logic of normcase in each platforms, this patch introduces encodinglower/encodingupper in both posix/windows specific files. this patch does not change implementation of normcase() in posix.py, because we do not know the encoding of filenames on POSIX. some "normcase()" are excluded from function wrap list in hgext/win32mbcs.py, because they become encoding aware by this patch.

windows: use upper() instead of lower() or os.path.normcase() this patch uses upper() instead of lower() or os.path.normcase() for case folding on Windows(NTFS), because lower-ing causes problems for some languages on it. see below for detail about problem of lower-ing: https://blogs.msdn.com/b/michkap/archive/2005/01/16/353873.aspx

icasefs: avoid normcase()-ing in util.fspath() for efficiency 'dirstate._normalize()', the only caller of 'util.fspath()', has already normcase()-ed path before invocation of it. normcase()-ed root can be cached on dirstate side, too. so, this patch changes 'util.fspath()' API specification to avoid normcase()-ing in it.

icasefs: use util.normcase() instead of lower() or os.path.normcase in fspath this also avoids lower()-ing on each path components by reuse the path normcase()-ed at beginning of function.

dirstate: prevent useless util.fspath() invocation for '.' at first of dirstate.walk() on case insensitive filesystem, normalization of '.' causes util.fspath() invocation, but '.' is not cached in it. this invocation is not only useless, but also harmful: initial "hg tag" causes creation of ".hgtags" file after dirstate.walk(), and looking up ".hgtags" in cache will fail, because directory contents of root is already cached at util.fspath() invocation for '.'.

icasefs: consider as case sensitive if there is no counterevidence, for safety for safety, this patch prevents case-less name from misleading into case insensitivity, even though such names should not be used.

pathauditor: switch normcase logic according to case sensitivity of filesystem this patch applies 'util.normcase()' to audit path only on case insensitive filesystem.

pathauditor: preserve case in abort messages this patch uses both plain and normcase()-ed pathes to preserve letter case of path in abort messages.

pathauditor: use normcase()-ed path for audit result cache in current pathauditor implementation, un-normcase()-ed path is stored into and compared with audit result cache. this is not efficiency on case insensitive filesystem.