# HG changeset patch # User Augie Fackler # Date 1410967552 14400 # Node ID 012965ab3bf7540c3d9158d6e9cd54d57b36a4a3 # Parent 3606aff13a2230ae8708dc314d76b38be6f3ac05 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. diff --git a/hgsubversion/stupid.py b/hgsubversion/stupid.py --- 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