merge with -stable

hgext/inotify/client.py

@@ -1,55 +1,62 b''
 # client.py - inotify status client
 #
 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <[e-mail]>
 # Copyright 2007, 2008 Brendan Cully <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from mercurial.i18n import gettext as _
 from mercurial import ui
 import common
 import os, select, socket, stat, struct, sys
 
 def query(ui, repo, names, match, ignored, clean, unknown=True):
     sock = socket.socket(socket.AF_UNIX)
     sockpath = repo.join('inotify.sock')
-    sock.connect(sockpath)
+    try:
+        sock.connect(sockpath)
+    except socket.error, err:
+        if err[0] == "AF_UNIX path too long":
+            sockpath = os.readlink(sockpath)
+            sock.connect(sockpath)
+        else:
+            raise
 
     def genquery():
         for n in names or []:
             yield n
         states = 'almrx!'
         if ignored:
             raise ValueError('this is insanity')
         if clean: states += 'n'
         if unknown: states += '?'
         yield states
 
     req = '\0'.join(genquery())
 
     sock.sendall(chr(common.version))
     sock.sendall(req)
     sock.shutdown(socket.SHUT_WR)
 
     cs = common.recvcs(sock)
     version = ord(cs.read(1))
 
     if version != common.version:
         ui.warn(_('(inotify: received response from incompatible server '
                   'version %d)\n') % version)
         return None
 
     try:
         resphdr = struct.unpack(common.resphdrfmt, cs.read(common.resphdrsize))
     except struct.error:
         return None
 
     def readnames(nbytes):
         if nbytes:
             names = cs.read(nbytes)
             if names:
                 return filter(match, names.split('\0'))
         return []
 
     return map(readnames, resphdr)

tests/test-inotify-issue1208.out

@@ -1,9 +1,7 b''
 % fail
-failed to contact inotify server: AF_UNIX path too long
+failed to contact inotify server: No such file or directory
 deactivating inotify
 abort: could not start server: File exists
 % inserve
 % status
-failed to contact inotify server: AF_UNIX path too long
-deactivating inotify
 ? hg.pid