mq: avoid using revlog.nodemap unnecessarily

perf: make perfindex results useful on hg with lazyparser

revlog: only build the nodemap on demand

revlog: remove lazy index

merge with i18n

i18n-da: synchronized with f3058dd05281

merge with stable

url: check subjectAltName when verifying ssl certificate Now it verifies certificate in the same manner as py3k implementation: http://svn.python.org/view/python/branches/py3k/Lib/ssl.py?view=markup#match_hostname

url: fix UnicodeDecodeError on certificate verification error SSLSocket.getpeercert() returns tuple containing unicode for 'subject'. Since Mercurial does't support IDN at all, it just returns error for non-ascii certname.

merge with stable

win32: add cacert.pem file to Inno Setup installer

test-mq-subrepo.t: skip test if svn not installed

mail: fix regression when parsing unset smtp.tls option

bash_completion: support record command

subrepo: fix svnsubrepo.dirty() checking of ignoreupdate (issue2499) The ignoreupdate flag to subrepo.dirty(), introduced in be7e8e9bc5e5, is correctly checked with this change.

test-mq-subrepo.t: correctly forward stdin to test functions - stdin was not forwarded in testrm1 and testrm2 - Forwarding content with EOL using command substitution (`foo`) does not work correctly, the lines are joined together which breaks the prompt readline. - EOFError is raised in ui.prompt() if the input is too short on Linux while OSX treats it as an empty line.

filelog: move metadata parsing to a helper function

revlog: break hash checking into subfunction

ui: add configpath helper

tests: check visibility of pending changesets Verify that pending changesets are seen by pretxn* hooks but not by other processes that access the destination repo while the hooks are running.

progress: handle days, weeks and years using hg clone svn://anonsvn.kde.org/home/kde/trunk kde ... with progress yields 3008/1210830 1314h56m, which is unusable. Add code to switch to days at 30 hours, to weeks at 15 days, and to years at 55 weeks. A day has 24 hours, a week has 7 days, and a year has 52 weeks. Months are intentionally omitted because they do not have a fixed length. The Use of 52 weeks is a known and understandable estimate for a year. It might make sense to spell our year to alert people when progress is impractical, but...

rename util.unlink to unlinkpath

merge with stable

subrepo: do not report known files inside repositories as unknown

hgrc.5: mention that web.cacerts are run through util.expandpath

url: expand path for web.cacerts

commands: clarify which aliases "hg help -v" show (issue2572)

mq: record more data in patchheader class (no behavior changes) * parse branch and nodeid header lines * remember the line number where diffs started Combined, these make mq.patchheader() very useful for parsing and preserving a patch header through edits. TortoiseHg will use the nodeid and parent to display these header datums in the graph when patches are unapplied, and uses diffstartline to parse patch files using record.parsepatch().

merge with stable

Added signature for changeset e3bf16703e26

Added tag 1.7.3 for changeset e3bf16703e26

util: fix ellipsis() not to break multi-byte sequence (issue2564) It tries to convert localstr to unicode before truncating. Because we cannot assume that the given text is encoded in local encoding, it falls back to raw string in case of unicode error.

strip: typo bugfix related to '--nobackup -> --no-backup' rename (issue2377) '--no-backup' in cmdline means *'no_backup'* in code'

merge with i18n

i18n-pt_BR: synchronized with aa72ff5abf5f

merge with i18n stable

i18n-sv: synchronized with d4393968318f

i18n/pt_BR.po: synchronized with 2fa2e6444645

match: support reading pattern lists from files

merge with stable

wix: add an ssl certificate file to the WiX installers

merge with stable

hgweb: abort if config file isn't found

merge with stable

date: fix matching of underspecified date ranges (backport of 91bc001a592f to stable)

date: fix matching of underspecified date ranges In a date like 10:30, there are two underspecified ends: the specific end (seconds) and the broad end (day, month, year). When matching "10:30", we need to allow the specific end to go from 0 to 59 seconds, while the broad end is assumed to be today's date. Similar handling applies for a date range like "Mar 1": year is fixed to today, any time matches.

merge with stable

test-static-http.t: increase test coverage on filenames Tracked files starting with a period in the name begin with '~2e' in the store for the dotencode repository format, which is encoded as '%7E2e' in URLs when accessing the repo over static-http. The spaces in filenames are encoded with %20 in URLs. See also issue 2566.

test-static-http.t: get kill actually working - signal handlers take two arguments, not one - add missing import sys Before this patch, the $ kill $! at the end of the test just caused a hidden traceback, sys.exit(0) was not executed. The swallowed traceback was: Traceback (most recent call last): File "dumb.py", line 10, in <module> run() File "dumb.py", line 7, in run httpd.serve_forever() File "/usr/lib/python2.6/SocketServer.py", line 224, in serve_forever r, w, e = select.select([self], [], [], poll_interval) TypeError: <lambda>() takes exactly 1 argument (2 given)

hooks: sort any dictionaries set in the environment The actual order of dictionary items is implementation-defined in Python, and differs between CPython and PyPy. With this change, test-hooks.t passes with PyPy.

windows.rename: eliminate temp name race (issue2571) On Windows, os.rename reliably raises OSError with errno.EEXIST if the destination already exists (even on shares served by Samba). Windows does *not* silently overwrite the destination of a rename. So there is no need to first call os.path.exists on the chosen temp path. Trusting os.path.exists is actually harmful, since using it enables the following racy sequence of actions: 1) os.path.exists(temp) returns False 2) some evil other process creates a file with name temp 3) os.rename(dst, temp) now fails because temp has been taken Not using os.path.exists and directly trying os.rename(dst, temp) eliminates this race.

merge with stable

checknlink: use two testfiles (issue2543) Preventing file loss repository corruption (e.g. vanished changelog.i) when Mercurial pushes to repositories on Windows shares served by Samba. This is a workaround for Samba bug 7863, which is present in current latest stable Samba 3.5.6 and various prior versions down to 3.0.26a (the oldest one I tested). Of course this should be fixed in Samba, but there probably aren't that many other applications who use hardlinks that extensively and keep files open like Mercurial, so the pressure to fix this on Samba is probably not that high. And even if the Samba project should be able to fix their bug within a month or two, it will take quite some time until users upgrade their Samba installs.

help: correct documentation for branches keyword

notify: use util.ellipsis() to truncate long subject

smtp: fix for server doesn't support starttls extension Currently we only support enabling TLS by using SMTP STARTTLS extension. But not all the servers support it. With this patch, user can choose which way to enable TLS: * Default: tls = none port = 25 * To use STARTTLS: tls = starttls port = 465 * To use SMTP over SSL: tls = smtps port = 465 To keep backward compatibility, when tls = true, we use STARTTLS to enable TLS. Signed-off-by: Zhigang Wang <w1z2g3@gmail.com>

avoid .split() in for loops and use tuples instead split can be more readable for longer lists like the list in dirstate.invalidate. As dirstate.invalidate is used in wlock() and therefoe used heavily, I think it's worth avoiding a split there too.

hgweb: added revision date to annotate line data The only revision information yielded by the annotate view was the revision number itself. The patch allows the use of per-line revision dates in the corresponding templates.

patchbomb: save introductory message in .hg/last-email.txt

opener: forbid paths ending with directory separator (issue2507) If Linux is asked to open a filename with a trailing directory separator, e.g. "foo/", the open fails with EISDIR. On AIX, the open succeeds, opening file "foo". This causes test-mq-qnew to fail on AIX. Fix by adding 'ends with directory separator' to the conditions checked by the path auditor. Change test to expect auditor fail message.

record: clean up command table The --force option to qnew has become a no-op, so qrecord doesn't need to use it. This allows record's command table to be simplified; in the process of doing so, this patch also cleans up the cmdtable visually.

record: clean up comments and docstrings Rewrap comments and docstrings to a width of 72 chars and copy-edit.

test-doctest: test url.py again, removed by 7cc4263e07a9

merge with stable

https: use web.cacerts configuration from local repo to validate remote repo

extensions: warn about invalid extensions when listing disabled commands Invalid extensions in hgext/ could in some cases cause a crash when searching for unknown commands in disabled extensions. With this change we issue a warning if extracting commands from the extensions fails. Traceback is available on request. Reported on https://bugzilla.redhat.com/show_bug.cgi?id=663183 with forest.py.

convert: subversion should use util.quotecommand to wrap args to popen2 All other callers of util.popen2 and util.popen3 do this, as well as direct callers of subprocess.Popen.

merge with stable

util: concentrate quoting knowledge to windows.py quotecommand() This fixes all callers of util.quotecommand() and place special knowledge of the bugfix in 2.7.1 in a single platform specific place.

templater: clarify engine caching

merge with crew

tests: clean up test-rollback.t The last comment is on the last file line and is useless, seems like it was introduced in 8fdc11fec6ae during unification.

merge with stable

url: fix trailing whitespace

subrepo: basic support for status of git subrepos

subrepo: fix subrelpath for git subrepos This patch conforms gitsubrepo code to the variable naming scheme of the other subrepo implementations. All user-facing path references should be relative to the root repository.

subrepo: fix git archive parsing of directories and symfiles

subrepo: support ignoreupdate in gitsubrepo's dirty()

subrepo: backout 519ac79d680b Unfortunately git 1.6 does not support the upstream parameter in for-each-ref.

url: fix check-code whitespace complaint

templater: use the parser.py parser to extend the templater syntax

templater: give slightly nicer error for unknown map entries

mq: update .hgsubstate if subrepos are clean (issue2499) This patch prevents MQ from creating an inconsistent subrepo state. If the .hgsub file has been changed, and none of the subrepos have uncommitted changes, creating or updating a patch (using qnew, qrefresh, or qrecord) will update .hgsubstate accordingly. If any subrepos _do_ have uncommitted changes, qnew/qrefresh/qrecord will abort. Thanks to pmezard for proposing this solution.

backout f08df4d38442

subrepo: backout f02d7a562a21 backing out f02d7a562a21 because it introduced a bug in .hgsubstate handling.

merge with i18n

merge with stable

fncachestore: copy dh directory before the manifest Before this patch, the copy order on clone was: requires 00changelog.i store\data store\00manifest.d store\00manifest.i store\00changelog.d store\00changelog.i store\dh store\fncache Which provides a theoretical non-zero probability of a race during clone where a very early reader might see a repository with missing revlog files if it sees 00changelog.i before all files inside dh have been copied. The dh directory is similar to the data directory -- just for files with long names (which are hashed). The manifest refers to files in data *and* dh, so dh should be copied before the manifest. This patch improves the copy order to: requires 00changelog.i store\data store\dh store\fncache store\00manifest.d store\00manifest.i store\00changelog.d store\00changelog.i I'm putting fncache to before the manifest while I'm at it, since fncache provides a mechanism to enumerate all repository files without visiting the manifest revisions. fncache depends only on data and dh. Note that data must be copied first, since copying data triggers the creation of the repository write lock in the destination repo (see hg.clone).

merge with i18n

i18n: merge with stable

i18n-da: synchronize with 5dac0d04b838

i18n-de: translated strings for the purge extension

merge with stable

https: warn when server certificate isn't verified Mercurial will verify HTTPS server certificates if web.cacerts is configured, but it will by default silently not verify any certificates. We now warn the user that when the certificate isn't verified she won't get the security she might expect from https: warning: localhost certificate not verified (check web.cacerts config setting) Self-signed certificates can be accepted silently by configuring web.cacerts to point to a suitable certificate file.

merge: document some internal return values.

check-code: catch os.path.relpath