ui.config: fix bug in config alternatives from cc669e4fec95

proxy: allow wildcards in the no proxy list (issue1821)

hgweb: cleaner if conditions in changelog() function This removes unneeded extra nesting level and extra variable, which makes the code easier to understand.

hgweb: separate search itself and template generation This will make it simpler to add other search modes.

paper: remove unused occurence of changelogtag in views This variably isn't passed to these views and it always renders to empty string for this reason. Other themes don't have this issue.

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.