phase: better error message when --force is needed When trying to turn a draft changeset into a secret changeset, I was told: % hg phase -s . cannot move 1 changesets to a more permissive phase, use --force no phases changed That message struck me as being backwards -- the secret phase feels less permissive to me since it restricts the changesets from being pushed. We don't use the word "permissive" elsewhere, 'hg help phase' talks about "lower phases" and "higher phases". I therefore reformulated the error message to be cannot move 1 changesets to a higher phase, use --force That is not perfect either, but more in line with the help text. An alternative could be cannot move phase backwards for 1 changesets, use --force which fits better with the help text for --force.

hgweb: ignore non numeric "revcount" parameter values (issue4091)

lock: take both vfs and lock file path relative to vfs to access via vfs This patch makes "lock.lock.__init__()" take both vfs and lock file path relative to vfs, instead of absolute path to lock file. This allows lock file to be accessed via vfs.

vfs: add "makelock()" and "readlock()"

hg: rewrite "copystore()" with vfs This patch rewrites "copystore()" with vfs, because succeeding patch requires "lock.lock()" invocation with vfs. This patch uses 'dstbase + "/lock"' instead of "join()" with both elements even on Windows environment but it should be reasonable, because target files given from "store.copyfiles()" already uses "/" as path separator. "util.copyfiles()" between two vfs-s may have to be rewritten in the future.

localrepo: import "lock" module as "lockmod" for readability Before this patch, "localrepo.py" has many methods defining local variable "lock", even though it imports "lock" module as "lock". This ambiguity decreases readability.

transaction: take journal file path relative to vfs to use file API via vfs

vfs: add "chmod()"

vfs: add "isfile()"

transaction: unlink target file via vfs Before this patch, unlink target file is once opened before unlinking, because "opener" before vfs migration doesn't have "unlink()" function. This patch uses "vfs.unlink()" instead of "open()" and "fp.name".

relink: abort earlier when on different devices (issue3916) Add a first check of the devices before collecting candidate files. This is much quicker when big repos are on different devices. Keep the existing check in prune. It checks for same device of the files. This could probably be different in a special repo store (with symlinks).

localrepo: prevent to copy repo local config, copy baseui instead Copying a repos local configuration to another repo is a bad idea because the 2nd repo gets the configuration of the first. Prevent this by really calling repo.baseui.copy when repo.ui.copy is called. This requires some changes in commandserver which needs to clone repo.ui for rejecting temporary changes. This patch has its roots back in the topic "repo isolation" around f0564402d059 and was suggested by mpm.

doc: show details of command options in pages generated by docutils Before this patch, HTML/man pages generated by docutils don't show details of each command options, whether it should take argument or not for example, even though "hg help" does. This patch shows details of command options as same as "hg help" shows. This patch uses "--option <VALUE[+]>" style instead of "--option <VALUE> [+]" used in output of "hg help", because docutils requires that option argument strings starts with "<" and ends with ">".

Makefile: intermediate steps work with temporary copy of hg.pot In case of abortion or a failing step, the target file remains untouched instead of being in an intermediate state.

merge with stable

help: drop help for branches template keyword The {branches} keyword dates to pre-1.0 Mercurial's tag-like branch scheme which allowed changesets to be on multiple branches. This is the last visible vestige of that scheme, users should instead be using {branch}, possibly with if().

test-command-template.t: fix failure due to trailing whitespace

templater: makes branches work correctly with stringify (issue4108)

manifest: increase lrucache from 3 to 4 During a commit amend there are 4 manifests being handled: - original commit - temporary commit - amended commit - merge base This causes a manifest cache miss which hurts perf on large repos. On a large repo, this fix causes amend to go from 6 seconds to 5.5 seconds.

strip: add faster revlog strip computation The previous revlog strip computation would walk every rev in the revlog, from the bottom to the top. Since we're usually stripping only the top few revs of the revlog, this was needlessly expensive on large repos. The new algorithm walks the exact number of revs that will be stripped, thus making the operation not dependent on the number of revs in the repo. This makes amend on a large repo go from 8.7 seconds to 6 seconds.

revlog: return lazy set from findcommonmissing When computing the commonmissing, it greedily computes the entire set immediately. On a large repo where the majority of history is irrelevant, this causes a significant slow down. Replacing it with a lazy set makes amend go from 11 seconds to 8.7 seconds.

merge with stable

histedit: hold wlock and lock while in progress Currently, histedit acquires and releases lock and wlock several times during its run. This isn't great because it allows other hg processes to come in and change state. With this fix, lock and wlock are acquired and released exactly once. The change to test-histedit-drop.t is a minor implementation one -- the cache is still correctly invalidated, but it just happens a little later and only gets printed out because of the unrelated --debug flag.

merge with i18n

i18n-pt_BR: fix typos in notify docs

i18n-pt_BR: synchronized with 06e118c097ff

templater: only recursively evaluate string literals as templates (issue4103)

templater: fix escaping in nested string literals (issue4102) Before the templater got extended for nested expressions, it made sense to decode string escapes across the whole string. Now we do it on a piece by piece basis.

merge with stable

shelve: unshelve using an unfiltered repository when evolve is enabled and a hidden obsolete changeset exists in the repository, the strip during unshelve will fail due to filtered revs. we use an unfiltered repository like to repair.strip to strip the proper nodes.

largefiles: update in two steps, handle interrupted updates better An update would try to fetch any missing largefiles after having updated normal files and standins. That could fail or be interrupted and would leave the working directory in a state where the largefiles not only were missing but also were scheduled for remove ... and where the old largefile was left in place. Instead we now remove old largefiles before starting to download and update missing largefiles.

largefiles: inline _updatelfile, prepare for further refactorings

largefiles: cache largefiles for update, also without printmessage

largefiles: cleanup of printmessage handling - the printed flag was redundant

test-module-imports: skip on Python < 2.6, since ast is new in 2.6

Merge with stable.

convert: fix svn crash when svn.ra.get_log calls back with orig_paths=None get_log started calling back with orig_paths=None on Fedora 20 with subversion-1.8.3. That broke test-convert-svn-source.t . There used to be some handling of that situation until e8f4e40f285a apparently broke it. This patch restores what seems to be the most obvious handling of the situation.

share: fix unshare calling wrong repo.__init__() method When running the unshare command, if there's other code that tries to use the repo after the command is finished, it'll end up with a ui object for repo.unfiltered(). This change fixes an erroneous call to repo.__init__() that could be on the repoview proxy class--now it's always done on the unfiltered repo.

statichttprepo.httprangeheader: implement readlines bookmarks.readcurrent() requires readlines() on file objects returned from repo.vfs. It isn't used right now but will be in upcoming patches.

statichttprepo: pass in True to splitlines, not 1 splitlines actually takes a boolean.

mq: don't add '* * *' separators when there is no commit message

bisect: avoid confusing use of variables with same names in nested local scopes

discovery: make note messages for new heads more readable

discovery: tweak error message for multiple branch heads

test-obsolete-checkheads.t: remove todo comment that was fixed in be0fcbb1c92f

convert: readability and test of rpairs function

tests: make doctest test runner less verbose

tests: python hash seed is only relevant after failures - otherwise keep quiet

scmutil.filecache: support watching over multiple files

scmutil: introduce a filecacheentry that can watch multiple paths

scmutil: rename filecacheentry to filecachesubentry Upcoming patches will allow the file cache to watch over multiple files, and call the decorated function again if any of the files change. The particular use case for this is the bookmark store, which needs to be invalidated if either .hg/bookmarks or .hg/bookmarks.current changes. (This doesn't currently happen, which is a bug. This bug will also be fixed in upcoming patches.)

scmutil.filecacheentry: make stat argument to constructor mandatory There's no real upside to making stat optional -- this constructor has just two callers.

test-filecache.py: add markers to the output for each event Previously it was possible that a different, incorrect set of events might print out 'creating' the same number of times.

test-filecache.py: make setbeforeget test clearer '0' and 'None' as outputs tripped me up. Make the distinction between values set externally and values computed by calling the decorated function clearer.

test-module-imports.t: new test to use the import cycle detector

import-checker: try a little harder to show fewer cycles This makes sure that all cycles begin with the lexicographically first module, so that we're less likely to show overlapping cycles in the final analysis.