largefiles: remove unused lfutil.readhash()

largefiles: check if largefile could be found when archiving (issue3193)

largefiles: refactor lfutil.findfiles to be more logical

forget: fix subrepo recursion for explicit path handling When support for handling explicit paths in subrepos was added to the forget command (95174c381525), subrepo recursion wasn't taken into account. This change fixes that by pulling the majority of the logic of commands.forget into cmdutil.forget, which can then be called from both there and subrepo.forget.

add: fix subrepo recursion for explicit path handling When support for handling explicit paths in subrepos was added to the add command (9e99d2bbb1b1), subrepo recursion wasn't taken into account. This change adds an explicitonly argument to cmdutil.add to allow controlling which levels of recursion should include only explicit paths versus all matched paths.

tests: add subrepo recursion tests for add/forget with explicit paths When support for handling add/forget of explicit paths within subrepos was added (9e99d2bbb1b1/95174c381525), nested subrepos weren't handled properly. This change adds test coverage to expose the broken behavior, which will be fixed in later patches.

merge with stable

bookmarks: backout locking change in 12dea4d998ec Repo lock only applies to data in .hg/store/

changeset_printer: display changeset phase on debug level Backward compatibility make it hard to display it on higher level

phase: report phase movement When used in "set" mode, the phase command now display the number of changeset who changed phase.

largefiles: correctly handle newly added largefile on other side of merge

rebase: write series file without removed mq patches Rebase will remove empty changesets and will also completely remove the mq patch file for rebased empty patches. Starting with b28004513977 (1.9) it would preserve guards by writing the old series file back. That would however also reintroduce removed patch files in the series file and the inconsistency would make qpop + qpush fail. This patch backs out most of b28004513977 and makes sure guards are preserved without reintroducing removed patches.

revset: roots needs to be computed on full set

phases: use nodemap to check for missing nodes

repair: move phases code after invalidation code

largefiles: remove empty directories upon update (issue3202)

revset: optimize roots and children

revset: optimize building large lists in formatrevspec The large or-expressions we used to build required a substantial amount of subset filtering in orset() which was inefficient. Instead we build a single string which we process in one go with a special internal predicate.

hg-ssh: use shlex for shell-like parsing of SSH_ORIGINAL_COMMAND The Mercurial ssh protocol is defined as if it was ssh-ing to a shell account on an ordinary ssh server, and where hg was available in $PATH and it executed the command "hg -R REPOPATH serve --stdio". The Mercurial ssh client can in most cases just pass REPOPATH to the shell, but if it contains unsafe characters the client will have to quote it so the shell will pass the right -R value to hg. Correct quoting of repopaths was introduced in d8fa35c28335 and tweaked in 86fc364ca5f8. hg-ssh doesn't create the command via a shell and used a simple parser instead. It worked fine for simple paths without any quoting, but if any kind of quoting was used it failed to parse the command like the shell would do it. This makes hg-ssh behave more like a normal shell with hg in the path would do.

hooks: prioritize run order of hooks As of Mercurial 1.3, hooks are sorted in the order they are read into Mercurial. There are many instances when someone may want the hooks sorted in a specific order; this patch allows prioritizing hooks, while maintaining the existing enumeration for hooks without a priority.

merge with stable

merge: report all files in _checkunknown When doing hg up, if there is a file conflict with untracked files, currently only the first such conflict is reported. With this patch, all of them are listed. With this patch error message is now reported as a: untracked file differs b: untracked file differs abort: untracked files in working directory conflict with files in requested revision instead of abort: untracked file in working directory differs from file in requested revision: 'a' This is a follow up to an old attempt to do this here: http://selenic.com/pipermail/mercurial-devel/2011-August/033625.html

discovery: fix prepush documentation The prepush documentation claim that when we refuse to push, the second element of the returng tuple is an "outgoing" integer. value should be 0 when no outgoing changeset and 1 otherwise. In pratice if there are no outgoing changeset, "outgoing" value is alway 1 and util.Abort is raised on other error. the stable branch also include this error so it wasn't introduced by a recent refactoring.

phases: simplify phase exchange and movement over pushkey The code now only exchange draft root and only care about movement related to public//draft boundary. There is multiple reason to simplify this code: * Secret are never discovered anymore * We decided to not support more the three existing phase Removing phase index from pushkey (if ever decided) will be made in another commit.

phases: move phase according what was pushed not only what was added added This fix the lack phase movement when a locally secret changeset without added children was pushed to the repository. In such case, this changeset would be present in the bundle source, but not in the ``added`` variable.

revlog: make addgroup returns a list of node contained in the added source This list will contains any node see in the source, not only the added one. This is intended to allow phase to be move according what was pushed by client not only what was added.

phases: make secret changeset undiscoverable in all case This apply the redefined stronger semantic of secret. Secret changeset can still leak in various way. Those leak will need to be fixed individualy

phases: exclude secret when doing a local clone This is achieved by denying copy clone when any secret changeset exist.

bookmarks: primarily use repo lock, not wlock Bookmarks are repository data, not working directory data. Only the current bookmark is working directory data. Some lock shuffling is required to avoid lockout between the initial mock lock and locking of the localrepo instance that is created after copying.

localrepo: update branchcache in a more reliable way test-mq-cache.t did apparently look at stale cache content. Testing with different locking mechanism happened to update the cache more frequently and thus caused a test failure.

tests: make qnew in test-mq-caches.t stable The unstable hashes did for other reasons not show up in the test output.

localrepo: remove spurious updatebranchcache return value - it was left over from the refactoring in d01e28657429.

mq: only save dirty files once when savedirty is called multiple times

mq: remove early wlock release in qnew It seems like something that missed the refactoring in 97b734fb9c6f.

mq: use .invalidate to cancel dirty mq state when cancelling transaction Before the code optimistically relied on savedirty not being called a cancelled transaction. If it was called it could save incorrect data. Instead we now start using the invalidate method introduced in b169ba60eebe.

mq: make qsave implementation more explicit It wasn't obvious from the code how qsave mocked around with .hg/patches and .hg/patches.? and what was going on. This makes it more explicit so it will survive future refactorings.

mq: consistently use boolean values for dirty flags

mq: minor cleanup

tag: lock before tagging

tests: lock before creating transaction in test-filelog

debugbuilddag: lock repo before starting transaction

rebase: take locks in the right order repo.lock was taken before repo.wlock - that could in principle cause a deadlock.

tests: keep track of all check-code.py warnings

filectx: typo in comment

keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file Analogous to 012b285cf643.

bugzilla: make XMLRPC interface support http and https access Inadvertently support is currently only for https. For some reason I thought xmlrpclib.SafeTransport did http and https, but it is https only. So create http and https XMLRPC transports that retain cookies. Decide which to use by inspecting the Bugzilla URL.

merge with stable

merge with i18n

i18n-ru: editorial for 'abort' and 'pipe'

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