Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMartin Geisler <mg@aragost.com>
Wed, 17 Nov 2010 09:17:55 +0100
changeset 13008 ac627ab0b3a5
parent 13005 cffa35529706 (current diff)
parent 13007 e98bf6948092 (diff)
child 13009 54be08fa4d1d
merge with stable
--- a/mercurial/httprepo.py	Wed Nov 17 09:06:38 2010 +0100
+++ b/mercurial/httprepo.py	Wed Nov 17 09:17:55 2010 +0100
@@ -68,7 +68,7 @@
         raise util.Abort(_('operation not supported over http'))
 
     def _callstream(self, cmd, **args):
-        if cmd is 'pushkey':
+        if cmd == 'pushkey':
             args['data'] = ''
         data = args.pop('data', None)
         headers = args.pop('headers', {})
--- a/mercurial/posix.py	Wed Nov 17 09:06:38 2010 +0100
+++ b/mercurial/posix.py	Wed Nov 17 09:17:55 2010 +0100
@@ -144,7 +144,7 @@
         try:
             fd = os.open(path, O_SYMLINK)
         except OSError, err:
-            if err.errno is errno.ENOENT:
+            if err.errno == errno.ENOENT:
                 return path
             raise
mercurial