merge with mpm

test-help.t: fix for non-Linux platforms

Added signature for changeset b96cb15ec9e0

Added tag 2.9.1 for changeset b96cb15ec9e0

merge: audit the right destination file when merging with dir rename

setup: specify --prefix="" for install-home-bin to avoid badness with defaults Sometimes (I'm not sure when) setup.py gets a default value for --prefix, which breaks --home. This fixes that for me.

revset: add 'only' revset Adds a only() revset that has two forms: only(<set>) is equivalent to "::<set> - ::(heads() - heads(<set>::))" only(<include>,<exclude>) is equivalent to "::<include> - ::<exclude>" On a large repo, this implementation can process/traverse 50,000 revs in 0.7 seconds, versus 4.2 seconds using "::<include> - ::<exclude>". This is useful for performing histedits on your branch: hg histedit -r 'first(only(.))' Or lifting branch foo off of branch bar: hg rebase -d @ -s 'only(foo, bar)' Or a variety of other uses.

revset: added basic operators to orderedlazyset Now __and__ and __sub__ return orderedlazyset.

revset: changed revset code to use filter method Revset methods now use the filter code to apply a condition.

revset: added filter method to revset classes This method will replace the creation of lazysets inside the revset methods. Instead, the classes that handle lazy structures will create them based on their current order.

revset: added orderedlazyset class

config: make repo optional again

merge: fix spelling of length

ui: edit(): transplant: set HGREVISION environment variable for an editor transplant command set 'transplant_source' extra for the revision. Allow an editor to access the extra using HGREVISION environment variable. This may be useful when an editor is actually a script which modifies a commit message. Transplant filters is an alternative way to do it.

ui: edit(): rebase, graft: set HGREVISION environment variable for an editor rebase and graft commands set 'rebase_source' or 'source' extras for the revision. Allow an editor to access the extras using HGREVISION environment variable. This may be useful when an editor is actually a script which modifies a commit message. The name 'HGREVISION' has been selected as transplant already sets this variable for its filters (--filter).

cmdutil: make commitforceeditor() to pass revision extras to ui.edit()

ui: allow edit() to work with revision extras Make edit() to accept optional 'extra' dictionary. Revision extras will be used in upcoming patches to set some environment variables.

tests: glob match has a glob character for not getting a warning on windows When / matches on / on windows, and there is no other glob character, this results in a warning. Avoid this by using an other glob character.

run-tests: fixed warn detection on failures with too many output The state "warned" was reported too often. The problem fixed here is that warnonly was only reset when a line did not match. When there was a line too much, warnonly remained set. Fix this by setting more states to warnonly. More negative testing (testing on result "Failed") has been done this time.

run-tests: fixed warn detection on detecting warn only for lines The state "warned" was reported too often. The main problem was that "False == 0" is true in python. Therefore use an empty string instead of 0 for reporting warn only for a line. The other problem is fixed in the next patch.

obsolete: extract encoding of marker for pushkey from the list key function We now have a function taking a list and marker and returning an encoded version. This will allow obsolescence marker exchange experimentation to easily pushkey-encode markers to be pushed after selection.

solaris: diff -u emits "No differences encountered" Solaris diff -u isn't silent when two files are identical, and tests that don't account for that will fail. Fix those tests, and introduce a check that prevents reintroduction.

rebase: do not raise an UnboundLocalError when called wrong (issue4106) When the base is not found, we should not raise a traceback about a not defined variable. This hides the real problem: the function rebasenode was (probably) called wrong. An AssertionError is raised to highlight that the caller of the function did something wrong. An alternative approach is to only assign None to the variable "base" and let the merge mechanism raise an abort message. This was the behaviour for this case before ad9db007656f. But the only known case for this problem is when an extension calls this function wrong. An AssertionError makes this clearer than an abort message. When a different case is detected, the behaviour can be improved then.

exchange: fix docs for pulloperation 'remote' is actually the remote, not the repo one is pulling into. This confused me quite a bit.

merge with stable

resolve: use "other" changeset from merge state (issue4163) We can use the "other" data from the recorded merge state instead of inferring what the other could be from working copy parent. This will allow resolve to fulfil its duty even when the second parent have been dropped. Most direct benefit is fixing a regression in backout.

merge: add "other" file node in the merge state file This data is mostly redundant with the "other" changeset node (+ other changeset file path). However, more data never hurt. The old format do not store it so this require some dancing to add and remove it on demand.

merge: infer the "other" changeset when falling back to v1 format When we have to fallback to the old version of the file, we infer the "other" from current working directory parent. The same way it is currently done in the resolve command. This is know to have shortcoming… but we cannot do better from the data contained in the old file format. This is actually the motivation to add this new file format.

merge: record the "other" node in merge state We need to record the merge we were merging with. This solve multiple bug with resolve when dropping the second parent after a merge. This happen a lot when doing special merge (overriding the ancestor). Backout, shelve, rebase, etc. can takes advantage of it. This changeset just add the information in the merge state. We'll use it in the resolve process in a later changeset.

merge: introduce new format for the state file This new format will allow us to address common bugs while doing special merge (graft, backout, rebase…) and record user choice during conflict resolution. The format is open so we can add more record for future usage. This file still store hexified version of node to help human willing to debug it by hand. The overhead or oversize are not expected be an issue. The old format is still used. It will be written to disk along side the newer format. And at parse time we detect if the data from old version of the mergestate are different from the one in the new version file. If its the same, both have most likely be written at the same time and you can trust the extra data from the new file. If it differs, the old file have been written by an older version of mercurial that did not knew about the new file. In that case we use the content of the old file.

merge: change the merge state serialisation to use a record based logic The format of the file is unchanged. But we are preparing a new file with a new format that would be record based. So we change all the read/write logic to handle a list of record until a very low level. This will allow simple plugging of the new format in the current code.

merge: move merge state file path into a constant We are about to change the format. Having the file path in a single place make it easier to update the filename for the new version.

revset: changed spanset __add__ implementation to work lazily $ time hg log -qr "first(0:tip or draft())" ... real 0m1.032s user 0m0.841s sys 0m0.179s $ time ./hg log -qr "first(0:tip or draft())" ... real 0m0.378s user 0m0.291s sys 0m0.085s

revset: changed lazyset __add__ implementation to work lazily Performance Benchmarking: $ time hg log -qr "first(author(mpm) or branch(default))" 0:9117c6561b0b real 0m3.875s user 0m3.818s sys 0m0.051s $ time ./hg log -qr "first(author(mpm) or branch(default))" 0:9117c6561b0b real 0m0.213s user 0m0.174s sys 0m0.038s

obsstore: add a __len__ method We can already use "for mark in store:" it make sense to allow "len(store)" too.

obsstore: `create` method return True if a marker is actually added The obsstore method now have a return value. This informs caller about the actual creation of a new markers. No new markers are created if it would have been a duplicate.

merge with crew

help: exclude deprecated extensions in the disabled part of 'help extensions'

test-help.t: add test for 'hg help extensions' This demonstrates the defect that deprecated extensions show up in the output. A followup patch will fix this defect.

ui: fix extra space in username abort

tests: fix up config --edit breakage

merge with stable

coal: hgweb style adds extra blank line in file view (issue4136) Now hgweb style='coal' adds no extra blank in file view.

pull: close peer repo on completion (issue2491) (issue2797) When pulling changes from a compressed bundle Mercurial first uncompresses it to a temporary file in .hg directory. This file will not be deleted unless the bundlerepo (other) is explicitly closed. This is similar to cleanup that occurs after incoming.

hgweb: ensure isdirectory is None for repositories, replacing any True value Until now, repositories did not provide any value for isdirectory in rows produced for the index output, and thus isdirectory was generally evaluated as None for each index entry representing a repository. However, directories (visible when viewed with the descend and collapse settings enabled) did provide a value of True and this value appeared to persist in subsequent rows processed by the templater, causing isdirectory tests in templates to produce incorrect results for index entries appearing after directories. This patch asserts the None value for repositories, thus erasing any such persistent True values.

ui: suggest config --edit when no username is set

config: add example config file when -e called with no config

config: add initial implementation of --edit This launches the preferred editor on either: a) the first non-empty user rc file found b) the first user rc file in the search list

revert: extract actual revert in its own function With this small refactoring, the computation of the action to perform and the actual change to the disk happen in different function. This allows extension to wrap the later in case of need. The initial motivation is the `remotefilelog` extension that need to prefetch all the file content to be checked out.

config: move showconfig code and add config as primary alias Preparation for adding config --edit to launch an editor

revset: added _hexlist method to replace _list for %ln Now %ln expression goes through _hexlist and doesn't do any unnecesary processing anymore.

merge with stable

localrepo: language and spelling fixes in comment

revset: added _intlist method to replace _list for %ld Now %ld expression goes through _intlist and doesn't do any unnecesary processing anymore.

purge: avoid duplicate output for --print (issue4092) Now "hg purge -p" commands avoids printiing duplication of filenames. Second patch is the test coverage of first patch which tells that '-p' does not depend on whether ui.verbose is configured or not,that means it is independent of '-v'.

merge with stable

merge with stable

merge with i18n

i18n-ja: synchronized with 7b9d66c0e4fa

i18n-pt_BR: synchronized with 4e41b2fe46cc