changeset 1244:012965ab3bf7

stupid: add another None check This seems to be required on my Linux machine, but not on my Mac. I'm not motivated enough right now to try and figure out what's going on here, so I'm just adding it (it can't hurt, after all) and moving on so that hgsubversion works again with hg 3.2.
author Augie Fackler <raf@durin42.com>
date Wed, 17 Sep 2014 11:25:52 -0400
parents 3606aff13a22
children 260212f056b7
files hgsubversion/stupid.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgsubversion/stupid.py
+++ b/hgsubversion/stupid.py
@@ -210,7 +210,10 @@ try:
             # In Mercurial >= 3.2, if fname is missing, data will be None and we
             # should return None, None in that case. Earlier versions will raise
             # an IOError which we let propagate up the stack.
-            data, flags = super(svnbackend, self).getfile(fname)
+            f = super(svnbackend, self).getfile(fname)
+            if f is None:
+              return None, None
+            data, flags = f
             if data is None:
                 return None, None
             islink, isexec = flags