largefiles: restore normal 'clone -u' and 'clone -U' functionality Previously, tip would be checked out regardless of the -u or -U parameter. I'm not sure what the 'required for successful walkchangerevs' comment meant, but it appears to reference code which has since moved to downloadlfiles() in 7d6a660ca151. Perhaps it was to force caching when the -U parameter is given? The price of this change is that -U --all-largefiles won't cache anything. That will be fixed next. Note that X + Y in the 'X largefiles updated, n removed' and 'Y additional largefiles cached' lines do not add up to the same values in these tests, but all of the largefiles have been downloaded. The reason being that several largefiles have the same content (eb7338044 is pointed to by sub/large2, large3 and sub/large4). In the 'clone -u 1' operation, this largefile is cached to populate the working directory, even without --all-largefiles. That means the file isn't downloaded again and cached in the rev where large3 and sub/large4 both point to this file. Downloading that one file in that one rev seems to be counted twice with 'clone -u 0'. (Maybe it is also being downloaded twice?)

formatter: add base implementation of data method Previously, nothing was done with the passed in values, which clearly wasn't the intention.

merge with stable

merge with main

largefiles: fix trailing spaces in test-largefiles.t With the default branch this will cause warnings from check-code.

test-hybridencode: add a case for direncode

store: optimize fncache._write by direncoding the contents in one go For a netbeans clone on Windows 7 x64: Before: $ hg perffncachewrite ! wall 0.210000 comb 0.218401 user 0.202801 sys 0.015600 (best of 47) After: $ hg perffncachewrite ! wall 0.104000 comb 0.109201 user 0.078000 sys 0.031200 (best of 95)

store: move encode lambda logic into fncachestore and define two named functions at module scope. This again also speeds up perffncacheencode a little bit.

store: eliminate one level of lambda functions on _hybridencode

store: parameter path of _auxencode is now a list of strings

store: keep an accumulated length for the shorted dirs in _hybridencode so we don't have to repeatedly do '/'.join(sdirs) inside the loop

store: reorder basename assignment in _hybridencode

store: remove uneeded startswith('data/') checks in encodedir() and decodedir() I don't think we will ever have anything in the store that resides inside a directory that ends in .i or .d under store/ that we wouldn't want to have direncoded. The files not under data/ surely don't need direncoding, but it doesn't harm to let these few run through it. It hurts more to check whether the thousands of other files start with 'data/'. They do anyway. See also 810387f59696 (fixed with c31fe74a6633), which moved the direncoding from filelog into store

store: remove uneeded startswith('data/') check in _hybridencode()

store: refactor splitting off of "data/" in _hybridencode() encodefilename() already calls encodedir(). Note that encodedir() skips the encoding if the path doesn't start with "data/".

merge with stable

merge with crew

Merge with stable

hgweb: fix incorrect graph padding calculation (issue3626) hgweb has an incorrect padding calculation, causing the text to move further away from the graph the more branches there are (issue3626). This patch fixes all existing templates (gitweb, monoblue, paper and spartan). Tests updated by Patrick Mezard <patrick@mezard.eu>

largefiles: preserve the exit status of the forget command This maintains the exit codes documented in commands.py.

largefiles: preserve the exit status of the rebase command

largefiles: preserve the exit status of the log command

largefiles: exit from remove with 1 on warnings This maintains the exit codes documented in commands.py.

largefiles: preserve exit code from outgoing command (issue3611) This maintains the exit codes documented in commands.py.

store: let _auxencode() return the list of path segments so we can spare us splitting the path again in _hybridencode()

store: eliminate unneded last assignment to n in _auxencode() The check for period or space at the end of the string is the last one, the local variable n is thus not used anymore.

store: unindent most of the contents of the for loop in _auxencode() by refactoring for i, n in enumerate(res): if n: <main code block> to for i, n in enumerate(res): if not n: continue <main code block> (no functional change)

store: optimize _auxencode() by assigning to the list elements of the path

store: optimze _auxencode() a bit by grouping the reserved names by length This reduces perffncacheencode wall time on Windows 7 x64 for my netbeans clone here from 4.3 to 4.0 (7% faster).

store: explain "aux.foo" versus "foo.aux" in doc of _auxencode()

store: add 'com0' and 'lpt0' doctest cases for _auxencode() These are already covered by test-hybridencode.py, but they are so noteworthy that I think they deserve being shown right in that doctest.

wireproto: fix check-code.py breakage introduced by 6d97dd630d79

record: fix display of non-ASCII names in chunk selection b013baa3898e fixed display of non-ASCII names in file-selecting prompt, but display in chunk selection remained broken. The reason is that using '%r' in string formatting results in calling `repr` on file names, thus mangling non-ASCII ones.

tests: enable even more Windows server tests

test-obsolete-checkheads: fix on windows

sshserver: avoid a multi-dot attribute lookup in a hot loop This improves stream_out performance by about 3%.

store: reduce string concatenation when joining This improves stream_out performance by a couple of percent.

scmutil: use the new faster path split Combined with a few other patches in this series, this contributes to improving stream_out performance by 10%.

util: implement a faster os.path.split for posix systems This is not yet used.

scmutil: make join cheaper Combined with a few followup patches, this contributes to improving stream_out performance by 10%.

wireproto: don't format a debug string inside a hot loop This improves stream_out performance by about 5%.

wireproto: bypass filechunkiter for small files when streaming Merely creating and using a generator has a measurable impact, particularly since the common case for stream_out is generators that yield just once. Avoiding generators improves stream_out performance by about 7%.

wireproto: don't audit local paths during stream_out Auditing at this stage is both pointless (paths are already trusted by the local repo) and expensive. Skipping the audits improves stream_out performance by about 15%.

scmutil: delegate mustaudit property to the real opener This will be used by an upcoming patch.

scmutil: turn opener._audit into a property, mustaudit This will be used by an upcoming patch.

perf: add perffncacheencode Examples (all done with somewhat dated clones I found on my disk): Netbeans (~120k entries in fncache): $ hg perffncacheencode ! wall 4.338000 comb 4.336828 user 4.336828 sys 0.000000 (best of 3) Openoffice (~77k entries in fncache)): $ hg perffncacheencode ! wall 1.533000 comb 1.528810 user 1.528810 sys 0.000000 (best of 7) Xen (~10k entries in fncache): $ hg perffncacheencode ! wall 0.198000 comb 0.187201 user 0.187201 sys 0.000000 (best of 51) Done on Windows 7 x64.

Merge with mpm

bookmark: take successors into account when updating (issue3561) When we rewrite a bookmarked changeset, we want to update the bookmark on its successors. But the successors are not descendants of its precursor (by definition). This changeset alters the bookmarks logic to update bookmark location if the newer location is a successor of the old one[1]. note: valid destinations are in fact any kind of successors of any kind of descendants (recursively.) This changeset requires the enabling of the obsolete feature in some bookmark tests.

bookmarks: extract valid destination logic in a dedicated function We usually update bookmarks only if the new location is descendant of the old bookmarks location. We extract this logic into a function. This is the first step to allow more complex logic using obsolescence in this validation of the bookmark movement.

checkheads: don't warn about unsynced changes that we ill obsolete We won't be able to pull them after this push.

checkheads: check successors for new heads in both missing and common A relevant obsolete marker may have been added -after- we previously exchanged the changeset. We have to search for remote heads that disappear by the sole fact of pushing obsolescence. This case will also happen when remote got the new version from a repository that does not propagate obsolescence markers.

checkheads: attend to phases when computing new heads with obsolete Checkheads was more permissive than expected. When the remote heads are public we don't need to search for successors. None will make a public head disappear.

test: add testing of checkheads behavior with obsolete Expected behavior is quite complex. Explicit testing with clear scenarios is welcome.

merge with stable

i18n-pt_BR: synchronized with f5e86b416e05

merge with i18n

i18n-de: Remove unused sprintf parameter

tests: unset variable HG if it is set When hg tries to call itself it can call a different hg executable when this variable is set. Some tests fail when the called hg version is different.

test-hybridencode: a few more cases

tests: enable more server tests on Windows

test-static-http.t: enable on Windows We cannot read $! to get the background job process identifier, with MinGW it can return internal identifiers not matching the native Windows ones. Instead we introduce a helper script polling on the pid file. We assume the pid file data will be written in order.

Merge spelling fixes

spelling: requested

en-us: serialization

en-us: recognized

en-us: penalize

en-us: initialization

en-us: Initialize

grammar: it-handles

grammar: rolled-back

grammar: just-the-heads

spelling: value

spelling: update

spelling: transferred

spelling: transaction

spelling: thoroughly

spelling: syntactic

spelling: synchronize

spelling: supersede

spelling: successfully

spelling: succeeded

spelling: Structured

spelling: split

spelling: specific

spelling: shouldn't

spelling: sentinel

spelling: responsibility

spelling: relies

spelling: release

spelling: recursion

spelling: propagated

spelling: primarily

spelling: prior

spelling: precede

spelling: override

spelling: operations

spelling: multiple

spelling: Macintosh

en-us: labeled

spelling: just

spelling: journaling

spelling: deactivates

spelling: implementing

spelling: indented * * * spelling: indented

spelling: further

spelling: following

spelling: nonexistent

spelling: existence

spelling: exercise

spelling: equivalent

spelling: efficiently

spelling: don't/do not

spelling: doesn't/does not

spelling: destination

spelling: directly

spelling: descendants

spelling: deactivate

spelling: dependent

spelling: Failing

spelling: Explicitly