merge with stable

url: 'ssh known host'-like checking of fingerprints of HTTPS certificates Known fingerprints of HTTPS servers can now be configured in the hostfingerprints section. That makes it possible to verify the identify of web servers without configuring and trusting the CA chain. Limitations: * Portnumbers are ignored, just like with ordinary certificates. * Host name matching is case sensitive.

merge with stable

merge with i18n

i18n-merge stable heads

i18n-de: translated some rebase strings.

i18n-de: translated missing strings for progress extension.

i18n-pt_BR: synchronized with 75d0c38a0bca

bookmarks: respect rollbacks dryrun parameter

bookmarks: always write undo file Always write the undo file. Otherwise, rollback will not work for the initial bookmark as undo.bookmarks doesn't exists. In this case undo.bookmarks needs already be empty.

opener: force copy on 'a'ppend if nlinks() returns 0 (issue1922) If pywin32 is not installed, 'os.lstat(pathname).st_nlink' is used for nlinks(), which is always zero for all files on Windows. To make sure we break up hardlinks if pywin32 is missing, we force nlink = 2 if nlinks() returns < 1. (this completely fixes issue1922)

help: ssh urls don't allow passwords

commit: use the term SCM instead of RCS for consistency. see also fc4a3931e608

backout of 613b8bd2284e Matt and a majority of crew did not like this approach.

check-code: do not complain about 'ls x | foo -v' Such a line was introduced in test-subrepo-git.t in 5dda6c708138, which made check-code confused.

subrepo: separate out mq+svn subrepo tests Having the mq+subrepo+svn tests in a separate file lets them be skipped without skipping the other mq+subrepo tests.

keyword: move repo.__class__ assignment out of monkeypatch context A cosmetic change to improve readability.

keyword: inform user about current keywordset in kwdemo The kwdemo --default output now looks roughly like this: configuration using default cvs keywordset [extensions] keyword = [keyword] demo.txt = [keywordset] * section added with this change svn = False [keywordmaps] ...

specify C indention style using Emacs file local variables

Ignore pax_global_header that some tar versions write as a file.

record: do not include files into changes count This turns the prompt sequence from something like: $ examine changes to foo? $ record change 1/4 to foo? $ record change 2/4 to foo? $ examine changes to bar? $ record change 4/4 to bar? into: $ examine changes to foo? $ record change 1/3 to foo? $ record change 2/3 to foo? $ examine change to bar? $ record change 3/3 to bar?

record: simplify header methods with util.any

record: refactor the prompt loop The previous loop was iterating over a mixed header/hunk stream. It may have been more generic in the sense every item in the stream could trigger a prompt but it required more work to skip items properly. It can be rewritten in a more intuitive way by looping on files then looping on hunks.

test-record: test peculiar changes numbering

record: turn prompt() into a pure function

record: turn consumefile() into a pure function

hghave: remove unused hotshot check

Merge with stable

subrepo: compare svn subrepo state to last committed revision A subversion project revisions are a subset of the repository revisions, you can ask subversion to update a working directory from one revision to another without changing anything. Unfortunately, Mercurial will think the subrepository has changed and will commit it again. To avoid useless commits, we compare the subrepository state to its actual "parent" revision. To ensure ascending compatibility with existing subrepositories which might reference fake revisions, we also keep comparing with the subrepo working directory revision. NOTE: not sure if this should go in stable or not.

merge with stable

win32: win32console.GetStdHandle() can return None When the Mercurial Python libraries are used within a Windows application with no console, there is no stderr file handle.

revlog: remove stray test in rev()

merge with main

opener: use util.unlink (issue2524)

lock: use util.unlink (issue2537)

reintroduces util.unlink, for POSIX and Windows. windows: factor it out of rename posix: add alias 'unlink' for os.unlink Note that this new unlink function now has different semantics than the unlink() we had before changeset 6bf39d88c857 ("rename util.unlink to unlinkpath").

opener: check exception for ENOENT

windows.rename: check OSError for EEXIST For example, if src has been opened with Python's open(), os.rename will raise EACCES. Continuing in that case is pointless.

perf: restore lazyindex hack This hack (and the module it lives in) exist so that performance can be compared across different hg versions.

revlog: pass rev to _checkhash

revlog: incrementally build node cache with linear searches This avoids needing to prime the cache for operations like verify which visit most or all of the index.

bundlerepo: use less intrusive util.posixfile to open bundle

osutil: treat open modes 'w' and 'a' as 'w+' and 'a+' in posixfile to work around http://support.microsoft.com/kb/899149. Also, Microsoft's documentation of the CreateFile Windows API says (quote): When an application creates a file across a network, it is better to use GENERIC_READ | GENERIC_WRITE for dwDesiredAccess than to use GENERIC_WRITE alone. The resulting code is faster, because the redirector can use the cache manager and send fewer SMBs with more data. This combination also avoids an issue where writing to a file across a network can occasionally return ERROR_ACCESS_DENIED.

move tags.cache and branchheads.cache to a collected cache folder .hg/cache/ The generation of cache files like tags.cache and branchheads.cache is not an actual reflection of things changing in the whole of the .hg directory (like eg a commit or a rebase or something) but instead these cache files are just part of bookkeeping. As such its convienant to allow various clients to ignore file events to do with these cache files which would otherwise cause a double refresh. Eg one refresh might occur after a commit, but the act of refreshing after the commit would cause Mercurial to generate a new branchheads.cache which would then cause a second refresh, for clients. However if these cache files are moved into a directory like eg .hg/cache/ then GUI clients on OSX (and possibly other platforms) can happily ignore file events in this cache directory.

addchangegroup: document the current locking semantics

keyword: update documentation for kwshrink * remove obsolete reference to potential problems with merge and import * emphasize that running kwshrink before configuration changes which affect active/expanded keywords is mandatory

tests: remove duplication of the CGI environment variables

revlog: explicit test and explicit variable names

revlog: if the nodemap is set, use the fast version of revlog.rev()

revlog/parseindex: construct the nodemap if it is empty

revlog: always add the magic nullid/nullrev entry in parseindex

revlog/parseindex: no need to pass the file around

parsers.c: fix comment

perf: there is no lazy index anymore

pure: update index parsing

perf: fix ordering of invalidate in perfindex

revlog: do revlog node->rev mapping by scanning Now that the nodemap is lazily created, we use linear scanning back from tip for typical node to rev mapping. Given that nodemap creation is O(n log n) and revisions searched for are usually very close to tip, this is often a significant performance win for a small number of searches. When we do end up building a nodemap for bulk lookups, the scanning function is replaced with a hash lookup.

revlog: introduce a cache for partial lookups Partial lookups are always O(n), and often we look up the same one multiple times.

tags: avoid a pointless usage of revlog.nodemap

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.