Merge with crew-stable

mercurial/hgweb/server.py

@@ -275,7 +275,7 b' def create_server(ui, repo):'
 
         def __init__(self, *args, **kwargs):
             if self.address_family is None:
-                raise RepoError(_('IPv6 not available on this system'))
+                raise error.RepoError(_('IPv6 not available on this system'))
             super(IPv6HTTPServer, self).__init__(*args, **kwargs)
 
     if ssl_cert:

mercurial/localrepo.py

@@ -1063,7 +1063,7 b' class localrepository(repo.repository):'
                             wlock = self.wlock(False)
                             for f in fixup:
                                 self.dirstate.normal(f)
-                        except lock.LockError:
+                        except error.LockError:
                             pass
                     finally:
                         del wlock