run-tests: backout 4f32747879d1 line endings change It made the windows buildbot sad.

hgweb: highlight line which is linked to at comparison view

hgweb: change highlighted line color to be different from 'inserted' color This changes line highlight color from a fain yellow (#ffff99) to a faint blue (#bfdfff), because yellow color is used in comparison view for inserted lines. This new color is okay for people with different forms of color blindness (tested with a simulator): a) this color looks quite different from other used backgrounds b) text doesn't lose distinction on this color

convert: fix bad conversion of copies when hg.startrev is specified The 'copynode' was looked up in self.keep as if it was a changeset node. It is however a filelog node, and self.keep would thus fail if it actually looked at its parameter ... which it only did if a startrev was specified. Instead we now don't check the copy node - we don't have to. It must have been copied from one of the parents, and we already check whether one of the parents have the copy source. We could perhaps use linkrev to see if the corresponding changeset was converted ... but that would sometimes be wrong. The existing test of this was wrong - now it is better, but it seems like it exposes a 'log' issue.

test-convert-hg-startrev: fix test for copy removal on missing parent The test assumed that 'b' was missing just because the changeset that introduced 'b' wasn't converted ... but 'b' was also not removed before the start revision, and the parent was thus not missing at all. Instead we introduce a file 'f' in rev 0 and remove it in rev 1 so the copy source really doesn't exist in the repo that is converted from rev 1.

hgweb: make stripes in diffstat with CSS

hgweb: make stripes in file log with CSS

hgweb: make stripes in graph with CSS

hgweb: make stripes in log and search with CSS

hgweb: make stripes in branch list with CSS

hgweb: make stripes in repo list with CSS

hgweb: make stripes in file annotate view with CSS

hgweb: make stripes in tag list with CSS

hgweb: make stripes in directory view with CSS

hgweb: make stripes in bookmark list with CSS

tests: update for commit --secret

gpg: show "Unknown key ID xxxxxxxx" when the status is ERRSIG

gpg: add shortkey() to convert from long id to short

gpg: getkeys() removes unused returning value "err"

gpg: treat "ERRSIG" as a valid key id but no fingerprint

commit: enable --secret option At the moment, creating secret commits is slightly cumbersome. They can either be created by changing the default commit phase to secret or by doing `hg phase --secret --force`. Both of these make secret commits appear to be like some kind of advanced feature. Secret commits, however, should be a convenient feature for people who want to work on a private branch without affecting anyone else. There should therefore be a prominent and convenient method for creating secret commits. Since the default phase is draft and there is no need to use --force to go from a secret phase to any other phase, this patch intentionally does not add --draft and --public options.

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.