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.

i18n-da: remove bad fuzzy translation Reviewed by Martin Geisler.

i18n-da: remove extra trailing newline

i18n-da: add missing newline

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

i18n-da: add missing format character and fix translation Thanks to Timeless for flagging the missing format character.

i18n-da: add missing heading underline

i18n-da: remove bad fuzzy translation

i18n-da: add missing format character and fix translation Thanks to Timeless for flagging the missing format character.

i18n-el: add missing indention for literal block Thanks to Timeless for flagging this.

i18n-el: remove extra newline

i18n-el: remove duplicate paragraphs They were added in the conversion done in 8ef2cd109dc6.

i18n-zh_CN: remove duplicate paragraphs They are added in the automatic conversion in e5b7841e0008.

i18n-zh_CN: add missing literal blocks

i18n-zh_CN: remove duplicate paragraphs

i18n-ru: spell "ElementTree" correctly

i18n-ru: fix translated config section

merge with crew

tests: simplify and document the sorting of pyflake messages The pyflake messages are simply ordered by message type, path, line no (and message text). The message type is taken from the order of the filters. The previous ordering looks complicated and illogically. It was the following order (r'\3:\5:\4:\1:\2:' + line): message (\3 and \5) var name (\4) path (\1) line no (\2) line reference Ordering by var name before path looks illogically for me.

bundle: move file chunk generation to it's own function Moves the file chunk generation part of bundle creation to it's own function. This allows extensions to customize the filelog part of bundle generation.

parents: change parents command to use filectx Changes the parents command to use filectx to look up the change node instead of doing it manually. This allows extensions to modify the file-to-commit relationship behind the filectx api.

update: remove .hg/graftstate on clean (issue3970) e078ea9b4ce4 introduced a check for interrupted grafts while committing. This exposed a bug where hg update --clean didn't remove that file.

i18n-pt_BR: synchronized with b500a663a2c7

templater: add strip function with chars as an extra argument This allows specifying characters to strip, like the Python strip function.

Merge with main.

revlog: add exception when linkrev == nullrev When we deployed the latest crew mercurial to our users, a few of them had issues where a filelog would have an entry with a -1 linkrev. This caused operations like rebase and amend to create a bundle containing the entire repository, which took a long time. I don't know what the issue is, but adding this check should prevent repos from getting in this state, and should help us pinpoint the issue next time it happens.

merge with stable

revlog: add exception when linkrev == nullrev When we deployed the latest crew mercurial to our users, a few of them had issues where a filelog would have an entry with a -1 linkrev. This caused operations like rebase and amend to create a bundle containing the entire repository, which took a long time. I don't know what the issue is, but adding this check should prevent repos from getting in this state, and should help us pinpoint the issue next time it happens.

changegroup: fix fastpath during commit Change 627cd7842e5d dropped the 'revset' variable which kept track of which changesets were being bundled. Instead, it used "not in commonset" to decide which changesets were outgoing.. which ran into trouble when a commit was in progress.

tests: do not print hgrc in test This lets test-rebase-cache.t pass also when --inotify or --extra-config-opt is specified.

contrib: delete setup3k in favor of setup --c2to3 setup3k was merged into setup in 7a7a1c594d. Now finally get rid of it.

cleanup: remove unused imports detected by pyflakes

tests: check-code more python files without py extension files found by running $ hg manifest | grep -v "\." | xargs file | grep python

dummyssh: fix check-code nit

test-pathencode: randomize length of each path component This makes it possible for long and short components to exist in the same path. This also makes shorter path components more likely. For randint(1, randint(1, n)), the likelihood that one sees a number k (1 <= k <= n) is 1/n * (\sum_{k=i}^n 1/i). This decreases with k, much like in the real world where shorter paths are more common than longer ones. The previous fix and this one together cause issue3958 to be detected by this test with reasonable frequency. When this test was run 100 times in a loop, the issue was detected 30 of those times.

test-pathencode: reduce makepart length requirement by 1 This allows path components of length 1 to be generated.

pathencode: fix hashmangle short dir limit (issue3958) The Python version of this (see mercurial/store.py:_hashencode) copies path components up to a limit of maxshortdirslen bytes. The Python version does not consider the initial "dh/" to be part of the this, though, while the C version currently does. Adding len("dh/") == 3 to the limit for the C version brings it in line with the Python version. This was not caught by the randomized testing scheme in test-pathencode.py because of a couple of flaws with the test. Upcoming patches will fix those problems.

docs: change description to synopsis in hgrc.5 Spotted by Eric S. Raymond.

run-tests: sort missing files first instead of raising an error sort first for early telling typos in test names

filectx: remove dependencies on filerev Removing dependencies on filectx.filerev() makes it easier to create a filelog implementation that doesn't have rev numbers.

hg: move return statement after finally block return is always run after finally block. Now we have same functionality, but clearer readability.

run-tests: call Threads constructor with keyword arguments This is suggested in the python documentation (on http://docs.python.org/2/library/threading.html#thread-objects)

run-tests: ignoring tests works again running with --retest did not work anymore because runone still returned None for this case. But this is not allowed since 6a127fa5de23.

check-code: introduce function for using re2 when available Do it similar as in mercurial.util. For simplicity only support flag multiline which is the only one used.

check-code: compile filters when loading

check-code: compile all patterns on initialisation They where compiled once for every checked file (when calling finditer).

check-code: only fix patterns once The patterns were fixed once for every file. Now only do it once when loading the file.

merge with stable

commit: amending with --close-branch (issue3445) You can't close a branch that hasn't got a head. newbranch + commit --close-branch must fail newbranch + commit + commit --amend --close-branch must fail You must not be allowed to close a branch that is not defined.

run-tests: simplify interrupted message

run-tests: remove spurious disable of --time with --debug

run-tests: always gather runtimes

run-tests: when interrupted report time in failure message When --time is specified, the interruption message of an interrupted test is extended with the time the test has run INTERRUPTED: /path/to/tests/test-example.t (after 513 seconds)

run-tests: report interrupted tests When the test run is aborted, a message is printed for each interrupted test. This is helpful when a test is hanging. example failure message: INTERRUPTED: /path/to/tests/test-example.t The message can appear before or after the line with the number of tests

run-tests: open hgrc file only for writing The file is not read here. Opening with "w+" is unnecessary.

color: use pythons isinstance method instead of reprogramming it

color: only provide the required opt to _modesetup

doc: make it easier to read how to enable extensions We tell people all the time that enabling extensions is not a scary thing to do, but we don't make it easy enough for an absolute novice to do so. When they see a suggestion to do "hg extfoo bar", the error message tells them "see hg help extensions", but that help page doesn't actually tell them where configuration files are. Furthermore, the big warning about why extensions aren't enabled by default should be pushed down a little bit. Most of the extensions shipped by hg are not all that scary, and some very basic and useful cosmetic extensions like graphlog, color, pager, and progress, should be enabled for many hg users.

doc: reword "config file" to "configuration file" While we do use the abbreviation "config" elsewhere in the docs, the phrase "configuration file" is always written out in full, except in this location in phases.txt.

run-tests: make --noskips work

filelog: switch 'not len(filerevlog)' to 'not filerevlog' A few places in the code use 'if not len(revlog)' to check if the revlog exists. Replacing this with 'not filerevlog' allows alternative revlog implementations to override __nonzero__ to handle this case without implementing __len__.

annotate: simplify annotate parent function The annotate algorithm used a custom parents() function to try to reuse filectx and filelogs. I simplified it a bit to rely more heavily on the self.parents() which makes it work well with alternative filectx implementations. I tested performance on a file with 5000+ revisions but no renames, and on a file with 500 revisions repeating a series of 4 edits+renames and saw zero performance hit. In fact, it was reliably a couple milliseconds faster now. Added the perfannotate command to contrib/perf.py for future use.

changegroup: move changegroup file adding to a separate function Moving the logic that adds files to a changegroup to a different function allows extensions to override it and customize the way filelogs are added to changegroups. No logic is changed.

log: move log file walk to its own function This moves the logic that determines which changesets to process during a 'hg log foo.txt' command. Putting it in its own function allows extensions to modify how the file log is traversed. For instance, the current implementation uses filelog revs heavily. Other implementations may not have filelog revs available. The function throws an exception if the traversal is not possible via the filelog, so the parent function can do things the slow way if necessary (by walking the entire commit history). Aside from the exception throwing, no logic is changed.

bundle: refactor changegroup prune to be its own function Moving the prune function to be a non-nested function allows extensions to control which revisions are allowed in the changegroup. For example, in my shallow repo extension I want to prevent filelogs from being added to the bundle. This also allows an extension to use a filelog implementation that doesn't have revlog.linkrev implemented.

filectx: refactor filectx.rev() to use filectx._changeid The code in filectx.rev() was identical to filectx._changeid. Fixing this allows alternative filectx implementations to only override _changeid.

util: add an optional timestamp parameter to makedate This will be used by the upcoming shelve extension.

util: rename ct variable in makedate to timestamp

merge: add a files method to the mergestate class This will be used in the upcoming shelve extension.

histedit: raise ImportError when demandloading is enabled

run-tests: add --loop support This makes it easy to run tests repeatedly at high loads to look for test failures.

run-tests: --interactive and --jobs no longer conflict