Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fsmonitor: fix exception message scraping
authorzphricz <zack.hricz@oculus.com>
Wed, 21 Dec 2016 13:51:34 -0800
changeset 30649 b0a0f7b9ed90
parent 30648 2cab496db1e0
child 30650 ae37e395a110
fsmonitor: fix exception message scraping pywatchman.CommandError formats its error message such that 'unable to resolve root' is not a prefix. This change fixes that by instead just searching for it as a substring.
hgext/fsmonitor/watchmanclient.py file | annotate | diff | comparison | revisions 
--- a/hgext/fsmonitor/watchmanclient.py	Wed Dec 21 13:44:15 2016 -0800
+++ b/hgext/fsmonitor/watchmanclient.py	Wed Dec 21 13:51:34 2016 -0800
@@ -87,7 +87,7 @@
                     useImmutableBser=True)
             return self._watchmanclient.query(*watchmanargs)
         except pywatchman.CommandError as ex:
-            if ex.msg.startswith('unable to resolve root'):
+            if 'unable to resolve root' in ex.msg:
                 raise WatchmanNoRoot(self._root, ex.msg)
             raise Unavailable(ex.msg)
         except pywatchman.WatchmanError as ex:
mercurial