# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1302120906 18000
# Node ID a6c69abd91a0256dbaeb364c7746717fba7e3ea4
# Parent  fab10e7cacd6a0413869cff4b418403504ba2ec9# Parent  a7cd0eee396bbc49eed25e83cf2e1add2a963c73
merge with crew

diff -r fab10e7cacd6 -r a6c69abd91a0 hgext/bugzilla.py
--- a/hgext/bugzilla.py	Wed Apr 06 15:14:51 2011 -0500
+++ b/hgext/bugzilla.py	Wed Apr 06 15:15:06 2011 -0500
@@ -21,7 +21,7 @@
 2. Check data via the Bugzilla XMLRPC interface and submit bug change
    via email to Bugzilla email interface. Requires Bugzilla 3.4 or later.
 
-2. Writing directly to the Bugzilla database. Only Bugzilla installations
+3. Writing directly to the Bugzilla database. Only Bugzilla installations
    using MySQL are supported. Requires Python MySQLdb.
 
 Writing directly to the database is susceptible to schema changes, and
@@ -93,7 +93,7 @@
 
 web.baseurl
   Base URL for browsing Mercurial repositories. Referenced from
-  templates as {hgweb}.
+  templates as ``{hgweb}``.
 
 Configuration items common to XMLRPC+email and MySQL access modes:
 
@@ -104,7 +104,7 @@
 
     committer = Bugzilla user
 
-  See also the [usermap] section.
+  See also the ``[usermap]`` section.
 
 The ``[usermap]`` section is used to specify mappings of Mercurial
 committer email to Bugzilla user email. See also ``bugzilla.usermap``.
diff -r fab10e7cacd6 -r a6c69abd91a0 hgext/relink.py
--- a/hgext/relink.py	Wed Apr 06 15:14:51 2011 -0500
+++ b/hgext/relink.py	Wed Apr 06 15:15:06 2011 -0500
@@ -38,9 +38,9 @@
     """
     if not hasattr(util, 'samefile') or not hasattr(util, 'samedevice'):
         raise util.Abort(_('hardlinks are not supported on this system'))
-    src = hg.repository(
-        hg.remoteui(repo, opts),
-        ui.expandpath(origin or 'default-relink', origin or 'default'))
+    src = hg.repository(hg.remoteui(repo, opts),
+                        ui.expandpath(origin or 'default-relink',
+                                      origin or 'default'))
     if not src.local():
         raise util.Abort(_('must specify local origin repository'))
     ui.status(_('relinking %s to %s\n') % (src.store.path, repo.store.path))
diff -r fab10e7cacd6 -r a6c69abd91a0 mercurial/commands.py
--- a/mercurial/commands.py	Wed Apr 06 15:14:51 2011 -0500
+++ b/mercurial/commands.py	Wed Apr 06 15:15:06 2011 -0500
@@ -894,7 +894,12 @@
 
     node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
     if not node:
-        ui.status(_("nothing changed\n"))
+        stat = repo.status(match=cmdutil.match(repo, pats, opts))
+        if stat[3]:
+            ui.status(_("nothing changed (%d missing files, see 'hg status')\n")
+                      % len(stat[3]))
+        else:
+            ui.status(_("nothing changed\n"))
         return 1
 
     ctx = repo[node]
diff -r fab10e7cacd6 -r a6c69abd91a0 mercurial/hg.py
--- a/mercurial/hg.py	Wed Apr 06 15:14:51 2011 -0500
+++ b/mercurial/hg.py	Wed Apr 06 15:15:06 2011 -0500
@@ -55,10 +55,10 @@
     '''parse url#branch, returning (url, (branch, branches))'''
 
     u = url.url(path)
-    if not u.fragment:
-        return path, (None, branches or [])
-    branch = u.fragment
-    u.fragment = None
+    branch = None
+    if u.fragment:
+        branch = u.fragment
+        u.fragment = None
     return str(u), (branch, branches or [])
 
 schemes = {
diff -r fab10e7cacd6 -r a6c69abd91a0 tests/test-commit.t
--- a/tests/test-commit.t	Wed Apr 06 15:14:51 2011 -0500
+++ b/tests/test-commit.t	Wed Apr 06 15:15:06 2011 -0500
@@ -32,7 +32,7 @@
   $ hg add bar
   $ rm bar
   $ hg commit -m commit-8
-  nothing changed
+  nothing changed (1 missing files, see 'hg status')
   [1]
   $ hg commit -m commit-8-2 bar
   abort: bar: file not found!
diff -r fab10e7cacd6 -r a6c69abd91a0 tests/test-hg-parseurl.py
--- a/tests/test-hg-parseurl.py	Wed Apr 06 15:14:51 2011 -0500
+++ b/tests/test-hg-parseurl.py	Wed Apr 06 15:15:06 2011 -0500
@@ -8,3 +8,6 @@
 testparse('http://example.com/no/anchor/branches', branch=['foo'])
 testparse('http://example.com/an/anchor/branches#bar', branch=['foo'])
 testparse('http://example.com/an/anchor/branches-None#foo', branch=None)
+testparse('http://example.com/')
+testparse('http://example.com')
+testparse('http://example.com#foo')
diff -r fab10e7cacd6 -r a6c69abd91a0 tests/test-hg-parseurl.py.out
--- a/tests/test-hg-parseurl.py.out	Wed Apr 06 15:14:51 2011 -0500
+++ b/tests/test-hg-parseurl.py.out	Wed Apr 06 15:15:06 2011 -0500
@@ -3,3 +3,6 @@
 http://example.com/no/anchor/branches, branches: (None, ['foo'])
 http://example.com/an/anchor/branches, branches: ('bar', ['foo'])
 http://example.com/an/anchor/branches-None, branches: ('foo', [])
+http://example.com/, branches: (None, [])
+http://example.com/, branches: (None, [])
+http://example.com/, branches: ('foo', [])