# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1315695402 18000
# Node ID d30ec2d16c5a2cd4da9ab5d7aadceab6f53304c8
# Parent  574dc5d74f9b9ad25f755f74f661a0d89334ec6a# Parent  02734d2baa79e0a08cc5fe20a1a59a31710348cf
merge with stable

diff -r 574dc5d74f9b -r d30ec2d16c5a mercurial/commands.py
--- a/mercurial/commands.py	Sat Aug 13 00:08:26 2011 +0200
+++ b/mercurial/commands.py	Sat Sep 10 17:56:42 2011 -0500
@@ -3352,7 +3352,7 @@
      _('show changesets within the given named branch'), _('BRANCH')),
     ('P', 'prune', [],
      _('do not display revision or any of its ancestors'), _('REV')),
-    ('h', 'hidden', False, _('show hidden changesets')),
+    ('', 'hidden', False, _('show hidden changesets')),
     ] + logopts + walkopts,
     _('[OPTION]... [FILE]'))
 def log(ui, repo, *pats, **opts):
diff -r 574dc5d74f9b -r d30ec2d16c5a mercurial/url.py
--- a/mercurial/url.py	Sat Aug 13 00:08:26 2011 +0200
+++ b/mercurial/url.py	Sat Sep 10 17:56:42 2011 -0500
@@ -93,13 +93,15 @@
             proxies = {}
 
         # urllib2 takes proxy values from the environment and those
-        # will take precedence if found, so drop them
-        for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
-            try:
-                if env in os.environ:
-                    del os.environ[env]
-            except OSError:
-                pass
+        # will take precedence if found. So, if there's a config entry
+        # defining a proxy, drop the environment ones
+        if ui.config("http_proxy", "host"):
+            for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
+                try:
+                    if env in os.environ:
+                        del os.environ[env]
+                except OSError:
+                    pass
 
         urllib2.ProxyHandler.__init__(self, proxies)
         self.ui = ui
diff -r 574dc5d74f9b -r d30ec2d16c5a mercurial/util.py
--- a/mercurial/util.py	Sat Aug 13 00:08:26 2011 +0200
+++ b/mercurial/util.py	Sat Sep 10 17:56:42 2011 -0500
@@ -1460,6 +1460,8 @@
     <url path: 'c:\\foo\\bar'>
     >>> url(r'\\blah\blah\blah')
     <url path: '\\\\blah\\blah\\blah'>
+    >>> url(r'\\blah\blah\blah#baz')
+    <url path: '\\\\blah\\blah\\blah', fragment: 'baz'>
 
     Authentication credentials:
 
@@ -1488,6 +1490,11 @@
         self._hostport = ''
         self._origpath = path
 
+        if parsefragment and '#' in path:
+            path, self.fragment = path.split('#', 1)
+            if not path:
+                path = None
+
         # special case for Windows drive letters and UNC paths
         if hasdriveletter(path) or path.startswith(r'\\'):
             self.path = path
@@ -1515,10 +1522,6 @@
                 self.path = ''
                 return
         else:
-            if parsefragment and '#' in path:
-                path, self.fragment = path.split('#', 1)
-                if not path:
-                    path = None
             if self._localpath:
                 self.path = path
                 return
diff -r 574dc5d74f9b -r d30ec2d16c5a tests/test-keyword.t
--- a/tests/test-keyword.t	Sat Aug 13 00:08:26 2011 +0200
+++ b/tests/test-keyword.t	Sat Sep 10 17:56:42 2011 -0500
@@ -444,6 +444,8 @@
   r
   committed changeset 3:899491280810
   overwriting r expanding keywords
+ - status call required for dirstate.normallookup() check
+  $ hg status r
   $ hg --verbose rollback
   repository tip rolled back to revision 2 (undo commit)
   working directory now based on revision 2
@@ -834,6 +836,8 @@
   $ hg copy a x/a
   $ hg --verbose kwshrink a
   overwriting a shrinking keywords
+ - sleep required for dirstate.normal() check
+  $ sleep 1
   $ hg status a
   $ hg --verbose kwexpand a
   overwriting a expanding keywords