##// END OF EJS Templates
merge with stable
Matt Mackall -
r15081:d30ec2d1 merge default
parent child Browse files
Show More
@@ -3352,7 +3352,7 b' def locate(ui, repo, *pats, **opts):'
3352 _('show changesets within the given named branch'), _('BRANCH')),
3352 _('show changesets within the given named branch'), _('BRANCH')),
3353 ('P', 'prune', [],
3353 ('P', 'prune', [],
3354 _('do not display revision or any of its ancestors'), _('REV')),
3354 _('do not display revision or any of its ancestors'), _('REV')),
3355 ('h', 'hidden', False, _('show hidden changesets')),
3355 ('', 'hidden', False, _('show hidden changesets')),
3356 ] + logopts + walkopts,
3356 ] + logopts + walkopts,
3357 _('[OPTION]... [FILE]'))
3357 _('[OPTION]... [FILE]'))
3358 def log(ui, repo, *pats, **opts):
3358 def log(ui, repo, *pats, **opts):
@@ -93,13 +93,15 b' class proxyhandler(urllib2.ProxyHandler)'
93 proxies = {}
93 proxies = {}
94
94
95 # urllib2 takes proxy values from the environment and those
95 # urllib2 takes proxy values from the environment and those
96 # will take precedence if found, so drop them
96 # will take precedence if found. So, if there's a config entry
97 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
97 # defining a proxy, drop the environment ones
98 try:
98 if ui.config("http_proxy", "host"):
99 if env in os.environ:
99 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
100 del os.environ[env]
100 try:
101 except OSError:
101 if env in os.environ:
102 pass
102 del os.environ[env]
103 except OSError:
104 pass
103
105
104 urllib2.ProxyHandler.__init__(self, proxies)
106 urllib2.ProxyHandler.__init__(self, proxies)
105 self.ui = ui
107 self.ui = ui
@@ -1460,6 +1460,8 b' class url(object):'
1460 <url path: 'c:\\foo\\bar'>
1460 <url path: 'c:\\foo\\bar'>
1461 >>> url(r'\\blah\blah\blah')
1461 >>> url(r'\\blah\blah\blah')
1462 <url path: '\\\\blah\\blah\\blah'>
1462 <url path: '\\\\blah\\blah\\blah'>
1463 >>> url(r'\\blah\blah\blah#baz')
1464 <url path: '\\\\blah\\blah\\blah', fragment: 'baz'>
1463
1465
1464 Authentication credentials:
1466 Authentication credentials:
1465
1467
@@ -1488,6 +1490,11 b' class url(object):'
1488 self._hostport = ''
1490 self._hostport = ''
1489 self._origpath = path
1491 self._origpath = path
1490
1492
1493 if parsefragment and '#' in path:
1494 path, self.fragment = path.split('#', 1)
1495 if not path:
1496 path = None
1497
1491 # special case for Windows drive letters and UNC paths
1498 # special case for Windows drive letters and UNC paths
1492 if hasdriveletter(path) or path.startswith(r'\\'):
1499 if hasdriveletter(path) or path.startswith(r'\\'):
1493 self.path = path
1500 self.path = path
@@ -1515,10 +1522,6 b' class url(object):'
1515 self.path = ''
1522 self.path = ''
1516 return
1523 return
1517 else:
1524 else:
1518 if parsefragment and '#' in path:
1519 path, self.fragment = path.split('#', 1)
1520 if not path:
1521 path = None
1522 if self._localpath:
1525 if self._localpath:
1523 self.path = path
1526 self.path = path
1524 return
1527 return
@@ -444,6 +444,8 b' record added file alone'
444 r
444 r
445 committed changeset 3:899491280810
445 committed changeset 3:899491280810
446 overwriting r expanding keywords
446 overwriting r expanding keywords
447 - status call required for dirstate.normallookup() check
448 $ hg status r
447 $ hg --verbose rollback
449 $ hg --verbose rollback
448 repository tip rolled back to revision 2 (undo commit)
450 repository tip rolled back to revision 2 (undo commit)
449 working directory now based on revision 2
451 working directory now based on revision 2
@@ -834,6 +836,8 b' kwexpand/kwshrink on selected files'
834 $ hg copy a x/a
836 $ hg copy a x/a
835 $ hg --verbose kwshrink a
837 $ hg --verbose kwshrink a
836 overwriting a shrinking keywords
838 overwriting a shrinking keywords
839 - sleep required for dirstate.normal() check
840 $ sleep 1
837 $ hg status a
841 $ hg status a
838 $ hg --verbose kwexpand a
842 $ hg --verbose kwexpand a
839 overwriting a expanding keywords
843 overwriting a expanding keywords
General Comments 0
You need to be logged in to leave comments. Login now