facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge with crew-stable

Browse Source
This commit is contained in:
Matt Mackall 2009-04-03 11:50:42 -05:00
commit 7e7ba71a3a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/hgweb/server.py
View File

@ -275,7 +275,7 @@ 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:

2
mercurial/localrepo.py
View File

@ -1063,7 +1063,7 @@ 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