--- a/mercurial/dirstate.py Mon Nov 01 16:04:15 2010 -0200
+++ b/mercurial/dirstate.py Mon Nov 01 14:45:27 2010 -0500
@@ -485,11 +485,6 @@
work = []
wadd = work.append
- if self._checkcase:
- normalize = self._normalize
- else:
- normalize = lambda x, y: x
-
exact = skipstep3 = False
if matchfn == match.exact: # match.exact
exact = True
@@ -497,6 +492,12 @@
elif match.files() and not match.anypats(): # match.match, no patterns
skipstep3 = True
+ if self._checkcase:
+ normalize = self._normalize
+ skipstep3 = False
+ else:
+ normalize = lambda x, y: x
+
files = sorted(match.files())
subrepos.sort()
i, j = 0, 0
--- a/mercurial/url.py Mon Nov 01 16:04:15 2010 -0200
+++ b/mercurial/url.py Mon Nov 01 14:45:27 2010 -0500
@@ -540,8 +540,8 @@
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect((self.host, self.port))
if _generic_proxytunnel(self):
- self.sock = _ssl_wrap_socket(self.sock, self.cert_file,
- self.key_file)
+ self.sock = _ssl_wrap_socket(self.sock, self.key_file,
+ self.cert_file)
else:
BetterHTTPS.connect(self)