Update to 1.9:

1.1. Major features
    New fileset file matching support
    Improved remote changeset discovery
    New command server mode to improve application integration
    Experimental generaldelta storage scheme
    Experimental new http client library

1.2. Command changes
    HGPLAIN: allow exceptions to plain mode, like i18n, via HGPLAINEXCEPT
    manifest: add new option --all
    aliases: add positional arguments to non-shell aliases
    add: introduce a warning message for non-portable filenames (issue2756)
    add: notify when adding a file that would cause a case-folding collision
    bisect: new command to extend the bisect range (issue2690)
    bookmarks: allow deactivating current bookmark with -i
    bundle: update current bookmark to most recent revision on current branch
    diff: make diff -c aware of revision sets
    help: add -c/--command flag to only show command help (issue2799)
    help: add -e/--extension switch to display extension help text
    help: move hgignore man page into built-in help (issue2769)
    http: correctly handle redirects from http to https
    identify: list bookmarks for remote repositories
    import: add --bypass option
    paths: Add support for -q/--quiet
    pushkey: add hooks for pushkey/listkeys
    revset: add aliases
    revset: add ^ and ~ operators from parentrevspec extension
    revset: add a revset command to get bisect state
    revset: add desc(string) to search in commit messages
    revset: add follow(filename) to follow a filename's history across copies
    revset: introduce filelog() to emulate log's fast path
    revset: add a last() function

1.3. Web changes
    add bookmarks listing to raw style and summary pages
    support alternate logo url
    add base link to file log for paper and coal styles (issue2452)
    paper, coal: display diffstat on the changeset page
    elapsed time calculation dynamic (javascript)
    provide diffstat and summary on the changeset page

1.4. Extension changes
    hgcia: handle URL like in notify (issue2406)
    rebase: add -m/--message to rebase --collapse (issue2389)
    Updating hgext.extdiff to use revsets
    bash_completion: enable alias auto-complete
    bugzilla: add XMLRPC interface
    color: add support for terminfo-based attributes and color
    convert/mtn: add support for using monotone's "automate stdio" when available
    convert/svn: stop using svn bindings when pushing to svn
    convert: add bookmark support for hg and git backends
    convert: add svnrev, svnpath and svnuuid template keywords
    extdiff: add repository root as a variable
    graphlog: support more log command features with revsets
    keyword: convert a verbatim block to a field list
    keyword: offer additional datefilters when the extension is enabled
    mq: add a 'mq()' revset predicate that returns applied mq csets
    notify: send changesets on 'outgoing' hook, updated doc
    progress: add speed format
    rebase: add --tool argument for specifying merge tool
    rebase: allow for rebasing descendants onto ancestors on different named branches
    record: add an option to backup all wc modifications
    record: add qrefresh -i/--interactive
    record: add white space diff options
    record: alias qrecord to qnew -i/--interactive

1.5. Bug fixes
    bookmarks: allow create/move bookmark without making it current (issue2788)
    bookmarks: do not forward merged bookmark (issue1877)
    changegroup: do not count closed new heads (issue2697)
    config: handle comment lines in continuations (issue2854)
    dispatch: propagate ui command options to the local ui (issue2523)
    eol: make the hook check all new heads, not only tip (issue2666)
    grep: don't print data from binary files for matches (issue2614)
    http: report unexpected unparsable push responses (issue2777)
    httprepo: handle large lengths by bypassing the len() operator
    httprepo: long arguments support (issue2126)
    httprepo: proper handling of invalid responses without content-type (issue2019)
    httprepo: send URL redirection notices to stderr (issue2828)
    localrepo: don't add deleted files to list of modified/added files (issue2761)
    localrepo: ignore tags to unknown nodes (issue2750)
    merge: drop resolve state for mergers with identical contents (issue2680)
    patch: do not patch unknown files (issue752)
    path_auditor: check filenames for basic platform validity (issue2755)
    rebase: don't mark file as removed if missing in parent's manifest (issue2725)
    rebase: preserve mq series order after rebasing (issue2849)
    rebase: restore mq guards after rebasing (issue2107)
    revset: report a parse error if a revset is not parsed completely (issue2654)
    scmutil: improve path calculation for install-relative RC files (issue2841)
    set NOT_CONTENT_INDEXED on .hg dir (issue2694)
    sslutil: fall back to commonName when no dNSName in subjectAltName (issue2798)
    subrepo: be more careful with deletions of .hgsub and .hgsubstate (issue2844)
    subrepo: make stdin for svn a pipe for non-interactive use (issue2759)
    subrepo: svn abort now depends on exit code (issue2833)
    subrepo: be smarter about what's an absolute path (issue2808)
    svn subrepo: attempt work around obstructed checkouts (issue2752)
    svn subrepos: work around checkout obstructions (issue2752)
    tags: catch more corruption during cache parsing (issue2779)
    util: add Mac-specific check whether we're in a GUI session (issue2553)

3 files changed, 63 insertions, 11 deletions

diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index b77c2ae0a20..a9dd1cc49e3 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2011/06/03 00:33:32 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2011/07/12 11:27:53 wiz Exp $
 #
 
-DISTNAME=	mercurial-1.8.4
+DISTNAME=	mercurial-1.9
 CATEGORIES=	devel scm
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
diff --git a/devel/mercurial/PLIST b/devel/mercurial/PLIST
index 0456bb03783..15de8a69c2f 100644
--- a/devel/mercurial/PLIST
+++ b/devel/mercurial/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2011/05/02 13:05:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2011/07/12 11:27:53 wiz Exp $
 bin/hg
 ${PYSITELIB}/hgext/__init__.py
 ${PYSITELIB}/hgext/__init__.pyc
@@ -105,9 +105,6 @@ ${PYSITELIB}/hgext/notify.pyo
 ${PYSITELIB}/hgext/pager.py
 ${PYSITELIB}/hgext/pager.pyc
 ${PYSITELIB}/hgext/pager.pyo
-${PYSITELIB}/hgext/parentrevspec.py
-${PYSITELIB}/hgext/parentrevspec.pyc
-${PYSITELIB}/hgext/parentrevspec.pyo
 ${PYSITELIB}/hgext/patchbomb.py
 ${PYSITELIB}/hgext/patchbomb.pyc
 ${PYSITELIB}/hgext/patchbomb.pyo
@@ -182,6 +179,9 @@ ${PYSITELIB}/mercurial/cmdutil.pyo
 ${PYSITELIB}/mercurial/commands.py
 ${PYSITELIB}/mercurial/commands.pyc
 ${PYSITELIB}/mercurial/commands.pyo
+${PYSITELIB}/mercurial/commandserver.py
+${PYSITELIB}/mercurial/commandserver.pyc
+${PYSITELIB}/mercurial/commandserver.pyo
 ${PYSITELIB}/mercurial/config.py
 ${PYSITELIB}/mercurial/config.pyc
 ${PYSITELIB}/mercurial/config.pyo
@@ -194,6 +194,9 @@ ${PYSITELIB}/mercurial/copies.pyo
 ${PYSITELIB}/mercurial/dagparser.py
 ${PYSITELIB}/mercurial/dagparser.pyc
 ${PYSITELIB}/mercurial/dagparser.pyo
+${PYSITELIB}/mercurial/dagutil.py
+${PYSITELIB}/mercurial/dagutil.pyc
+${PYSITELIB}/mercurial/dagutil.pyo
 ${PYSITELIB}/mercurial/demandimport.py
 ${PYSITELIB}/mercurial/demandimport.pyc
 ${PYSITELIB}/mercurial/demandimport.pyo
@@ -225,6 +228,9 @@ ${PYSITELIB}/mercurial/filelog.pyo
 ${PYSITELIB}/mercurial/filemerge.py
 ${PYSITELIB}/mercurial/filemerge.pyc
 ${PYSITELIB}/mercurial/filemerge.pyo
+${PYSITELIB}/mercurial/fileset.py
+${PYSITELIB}/mercurial/fileset.pyc
+${PYSITELIB}/mercurial/fileset.pyo
 ${PYSITELIB}/mercurial/graphmod.py
 ${PYSITELIB}/mercurial/graphmod.pyc
 ${PYSITELIB}/mercurial/graphmod.pyo
@@ -239,7 +245,9 @@ ${PYSITELIB}/mercurial/help/dates.txt
 ${PYSITELIB}/mercurial/help/diffs.txt
 ${PYSITELIB}/mercurial/help/environment.txt
 ${PYSITELIB}/mercurial/help/extensions.txt
+${PYSITELIB}/mercurial/help/filesets.txt
 ${PYSITELIB}/mercurial/help/glossary.txt
+${PYSITELIB}/mercurial/help/hgignore.txt
 ${PYSITELIB}/mercurial/help/hgweb.txt
 ${PYSITELIB}/mercurial/help/merge-tools.txt
 ${PYSITELIB}/mercurial/help/multirevs.txt
@@ -285,6 +293,36 @@ ${PYSITELIB}/mercurial/hgweb/wsgicgi.pyo
 ${PYSITELIB}/mercurial/hook.py
 ${PYSITELIB}/mercurial/hook.pyc
 ${PYSITELIB}/mercurial/hook.pyo
+${PYSITELIB}/mercurial/httpclient/__init__.py
+${PYSITELIB}/mercurial/httpclient/__init__.pyc
+${PYSITELIB}/mercurial/httpclient/__init__.pyo
+${PYSITELIB}/mercurial/httpclient/socketutil.py
+${PYSITELIB}/mercurial/httpclient/socketutil.pyc
+${PYSITELIB}/mercurial/httpclient/socketutil.pyo
+${PYSITELIB}/mercurial/httpclient/tests/__init__.py
+${PYSITELIB}/mercurial/httpclient/tests/__init__.pyc
+${PYSITELIB}/mercurial/httpclient/tests/__init__.pyo
+${PYSITELIB}/mercurial/httpclient/tests/simple_http_test.py
+${PYSITELIB}/mercurial/httpclient/tests/simple_http_test.pyc
+${PYSITELIB}/mercurial/httpclient/tests/simple_http_test.pyo
+${PYSITELIB}/mercurial/httpclient/tests/test_bogus_responses.py
+${PYSITELIB}/mercurial/httpclient/tests/test_bogus_responses.pyc
+${PYSITELIB}/mercurial/httpclient/tests/test_bogus_responses.pyo
+${PYSITELIB}/mercurial/httpclient/tests/test_chunked_transfer.py
+${PYSITELIB}/mercurial/httpclient/tests/test_chunked_transfer.pyc
+${PYSITELIB}/mercurial/httpclient/tests/test_chunked_transfer.pyo
+${PYSITELIB}/mercurial/httpclient/tests/test_proxy_support.py
+${PYSITELIB}/mercurial/httpclient/tests/test_proxy_support.pyc
+${PYSITELIB}/mercurial/httpclient/tests/test_proxy_support.pyo
+${PYSITELIB}/mercurial/httpclient/tests/test_ssl.py
+${PYSITELIB}/mercurial/httpclient/tests/test_ssl.pyc
+${PYSITELIB}/mercurial/httpclient/tests/test_ssl.pyo
+${PYSITELIB}/mercurial/httpclient/tests/util.py
+${PYSITELIB}/mercurial/httpclient/tests/util.pyc
+${PYSITELIB}/mercurial/httpclient/tests/util.pyo
+${PYSITELIB}/mercurial/httpconnection.py
+${PYSITELIB}/mercurial/httpconnection.pyc
+${PYSITELIB}/mercurial/httpconnection.pyo
 ${PYSITELIB}/mercurial/httprepo.py
 ${PYSITELIB}/mercurial/httprepo.pyc
 ${PYSITELIB}/mercurial/httprepo.pyo
@@ -305,6 +343,7 @@ ${PYSITELIB}/mercurial/locale/it/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/ja/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/ro/LC_MESSAGES/hg.mo
+${PYSITELIB}/mercurial/locale/ru/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/sv/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
 ${PYSITELIB}/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
@@ -371,6 +410,12 @@ ${PYSITELIB}/mercurial/revlog.pyo
 ${PYSITELIB}/mercurial/revset.py
 ${PYSITELIB}/mercurial/revset.pyc
 ${PYSITELIB}/mercurial/revset.pyo
+${PYSITELIB}/mercurial/scmutil.py
+${PYSITELIB}/mercurial/scmutil.pyc
+${PYSITELIB}/mercurial/scmutil.pyo
+${PYSITELIB}/mercurial/setdiscovery.py
+${PYSITELIB}/mercurial/setdiscovery.pyc
+${PYSITELIB}/mercurial/setdiscovery.pyo
 ${PYSITELIB}/mercurial/similar.py
 ${PYSITELIB}/mercurial/similar.pyc
 ${PYSITELIB}/mercurial/similar.pyo
@@ -383,6 +428,9 @@ ${PYSITELIB}/mercurial/sshrepo.pyo
 ${PYSITELIB}/mercurial/sshserver.py
 ${PYSITELIB}/mercurial/sshserver.pyc
 ${PYSITELIB}/mercurial/sshserver.pyo
+${PYSITELIB}/mercurial/sslutil.py
+${PYSITELIB}/mercurial/sslutil.pyc
+${PYSITELIB}/mercurial/sslutil.pyo
 ${PYSITELIB}/mercurial/statichttprepo.py
 ${PYSITELIB}/mercurial/statichttprepo.pyc
 ${PYSITELIB}/mercurial/statichttprepo.pyo
@@ -472,6 +520,7 @@ ${PYSITELIB}/mercurial/templates/monoblue/tags.tmpl
 ${PYSITELIB}/mercurial/templates/paper/bookmarks.tmpl
 ${PYSITELIB}/mercurial/templates/paper/branches.tmpl
 ${PYSITELIB}/mercurial/templates/paper/changeset.tmpl
+${PYSITELIB}/mercurial/templates/paper/diffstat.tmpl
 ${PYSITELIB}/mercurial/templates/paper/error.tmpl
 ${PYSITELIB}/mercurial/templates/paper/fileannotate.tmpl
 ${PYSITELIB}/mercurial/templates/paper/filediff.tmpl
@@ -535,9 +584,9 @@ ${PYSITELIB}/mercurial/templates/static/background.png
 ${PYSITELIB}/mercurial/templates/static/coal-file.png
 ${PYSITELIB}/mercurial/templates/static/coal-folder.png
 ${PYSITELIB}/mercurial/templates/static/excanvas.js
-${PYSITELIB}/mercurial/templates/static/graph.js
 ${PYSITELIB}/mercurial/templates/static/hgicon.png
 ${PYSITELIB}/mercurial/templates/static/hglogo.png
+${PYSITELIB}/mercurial/templates/static/mercurial.js
 ${PYSITELIB}/mercurial/templates/static/style-coal.css
 ${PYSITELIB}/mercurial/templates/static/style-gitweb.css
 ${PYSITELIB}/mercurial/templates/static/style-monoblue.css
@@ -547,6 +596,9 @@ ${PYSITELIB}/mercurial/templates/template-vars.txt
 ${PYSITELIB}/mercurial/transaction.py
 ${PYSITELIB}/mercurial/transaction.pyc
 ${PYSITELIB}/mercurial/transaction.pyo
+${PYSITELIB}/mercurial/treediscovery.py
+${PYSITELIB}/mercurial/treediscovery.pyc
+${PYSITELIB}/mercurial/treediscovery.pyo
 ${PYSITELIB}/mercurial/ui.py
 ${PYSITELIB}/mercurial/ui.pyc
 ${PYSITELIB}/mercurial/ui.pyo
diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo
index e94eca26f8a..a221c54f21d 100644
--- a/devel/mercurial/distinfo
+++ b/devel/mercurial/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.46 2011/06/03 00:33:33 wiz Exp $
+$NetBSD: distinfo,v 1.47 2011/07/12 11:27:53 wiz Exp $
 
-SHA1 (mercurial-1.8.4.tar.gz) = 25c4f9b1ad1c5c8ef94ca5b120c9af6bdfd23bdc
-RMD160 (mercurial-1.8.4.tar.gz) = c9c21ac48e6c37360f4de5833ddf0ee5e2594620
-Size (mercurial-1.8.4.tar.gz) = 2554592 bytes
+SHA1 (mercurial-1.9.tar.gz) = e7d80abf520849e1327ad5e7606a09628f646584
+RMD160 (mercurial-1.9.tar.gz) = f533234095f2028ef742dce96a23751ee023a7f1
+Size (mercurial-1.9.tar.gz) = 2964382 bytes