i18n-ru: editorial for 'diff' * * * i18n-ru: editorial for 'diff'

i18n-ru: editorial for 'guard'

i18n-ru: vocabulary edited, minor corrections in translations.

i18n-ru: using correct abbreviated units for megabytes. See http://ru.wikipedia.org/wiki/МБ

help: fix column alignment in "hg help" output The output of "hg help" is changed to ensure that the column containing descriptions of commands, extensions, and other topics is correctly alignmened.

minirst: simplify and standardize field list formatting The default width of field lists is changed from 12 to 14 to align minirst with the rst2html tool. Shrinking the width of the left column to fit the content is removed, to keep formatting simple and uniform.

largefiles: correctly download new largefiles when merging There is a bug in the merge process where, if a new largefile is introduced in a merge and the user does not have that largefile in his repo's local store nor in his system cache, the working copy will retain the old largefile. Upon the commit of the merge, the standin is re-written to contain the hash of the old largefile, and the lfdirstate retains a "Modified" status for the file. The end result is that the largefile can show up in the merge commit as "Modified", but the standin has no diff. This is wrong in two ways: 1) Such a "wedged" history with a nonsense change in a commit should not be possible 2) It effectively reverts a largefile to an old version when doing a merge This is caused by the fact that the updatelfiles() command always checks the current largefile's hash against the hash stored in the current node's standin. This is correct behavior in every case except for a merge. When merging, we must assume that the standin in the working copy contains the correct hash, because the original hg.merge() has already updated it for us. This patch fixes the issue by patching the repo object to carry a "_ismerging" attribute, that the updatelfiles() command checks for. When this attribute is found, it checks against the working copy's standin, rather than the standin in the current node.

tests: add htmlcov option

run-tests: use a list comprehension instead of map

tests: fix omit path list All directories need a trailing asterisk. Otherwise the files are not excluded from coverage.

commands: partial backout of fbb68b382040

phase: add metavar to -r help text

phase: the REV argument can be repeated

commands: no need to rename merge and phases on import

phase: there is actually no -C option

phase: use standard syntax for command line flags We don't mark them as literal text and we mention the short option the first time we talk about a given flag.

phase: fix RST markup (use ``...`` for literal text)

phase: lowercase option help, rephrase slightly

filectx: fix cmp() of file starting with '\1\n' If file data starts with '\1\n', it will be escaped in the revlog to create an empty metadata block, thus adding four bytes to the size in the revlog size index. There's no way to detect that this has happened in filelog.size() faster than decompressing each revision [1]. For filectx.cmp(), we have the size of the file in the working directory available. If it differs by exactly four bytes, it may be this case, so do a full comparison. [1]: http://markmail.org/message/5akdbmmqx7vq2fsg

merge with stable

merge with i18n

merge with i18n

i18n-pt_BR: synchronized with e6c44dbe902f

merge with i18n

i18n-ru: spellcheck

i18n-ru: editorial for vocabulary words. Edited for: backup, bundle, repository, checkout

i18n-ru: editorial for hg help hgignore

tests: make {date|age} template output independent of the current date

phases: make outgoing object and discovery aware of exclusion The outgoing object gains an "excluded" members holding all changesets which were excluded because there where secret. The core discovery code now remove secret changeset from discovery by default. This means that any command relying on discovery will exclude secret changeset. Most notable one are outgoing and bundle. (But bundle with and explicit ``--base`` still allow to bundle outgoing changeset.

discovery: introduce outgoing object for result of findcommonoutgoing Simplifies client logic in multiple places since it encapsulates the computation of the common and, more importantly, the missing node lists. This also allows an upcomping patch to communicate precomputed versions of these lists to clients.

commands: make bundle use heads computed by findoutgoing

revlog: improve docstring for findcommonmissing

commands: bump copyright year

phase: mark messages for i18n

phase: fix up help string

phase: drop reference to working directory phase

phases: add a phases command to display and manipulate phases

annotate: append newline after non newline-terminated file listings The last line of a non newline-terminated file would mix with the first line of the next file in multiple-file listings before this patch. Possible compatibility issue: no longer possible to tell from the annotate output if the file is terminated by new line or not.

subrepo: avoid syncing bookmarks twice on clone (issue3191) Clone internally handles bookmark synchronization. (Fix spotted by Eric Blood)

revlog: clarify strip docstring "readd" -> "re-add" I misread it as "read".

merge with stable

filesets: use example with quotes for encoding predicate A user on IRC was confused that "encoding(ASCII)" works and "encoding(UTF-8)" fails with "parse error: encoding requires an encoding name".

phases: use graph and phase name in exchange test

phases: ``{phase}`` template keyword display the phase name ``{phaseidx}`` is providing the phase index as integer. This integer representation is useful when people need to use the fact that phase are ordered. Test keep using the number version for readability purpose.

phases: add a phasestr method on context

phases: add list of string to access phase name

phases: fix phase synchronization on push The bugs seemed to show up when element not in future common changeset should hold new hold phase data. The whole phase push machinery was rewritten in the process.

phases: implements simple revset symbol This changeset adds ``public()``, ``draft()`` and ``secret`` symbol for revset.

phases: store phase values in constant instead of using raw integer Phases constant are named after the phase name. Usage of integer have been replaced by proper constant.

sslutil: abort properly if no certificate received for https connection According to the documentation SSLSocket.getpeercert() can return None.

sslutil: work around validator crash getting certificate on failed sockets The previous workaround for correct handling of wrapping of failing connections might be enough to prevent this from happening, but the check here makes this function more robust.

sslutil: reorder validator code to make it more readable

sslutil: show fingerprint when cacerts validation fails

sslutil: handle setups without .getpeercert() early in the validator This simplifies the code and makes the flow more obvious and reduces the indentation level.

sslutil: verify that wrap_socket really wrapped the socket This works around that ssl.wrap_socket silently skips ssl negotiation on sockets that was connected but since then has been reset by the peer but not yet closed at the Python level. That leaves the socket in a state where .getpeercert() fails with an AttributeError on None. See http://bugs.python.org/issue13721 . A call to .cipher() is now used to verify that the wrapping really did succeed. Otherwise it aborts with "ssl connection failed".

largefiles: remove pasted code Refactor and remove pasted code from lfcommands.py

largefiles: add tests for uncovered codepaths (issue3092) Add tests for lfconvert codepaths where: * largefiles have been both renamed and relinked * .hgtags has invalid content

largefiles: add error checking to tags conversion (issue3092) Check for errors when parsing .hgtags during lfconvert, and skip lines that don't parse or refer to invalid changesets.

largefiles: don't reference uninitialized variable (issue3092)

merge with i18n

i18n-ru: synchronized with e251250ac20b

i18n-ru: revsets predicates translated

i18-ru: debug commands translated

i18n-ru: user prompt related strings translated

i18n-ru: tanslated record-zeroconf

merge with stable

rebase: reinstate old-style rev spec support for the source and base (issue3181) As of b12362ab13e7 (first released as part of Mercurial 2.0), the rebase command accepted ONLY revsets for the source and base arguments and no longer accepted old-style revision specifications. As a result, some revision names were no longer recognised, e.g. hg rebase --base br-anch abort: unknown revision 'br'! These arguments are now interpreted first as old-style revision specifications, then as revsets when no matching revision is found. This restores backwards compatibility with releases prior to 2.0.

dirstate: propagate IOError other than ENOENT when reading branch

mq: Document that qdel requires exact patch identifiers

canonpath: allow canonicalization of non-existant paths Such as a copy destination; see the added test.

largefiles: factor out a copyalltostore() function

largefiles: add precommit hook to check for inappropriate locking This tests for inappropriate locking (issue3182) by running hg status as a precommit hook.

largefiles: fix inappropriate locking (issue3182) Don't lock/write on operations that should be readonly (status). Always lock when writing the lfdirstate (rollback). Don't write lfdirstate until after committing; state isn't actually changed until the commit is complete.

largefiles: correctly handle dirstate status when rebasing When rebasing, we need to trust that the standins are always correct. The rebase operation updates the standins according to the changeset it is rebasing. We need to make the largefiles in the working copy match. If we don't make them match, then they get accidentally reverted, either during the rebase or during the next commit after the rebase. This worked previously only becuase we were relying on the behavior that largefiles with a changed standin, but unchanged contents, never showed up in the list of modified largefiles. Unfortunately, pre-commit hooks can get an incorrect status this way, and it also results in extra execution of code. The solution is to simply trust the standins when we are about to commit a rebased changeset, and politely ask updatelfiles() to pull the new contents down. In this case, updatelfiles() will also mark any files it has pulled down as dirty in the lfdirstate so that pre-commit hooks will get correct status output.

largefiles: implement addremove (issue3064) Implementing addremove correctly in largefiles is tricky, becuase the original addremove function does not call into any of the add or remove function we've already overridden in the extension. So the trick is to implement addremove without duplicating any code. This patch implements addremove by pulling out the interesting parts of override_add() and override_remove() into generic utility functions, and using those to handle the largefiles in addremove. Then a matcher is installed that will ignore all largefiles, and the original addremove function is called to take care of the regular files in addremove. A small bit of monkey patching is used to make sure that remove_largefiles() notifies the user when a file is removed by addremove and also makes sure the removal of largefiles doesn't interfer with the original addremove's operation of removing the standin.

Use explicit integer division Found by running the test suite with the -3 flag to show places where we have int / int division that can be replaced with int // int.

cvsps: pull function definition out of loop

largefiles: Fix parser warning: redefinition of unused 'node' from line 14

merge with stable

largefiles: fix output of hg summary (issue3060)

largefiles: fix confusion upon removal of added largefile (issue3176) This patch makes "hg remove" work the same way on largefiles as it does on regular Mercurial files. If you try to remove an added largefile, the removal fails and you are instead prompted to use "hg forget" to undo the add.

largefiles: remove invalid comment (issue3065) This comment is invalid. The hg.update() function will abort in the case of any genuine error, so there is nothing to check. If we have gotten to this point in execution, nothing critical has gone wrong, and if any standins have been updated, we must pull new largefiles.

largefiles: clean up and shorten test output by using the same log format everywhere

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