mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
Merge with crew-stable
This commit is contained in:
commit
7e7ba71a3a
@ -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:
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user