Mercurial > hgsubversion

diff fetch_command.py @ 97:0d3a2a7cefa3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg_delta_editor: fix symlink prefix confusion - SubversionRepo.get_file() strips the symlink prefix - Enforce that hg_delta_editor symlink data always contains the prefix. The alternative was seducing and more consistent with hg content but it makes the code more complicated since svn:special can be set before or after the content is set, and we need it in apply_textdelta() This issue fixes jQuery repository conversion at r3674.
author Patrick Mezard <pmezard@gmail.com>
date Thu, 20 Nov 2008 22:41:15 -0600
parents 4c419603d41b
children c7ac013cf7fd
line wrap: on
line diff
--- a/fetch_command.py
+++ b/fetch_command.py
@@ -154,9 +154,7 @@ def replay_convert_rev(hg_editor, svn, r
             cleanup_file_handles(svn, i)
             i += 1
             data, mode = svn.get_file(p2, r.revnum)
-            hg_editor.current_files[p] = data
-            hg_editor.current_files_exec[p] = 'x' in mode
-            hg_editor.current_files_symlink[p] = 'l' in mode
+            hg_editor.set_file(p, data, 'x' in mode, 'l' in mode)
         hg_editor.missing_plaintexts = set()
         hg_editor.ui.status('\n')
     hg_editor.commit_current_delta()
@@ -339,13 +337,10 @@ def stupid_fetch_branchrev(svn, hg_edito
 
     copies = getcopies(svn, hg_editor, branch, branchpath, r, files, parentid)
     
-    linkprefix = 'link '
     def filectxfn(repo, memctx, path):
         data, mode = svn.get_file(branchpath + '/' + path, r.revnum)
         isexec = 'x' in mode
         islink = 'l' in mode
-        if islink and data.startswith(linkprefix):
-            data = data[len(linkprefix):]
         copied = copies.get(path)
         return context.memfilectx(path=path, data=data, islink=islink,
                                   isexec=isexec, copied=copied)