# HG changeset patch # User Siddharth Agarwal # Date 1410909317 25200 # Node ID 57000c9b53f164961873e43c4c0b756ac93f574b # Parent f96e2495de395d5516a123ab4b409cd2a6a412c9 stupid: in diff_branchrev, use compat hack for filectxfn for deleted files diff --git a/hgsubversion/stupid.py b/hgsubversion/stupid.py --- a/hgsubversion/stupid.py +++ b/hgsubversion/stupid.py @@ -342,13 +342,16 @@ def diff_branchrev(ui, svn, meta, branch if f.symlink is not None) def filectxfn(repo, memctx, path): if path in files_data and files_data[path] is None: - raise IOError(errno.ENOENT, '%s is deleted' % path) + return compathacks.filectxfn_deleted(memctx, path) if path in binary_files or path in unknown_files: pa = path if branchpath: pa = branchpath + '/' + path - data, mode = svn.get_file(pa, r.revnum) + try: + data, mode = svn.get_file(pa, r.revnum) + except IOError: + return compathacks.filectxfn_deleted_reraise(memctx) isexe = 'x' in mode islink = 'l' in mode else: