Mercurial > public > mercurial-scm > hg-stable

changeset 12909:333421b9e0f9 stable 1.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with i18n
author Matt Mackall <mpm@selenic.com>
date Mon, 01 Nov 2010 14:45:27 -0500
parents e255a5dc29e6 (diff) 7406d3b6ae37 (current diff)
children d0b08dcbcf0b
files
diffstat 2 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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)