merge

brettcannon · brettcannon · commit 9e66ac683cce · 2012-04-27T14:02:33.000-04:00
diff --git a/Tools/hg/hgtouch.py b/Tools/hg/hgtouch.py
@@ -7,15 +7,19 @@
 
 In addition to the dependency syntax, #-comments are supported.
 """
+import errno
 import os
 
 def parse_config(repo):
-    configfile = repo.wjoin(".hgtouch")
-    if not os.path.exists(configfile):
+    try:
+        fp = repo.wfile(".hgtouch")
+    except IOError, e:
+        if e.errno != errno.ENOENT:
+            raise
         return {}
     result = {}
-    with open(configfile) as f:
-        for line in f:
+    with fp:
+        for line in fp:
             # strip comments
             line = line.split('#')[0].strip()
             if ':' not in line:
