inotify: Simplifying init code

simplifying

retry = False
try:
    try:
        doA()
        retry = True
    except X:
        doB()
        retry = True
except:
    doC()
    pass
if retry:
    doD()

 -- into --

try:
    try:
        doA()
    except X:
        doB()
except:
    doC()
    pass
else:
    doD()
This commit is contained in:
Nicolas Dumazet 2009-04-08 13:29:51 +09:00
parent 2a759b6b22
commit d788ab8874

View File

@ -80,23 +80,21 @@ def reposetup(ui, repo):
'removing it)\n'))
os.unlink(repo.join('inotify.sock'))
if err[0] in (errno.ECONNREFUSED, errno.ENOENT) and autostart:
query = None
ui.debug(_('(starting inotify server)\n'))
try:
try:
server.start(ui, repo)
query = client.query
except server.AlreadyStartedException, inst:
# another process may have started its own
# inotify server while this one was starting.
ui.debug(str(inst))
query = client.query
except Exception, inst:
ui.warn(_('could not start inotify server: '
'%s\n') % inst)
if query:
else:
# server is started, send query again
try:
return query(ui, repo, files, match,
return client.query(ui, repo, files, match,
ignored, clean, unknown)
except socket.error, err:
ui.warn(_('could not talk to new inotify '