merge with stable

workingctx: correctly compute the flag for noexec filesystems+merge This bug happens if the filesystem doesn't support exec-bit, during merges, for example in 24ed7a541f23 on the hg repo. If f is not in p1, but is in p2 and has the x-bit in p2, since the dirstate is based on p1, and the FS doesn't support the exec-bit, the dirstate can't "guess" the right bit. We instead fix it in workingcontext.flags()/manifest.

localrepo: simplify _updatebranchcache slightly

merge with stable

add +x to test-update-renames, removed by the merge on 24ed7a541f23

simplify test-issue2137, make it more portable

add documentation for revlog._prereadsize

merge with stable

revlog: fix lazyparser.__iter__() to return all revisions (issue2137) Previously, it only returned revisions that were in the revlog when it was originally opened; revisions added since then were invisible. This broke revlog._partialmatch() and therefore repo.lookup(). (Credit to Benoit Boissinot for simplifying my original test script and for the actual fix.)

revlog: factor out _maxinline global. This lets us change the threshold at which a *.d file will be split out, which should make it much easier to construct test cases that probe revlogs with a separate data file. (issue2137)

merge with stable

merge

prepush: backed out refactoring It has some problems in corner cases and will fail on a test recently introduced on stable. Will maybe be reintroduced later, in a better version.

prepush: add more test cases

prepush: fix bug in warning message selection In certain situations you would be told "you should pull and merge" even when there is nothing to pull.

merge with stable

verify: improve progress descriptions For GUIs, the progress bar is disconnected visually from the text that is output by ui.write(), so it's better to be a little bit redundant in naming the status. "checking" is redundant, since the user is running the verify command. 'changesets', 'manifests', etc, tell the user what is being checked (the entity being counted in the progress bar.

pylint, pyflakes: remove unused or duplicate imports

Fix --blacklist when --jobs > 1 in run_tests.py. The options parsing logic replaces the options.blacklist initial value, a list of filenames, with a dict of test names to filenames. When runchildren rebuilds the command line to launch child processes the dict is flattened and provided as a malformed argument when a filename is expected. Fix is to remove the blacklist option from child invocations since the filtering is handled in the parent anyway.

merge with stable

run-tests.py: reset env variables set by hooks

checklink: use an explicit prefix for the temporary file

revlog: factor out _maxinline global. This lets us change the threshold at which a *.d file will be split out, which should make it much easier to construct test cases that probe revlogs with a separate data file. (issue2137)

fix test-pull after 468876bc3885

merge with stable

revlog: put graph related functions together

checkexec: use an explicit prefix for the temporary file

check-code: add a warnings level - demote "unwrapped ui message"

keyword: make the templater a local variable After 6722ba3bf80b a class attribute makes no sense.

rollback: improve message

transaction: use newlines to separate description elements

progress: fall back to indeterminate progress if position is >= total

mq: promote qnew, demote qinit in short help

commands: improve some command summaries

progress: show approximate progress info for pull

Merge with crew-stable

localrepo: do not store URL password in undo.desc

convert/subversion: fix default URL checker prototype

Merge with stable

patch: don't look for headers in diff lines If you have a diff line that matches a header line, the patch splitter currently breaks your patch at this line. For example a line like: +key: value This can lead to "malformed patch" exceptions. Now fixed.

rollback: add dry-run argument, emit transaction description

localrepo: add desc parameter to transaction All callers to localrepo.transaction() must supply a transaction description. The description and the existing repository tip are then stored (transactionally) into .hg/undo.desc; where rollback can later find it.

merge with stable

merge default

test-hgwebdir: correctly include '-' in sed expression. '\' can't be used to escape '-' from being interpreted as a range, so put it at the end.

localrepo: refactor prepush logic Simplifies the prepush check logic and makes it a lot more direct and comprehensible. Instead of comparing the total local vs. remote head count, it compares the number of new vs. removed heads.

merge with stable

partial backout of 1e819576e926 and add tests (issue2131) The tests are due to Peter Arrenbrecht

copies: properly visit file context ancestors on working file contexts

Merge with stable

mq: use util.unlink instead of os.unlink and os.removedirs If, on Windows, your repository and working copy are in a reparse point and you use os.removedirs, you will remove non-empty reparse points, disabling the reparse point. See @fa901423ac23.

color: respect HGPLAIN

color: add support for Windows consoles Introduces color.mode configurable with values 'auto', 'ansi', or 'win32'. Any other value disables coloring. When 'auto' is selected, the win32 console method will be used if the win32console Python module is detected (requires pywin32 to be installed).

color: remove unused import

merge with stable

merge default with default

merge stable with stable

dirstate: no need to iterate twice, a dict can be updated in place

merge with stable

clone: no race possible, we can use changegroup() and have smaller urls Related to issue2126