hgweb: show full date in rfc822 format in tooltips at shortlog page The absolute date was not shown anywhere in the log view for users with enabled JavaScript.

hgweb: remove trailing whitespace in mercurial.js

paper: get rid of changelogtag template duplication

obsolete: clean up a couple of docstrings for correctness

run-tests: only check the common criteria once per test

merge with stable

Added signature for changeset f37b5a17e6a0

Added tag 2.7 for changeset f37b5a17e6a0

bookmarks: pull --update updates to active bookmark if it moved (issue4007) This makes `hg pull --update` behave the same wrt the active bookmark as `hg pull && hg update` does as of 2096e025a728. A helper function, bookmarks.calculateupdate, is added to prevent code duplication between postincoming and update.

merge with i18n

i18n-pt_BR: synchronized with 7b815e38022a

i18n-ja: synchronized with cfdae231ba78

histedit: don't clobber working copy on --abort if not on histedit cset Similar to issue4009, 2.7 will force people to abort histedits before doing interesting things. Without this fix, people with histedit sessions they wandered away from before upgrading to 2.7 could clobber their working copy for no reason.

rebase: allow aborting when descendants detected With this, all aborts will succeed in removing the state, rather than leaving the user in 'what do I do now?' limbo.

rebase: continue abort without strip for immutable csets (issue3997) This causes us to simply discard the rebase state.

rebase: don't clobber wd on --abort when we've updated away (issue4009)

bookmarks: update only proper bookmarks on push -r/-B (issue 3973) Make push -r/-B update only these bookmarks that point to pushed revisions or their ancestors, so we can be sure that commit pointed by bookmark is present in the remote reposiory. Previously push tried to update all shared bookmarks.

checklink: work around sshfs brain-damage (issue3636) With the follow_symlinks option, sshfs will successfully create links while claiming it encountered an I/O error. In addition, depending on the type of link, it may subsequently be impossible to delete the link via sshfs. Our existing link to '.' will cause sshfs to think the link is a directory, and thus cause unlink to give EISDIR. Links to non-existent names or circular links will cause the created link to not even be visible. Thus, we need to create a new temporary file and link to that. We'll still get a failure, but we'll be able to remove the link.

import: cut commit messages at --- unconditionally (issue2148) We used to do this based on X-mailer: mentioning git, but git doesn't put X-mailer in its git-format-patch output.

win32: update Inno Setup installer script and extensions list

revert: fix largefiles breakage

revert: make backup when unforgetting a file (issue3423) This skips the backup if it would be a duplicate.

revsingle: fix silly API issue (issue2992)

Added signature for changeset f0d7721d7322

Added tag 2.7-rc for changeset f0d7721d7322

i18n-it: do not translate rst syntax ".. container::" and ".. note::" are rst syntax and therefore must not be translated.

convert: handle changeset sorting errors without traceback (issue3961)

ancestor.deepest: ignore ninteresting while building result (issue3984) ninteresting indicates the number of non-zero elements in the interesting array, not the number of elements in the final list. Since elements in interesting can stand for more than one gca, limiting the number of results to ninteresting is an error. Tests for issue3984 are included.

ancestor.deepest: decrement ninteresting correctly (issue3984) The invariant this code tries to hold is that ninteresting is the number of non-zero elements in the interesting array. interesting[nsp] is incremented at the same time as interesting[sp] is decremented. So if interesting[nsp] was previously 0, ninteresting shouldn't be decremented.

ancestor.deepest: sort revs in C version This isn't strictly necessary, but it makes the code more consistent with the Python version.

check-code: add a check for the next() builtin, which was new in 2.6

mq: rename next() to nextpatch() to avoid confusing a future check-code patch next() is a builtin starting in 2.6, so it's also nice to avoid shadowing the builtin.

hgweb: replace next(revs) to revs.next() to fix compatibility with Python 2.5-

tests: glob out exception type for directory collision Got three different results on buildbot.

record: add checkunfinished support (issue3955)

checkunfinished: accommodate histedit quirk Turns out histedit actually intends for commits (but not other operations like update) to be possible during its operation.

tests: test-check-code-hg.t works for all files to check with xargs, backslashes are eaten up. Convert them to slashes therefore. This is only a problem with ls (on windows). hg manifest returns slashes. The pipe char is moved before the line end for telling check-code.py that sed does not modify the output.

check-code: do not abort on an unreadable file, only report this

heads: fix children/descendants in doc (issue3992)

paper: fix rendering of the first tab in a line in Webkit (issue3990) This fixes issue3990 for Webkit-browsers, and also older Opera versions. Rendering in firefox is not changed.

hgweb: fix duplication for some search queries Given that N is maximum revision number in a repo, than if a revision with number N-100n or N-100n+1 (for any integer n) is found with a hgweb search, this revision is duplicated in search results.

sslutil: force SSLv3 on Python 2.6 and later (issue3905) We can't (easily) force SSL version on older Pythons, but on 2.6 and later we can force SSLv3, which is safer and widely supported. This also appears to work around a bug in IIS detailed in issue 3905.

httpclient: update to revision 9517a2b56fe9 of httpplus (issue3905) Includes upstream change "socketutil: force SSLv3 by default, as it is safer" which should fix issue 3905.

hgweb: force connection close on early response Not all WSGI servers close the socket when an early response is sent to a large POST request, which can cause the server to interpret the already-sent request body as an incoming (but hopelessly invalid) request.

hgweb: fix incorrect revisions count in graph (issue3977) Actual amount of revisions is used now instead of their numbers in the repo before to deal with skipped numbers correctly.

hgweb: fix incorrect way to count revisions in log (issue3977) Actual amount of revisions is used now instead of their numbers in the repo before to deal with skipped numbers correctly. This iterates starting from the newest revision (which is shown on top) yielding up to the specified count, instead of the reversed order used before. Effect of this change on efficiency is negligible, when the same changesets are returned.

hgweb: always start graph with the revision in url It is the same fix for graph command, as was recently for log. This makes the specified revision be always on top of the graph view. Before the patch, for example with repo having revisions 0, 1, 2, 3 and revision in url being '2', all revisions were shown and the specified one wasn't the first.

merge with i18n

i18n-pt_BR: synchronized with bf6bc4681383

update: add tracking of interrupted updates (issue3113) This takes advantage of the new checkunfinished infrastructure

mq: add checkunfinished support (issue3955)

transplant: add checkunfinished (issue3955) Nobody loves transplant anymore, but it was the first command to have a --continue flag.

histedit: add checkunfinished support (issue3955) The tests contain a couple corner cases where workarounds are now required. Strictly speaking, these are behavior regressions, but of an extremely obscure and marginal sort. Commits or updates in the middle of a histedit would have almost always been fairly serious user error.

rebase: add checkunfinished support (issue3955)

rebase: reorder parent check and state storage This could cause a rebase to be 'in progress' even though it aborted.

commands: add checks for unfinished operations (issue3955) commands checked: backout bisect commit graft import

update: clear any clearable unfinished operations (issue3955) Unclearable operations will cause an abort.

cmdutil: core functionality to block during multistep commands (issue3955) This adds a registration point and check functions that will allow commands to check if multistep operations like an interrupted graft or rebase are in progress before proceeding.

histedit: refuse to edit history that contains merges (issue3962)

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