largefiles: overridematch() should replace the file path instead of extending (issue3934)

revlog: handle hidden revs in _partialmatch (issue3979) Looking up hidden prefixes could cause a no node exception Looking up unique non-hidden prefixes could be ambiguous

fileset: handle underbar in symbols This was documented, but not implemented.

heads: modernize documentation (issue3992) The old docs emphasized topological heads rather than branch heads and incorrectly defined branch heads as not having children rather than descendants.

convert: catch empty origpaths in svn gettags (issue3941)

template: fix tabindent docstring (issue2880)

merge default into stable for 2.7 code freeze

osutil: consider WindowsError's behaviour to support python 2.4 on Windows This change treat the ESRCH error as ENOENT like WindowsError class does in python 2.5 or later. Without this change, some try..execpt code which expects errno is ENOENT may fail. Actually hg command does not work with python 2.4 on Windows. CreateFile() will fail with error code ESRCH when parent directory of specified path is not exist, or ENOENT when parent directory exist but file is not exist. Two errors are same in the mean of "file is not exist". So WindowsError class treats error code ESRCH as ENOENT in python 2.5 or later, but python 2.4 does not. Actual results with python 2.4: >>> errno.ENOENT 2 >>> errno.ESRCH 3 >>> WindowsError(3, 'msg').errno 3 >>> WindowsError(3, 'msg').args (3, 'msg') And with python 2.5 (or later): >>> errno.ENOENT 2 >>> errno.ESRCH 3 >>> WindowsError(3, 'msg').errno 2 >>> WindowsError(3, 'msg').args (3, 'msg') Note that there is no need to fix osutil.c because it never be used with python 2.4.

churn: split email aliases from the right This splits churn email aliases from the right, to enable incorrectly-specified addresses that include equal signs to be mapped to correct addresses. This will enable aliasing of bad addresses (typically typos) such as: sername=myusername that appear in the churn output through a churn alias such as: sername=myusername = myusername whereas previously splitting from the left would not enable this behavior.

hgweb: highlight line which is linked to at annotate view

hgweb: always start log with searched revision This makes the specified revision be always on top of the list. Before the patch, for example with repo having revisions 0, 1, 2, 3 and user searching for '2', all revisions were shown and the specified one wasn't the first.

util: check if re2 works before using it (issue 3964)

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.

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.

test-histedit-fold: remove unnecessary --template The template is already set by the logt alias.

templater: sort functions alphabetically, as filters are

hgweb: color line which is linked to in file source view Browser compatibility (':target' selector used): IE 8+, FF 3.5+, Safari 3.1+, Opera 9.5+, Chromium 4+, all popular mobile browsers.

hgweb: wrap lines in file source view

hgweb: code selection without line numbers in file source view All the source lines are put in a <pre> tag, which gives correct display and copy&paste in both Chromium (WebKit) and FireFox: line numbers are not copied, all the tabs and spaces are kept. This doesn't change the visual appearance of the view compared to current hgweb version and doesn't use any JS code. Also, stripes in this view are now generated clientside with CSS. This implementation is chosen because other variants have important issues: Strategy FF Chrome current D,LT,E,T,L D,L pre S,NW S,NW pre/div/nbsp LT,E,T,TS,NW TS,NW pre/div/br LT,E,T,NW NW ol/li/nbsp LT,E,T,TS,AJ TS,AJ ol/li/br LT,E,T,AJ AJ pre/span LV LV Legend Strategies: - current: implemented in hgweb before this patch, i.e. divs for each line, and line numbers links in the div too - pre: the whole code in one pre tag with newlines, all line numbers in another one with 'float: left' - pre/div/{nbsp,br}: same as just 'pre', but separate divs for each line and &nbsp; or <br> instead of empty lines (otherwise they are not copied at all) - ol/li/{nbsp,br}: a single ol with li's and divs for each line, &nbsp; or <br> same as in previous strategy - pre/span: this patch Problems: D = (very minor) display problems, like wrong width of leading tabs LT = loses leading/trailing whitespace E = loses embedded whitespace B = loses blank lines T = loses tabs L = selects line numbers LV = (only) visually selects line numbers LVE = (only) visually selects line numbers at empty lines S = no stripes (and no ability to easily highlight lines-which-are-linked-at in the future) TS = space copied instead of empty line AJ = get anchor links only with JS (they work even without) NW = no linewrap easily possible (in future) As for browser versions compatibility, the CSS tricks used are supported in (according to caniuse.com): a) line numbers generation with 'content:' property and CSS counters: IE 8+, all other popular browsers (in pre-WebKit Opera numbers are being copied) b) stripes ('nth-child' selector): IE 8+, FF 3.5+, Safari 3.2+, Opera 9.5+, all other popular browsers c) line numbers are not visually selected ('user-select:' property): IE 10+, Opera 15.0+, all other popular browsers This patch is based on a demo implementation by Martin Geisler <martin@geisler.net>.

tests: print line numbers when checking code When an exception will be listed the line numbers can be replaced with glob as it is done in test-check-pyflakes.t

tests: rename files to py extension instead of copying a 2nd time

tests: check-code all python files in one run

win32mbcs: wrap util.split() util.split() should be wrapped because it is an alias of unsafe os.path.split().

check-code: concatenate "check-code" on compile time The python compiler concatenates two string constants. Use this instead of doing it on run time or instruct the user how to do it. The strings "no-check-code" and "check-code-ignore" has to be specially written for not skipping some checking of the code of this file.

tests: do not skip code-checking on some whole files In filterpyflakes the term no-check-code was probably by accident. In the test the intention was not to skip the entire file but only one line. But any skipping seems to be unnecessary since a longer time.

check-code: do not warn on printf \\x or \\[1-9] When there is a double backslash the following char does not have any special meaning. So do not warn on this. Remove the now obsolete no-check-code statement. (It was used wrongly anyway, it skipped checking the entire file.)

summary: remove passing of rev because summary does not have this The command summary does not have a rev argument, so passing this results is None always. Therefore pass None explicitly.

cleanup: drop unused variables and an unused import

tests: run pyflakes on files from manifest which could be python files Skip a binary file because pyflakes 0.4.0 aborts on it.

Merge with stable.

Added signature for changeset 009794acc6e3

Added tag 2.6.3 for changeset 009794acc6e3

merge with i18n

i18n-ja: synchronized with ec17ddecdf64

merge with stable

merge with i18n

i18n-fr: remove duplicate paragraphs The paragraphs were added as part of the automatic conversion in 42b46d3cb366. Thanks to Timeless for the initial patch.

i18n-fr: remove extra empty line at end of msgtr

i18n-fr: fix malformed literal blocks

i18n-fr: remove extra trailing newline

i18n-it: remove extra trailing newlines

i18n-sv: fix malformed literal block

i18n-de: remove extra format character

i18n-de: add missing format character

i18n-de: add missing newline

i18n-de: add missing heading underline

i18n-de: use same format character as in msgid

i18n-de: remove duplicate paragraph It was added in the automatic conversion done in f837e7ea0e73.

i18n-de: fix malformed note directive

i18n-de: remove extra format character

i18n-de: add missing literal block

i18n-it: remove extra trailing newline and fix translation Thanks to Timeless for flagging the extra newline.

i18n-de: remove bad fuzzy translations These were flagged because they had the wrong number of format characters. Reviewed by Martin Geisler to ensure that the translation couldn't be easily updated to the correct number of format characters.