Mercurial > hgsubversion

diff svnwrap/svn_swig_wrapper.py @ 70:49b7cbe4c8e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push_cmd: handle copies at file level Mercurial store knows only file-level copies, directory copies are handle with heuristics. Implement the former one in svn backends.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 05 Nov 2008 13:37:08 +0100
parents a31968146f3c
children 450d5d9d3b80
line wrap: on
line diff
--- a/svnwrap/svn_swig_wrapper.py
+++ b/svnwrap/svn_swig_wrapper.py
@@ -264,7 +264,7 @@ class SubversionRepo(object):
                 revisions.pop(0)
 
     def commit(self, paths, message, file_data, base_revision, dirs,
-               properties):
+               properties, copies):
         """Commits the appropriate targets from revision in editor's store.
         """
         self.init_ra_and_client()
@@ -296,7 +296,10 @@ class SubversionRepo(object):
                 baton = editor.open_file(path, parent, base_revision, pool)
             elif action == 'add':
                 try:
-                    baton = editor.add_file(path, parent, None, -1, pool)
+                    frompath, fromrev = copies.get(path, (None, -1))
+                    if frompath:
+                        frompath = self.svn_url + '/' + frompath
+                    baton = editor.add_file(path, parent, frompath, fromrev, pool)
                 except (core.SubversionException, TypeError), e: #pragma: no cover
                     print e.message
                     raise