# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2008-04-14 20:31:34
# Node ID 3447c088a516836e6bd171b6052dbd219af9d86f
# Parent  a6e2e60b34d0b80a343bdaa6294e31dd9fe79c29

convert: cleanup svn file copy handling

diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py
--- a/hgext/convert/subversion.py
+++ b/hgext/convert/subversion.py
@@ -552,19 +552,21 @@ class svn_source(converter_source):
 
             kind = svn.ra.check_path(self.ra, entrypath, revnum)
             if kind == svn.core.svn_node_file:
-                if ent.copyfrom_path:
-                    copyfrom_path = self.getrelpath(ent.copyfrom_path)
-                    if copyfrom_path:
-                        self.ui.debug("Copied to %s from %s@%s\n" %
-                                      (entrypath, copyfrom_path,
-                                       ent.copyfrom_rev))
-                        # It's probably important for hg that the source
-                        # exists in the revision's parent, not just the
-                        # ent.copyfrom_rev
-                        fromkind = svn.ra.check_path(self.ra, copyfrom_path, ent.copyfrom_rev)
-                        if fromkind != 0:
-                            copies[self.recode(entry)] = self.recode(copyfrom_path)
                 entries.append(self.recode(entry))
+
+                if not ent.copyfrom_path:
+                    continue
+                copyfrom_path = self.getrelpath(ent.copyfrom_path)
+                if not copyfrom_path:
+                    continue
+                self.ui.debug("copied to %s from %s@%s\n" %
+                              (entrypath, copyfrom_path, ent.copyfrom_rev))
+                # It's probably important for hg that the source
+                # exists in the revision's parent, not just the
+                # ent.copyfrom_rev
+                fromkind = svn.ra.check_path(self.ra, copyfrom_path, ent.copyfrom_rev)
+                if fromkind != 0:
+                    copies[self.recode(entry)] = self.recode(copyfrom_path)
             elif kind == 0: # gone, but had better be a deleted *file*
                 self.ui.debug("gone from %s\n" % ent.copyfrom_rev)