changeset 107:a8950157281a

fetch_command: use the opener to read touched files
author Patrick Mezard <pmezard@gmail.com>
date Tue, 25 Nov 2008 09:18:28 -0600
parents 122b6037e5f9
children de19a13edfa8
files fetch_command.py
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/fetch_command.py
+++ b/fetch_command.py
@@ -474,17 +474,16 @@ def stupid_svn_server_pull_rev(ui, svn, 
             def filectxfn(repo, memctx, path):
                 if path in deleted_files:
                     raise IOError()
-                disk_path = os.path.join(our_tempdir, path)
                 if path in link_files:
                     return context.memfilectx(path=path, data=link_files[path],
                                               islink=True, isexec=False,
                                               copied=False)
-                fp = open(disk_path)
+                data = opener(path).read()
                 exe = exec_files.get(path, None)
                 if exe is None and path in hg_editor.repo[parent_ha]:
                     exe = 'x' in hg_editor.repo[parent_ha].filectx(path).flags()
                 copied = copies.get(path)
-                return context.memfilectx(path=path, data=fp.read(), islink=False,
+                return context.memfilectx(path=path, data=data, islink=False,
                                           isexec=exe, copied=copied)
         except (core.SubversionException,
                 BadPatchApply,