merge: deprecate the --force option The --force option in merge does not make what people think it does so it may not be visible to everyone. I have local changes and want to pull one's changes which made 2 heads. The --force option in help says -f --force force a merge with outstanding changes so I can expect that I can use it to force the merge and commit it in my local repository without taking my local changes into account. But merging with -f keeps local changes and "add" them: they must be committed or reverted before doing the merge commit. The merge -f cannot be reverted so it leads my repository in a bad state: cannot commit merge and don't want to revert/commit local changes yet. Message in help have been updated to emphasize the fact that local changes are included in the merge.

run-tests: revert previous commit, run() waits after a timeout

run-tests: reap timed-out zombies

hgweb: run search instead of showing wrong error for ambigious identifier Before this when multiple changesets hashes in the repos started with the search query string, error was given that the revision isn't found, and it was misleading. Now a simple keyword search runs in this case.

doc: bump copyright year

version: bump copyright year

hgweb: add line wrapping switch to file diff and changeset views

hgweb: file diff and changesets views behave like file source view This gives all the benefits introduced before for file source view, namely code selection without line numbers and correct indents, highlighting line which is linked to, long lines wrapping. Implementation strategy is also the same as for file source view: all the lines are put in a sigle pre tag with span's for each line. Correct line numbering (same as before this patch) is achieved with nested CSS counters.

hgweb: introduce separate classes for stripey background Introduce stripes2 and stripes4 classes to support different structure. They will be useful to implement stripes with pure CSS everywhere instead of current server-side implementation.

hgweb: add line wrapping switch to file source view This uses classList property, which is well-supported now: both Chromium 8.0+, Firefox 3.6+ and Opera 11.5+ support it, as well as relatively modern versions of other browsers.

hgweb: add changelog and search templates to raw style This will make testing hgweb search and other things simpler and more concise, as there is no extra HTML code in the raw style.

hgweb: toggleDiffstat function instead of showDiffstat and hideDiffstat This eliminates the need of two almost equal functions, makes the code cleaner.

doc: make i18n man and html Allow overwrite LANGUAGE and LC_ALL make variables, for make i18n man and html. After this patch, we can make i18n man and html by following command: $ make clean all LANGUAGE=ja

doc: make man and html from translated documents Before this patch, man and html are english only, and there sources are not translatable. This patch make translatable all documents.

gendoc: dispatch print document content by commandline arguments Before this patch, gendoc.py only prints hg.1.gendoc.txt content. This adds any content print function.

gendoc: add showtopic This function prints any topic.

gendoc: rename to showdoc from show_doc This function prints hg.1.gendoc.txt content.

check-code: automatically preppend "warning: " to all warning messages Some warnings had "warning: " at the beginning of their message. Now this is done consistent for all messages. Especially in test-check-code-hg.t it is an advantage to see warnings at once because only exceptions to them are tolerated. It is (almost) as obvious as before a6180647ea. The prefix will not remain when a warning is changed to a failure. A change like a91387a37f will not be necessary anymore.

rollback: add reference to "hg commit --amend" Now that rollback is deprecated (yay!) users might need a pointer to the alternative for 99% of the cases where I used rollback.

run-tests: generally handle line endings on windows by re Recently this regexp was only appended when running a python test. When running a tsttest there was a separate handling for each line type. Simplify and unify this.

run-tests: test for os.altsep instead of os.name when checking \ for / This tells more explicitly what it is about

hgweb: move local changelist function to the beginning of the parent one

hgweb: get rid of branchentry template duplication

merge with stable

run-tests: replace popen locking with a noop _cleanup handler on py24 This also avoids the race condition, and isn't detrimental to job scheduling.

run-tests: only lock Popen wait/poll on python 2.4 It can cause scheduling bubbles and is not necessary on newer pythons.

run-tests: lock popen wait/poll In python2.4, any call to Popen() may attempt to wait on any active process, and wait is not thread-safe. Make it thread-safe. See http://bugs.python.org/issue1731717 for details.

merge with i18n

i18n-de: fixed some strings about stripping

i18n-de: synchronized with fbdac607bff3

rollback: mark as deprecated

worker: properly report errors from worker processes (issue3982)

run-tests: patch over py2.4 proc.wait() race

worker: check problem state correctly (issue3982) If a large update triggered an abort, it was possible for the main thread to still update the dirstate. This fix is incomplete, as the failing worker now doesn't generate a proper error message. This is difficult in the fork-based framework, which relies on exceptions propagating to the top of the dispatcher for formatting.

sshpeer: mark _validrepo internal

progress: respect HGPLAIN

tip: deprecate the tip command

tag: remove incorrect reference to tip

log: remove tip from example

cat: remove incorrect reference to tip

share: remove reference to tip

rebase: simplify references to branch tips

mq: remove reference to tip

hgweb: show current search query in the input field

mq: use an unfiltered property cache for the queue object The same `queue` object should be used in all situations. This allows to store global states on the object (like the reworked shelve extension plans to). The queue object does not need to be distinct for all possible views (no reference to the repo/view used at creation time) it's even a bit surprising that mq still works with the current code.

summary: use missing ancestors algorithm to find new commits For a repository with around 520,000 commits and 190,000 files, this reduces the time hg summary takes from 5.5 seconds to 2.75.

Merge histedit fixes from stable.

histedit: use base for computing renames when folding (issue3729) When a file was renamed in the very first changeset being histedited, the rename was not detected. Consider a history like this: 0 base: add a.txt 1 first: rename a.txt to b.txt 2 last: edit b.txt When 1 and 2 are edited, copies.pathcopies(first, last) correctly returns that nothing was renamed. We must instead use copies.pathcopies(first, last) to detect the initial rename.