##// END OF EJS Templates
convert/svn: remove confusing unicode variable
Patrick Mezard -
r8885:2c184bd2 default
parent child Browse files
Show More
@@ -624,11 +624,10 class svn_source(converter_source):
624
624
625 for path, ent in paths:
625 for path, ent in paths:
626 entrypath = self.getrelpath(path)
626 entrypath = self.getrelpath(path)
627 entry = entrypath.decode(self.encoding)
628
627
629 kind = self._checkpath(entrypath, revnum)
628 kind = self._checkpath(entrypath, revnum)
630 if kind == svn.core.svn_node_file:
629 if kind == svn.core.svn_node_file:
631 entries.append(self.recode(entry))
630 entries.append(self.recode(entrypath))
632 if not ent.copyfrom_path or not parents:
631 if not ent.copyfrom_path or not parents:
633 continue
632 continue
634 # Copy sources not in parent revisions cannot be
633 # Copy sources not in parent revisions cannot be
@@ -641,7 +640,7 class svn_source(converter_source):
641 continue
640 continue
642 self.ui.debug(_("copied to %s from %s@%s\n") %
641 self.ui.debug(_("copied to %s from %s@%s\n") %
643 (entrypath, copyfrom_path, ent.copyfrom_rev))
642 (entrypath, copyfrom_path, ent.copyfrom_rev))
644 copies[self.recode(entry)] = self.recode(copyfrom_path)
643 copies[self.recode(entrypath)] = self.recode(copyfrom_path)
645 elif kind == 0: # gone, but had better be a deleted *file*
644 elif kind == 0: # gone, but had better be a deleted *file*
646 self.ui.debug(_("gone from %s\n") % ent.copyfrom_rev)
645 self.ui.debug(_("gone from %s\n") % ent.copyfrom_rev)
647 pmodule, prevnum = self.revsplit(parents[0])[1:]
646 pmodule, prevnum = self.revsplit(parents[0])[1:]
@@ -655,7 +654,7 class svn_source(converter_source):
655 self.reparent(prevmodule)
654 self.reparent(prevmodule)
656
655
657 if fromkind == svn.core.svn_node_file:
656 if fromkind == svn.core.svn_node_file:
658 entries.append(self.recode(entry))
657 entries.append(self.recode(entrypath))
659 elif fromkind == svn.core.svn_node_dir:
658 elif fromkind == svn.core.svn_node_dir:
660 if ent.action == 'C':
659 if ent.action == 'C':
661 children = self._find_children(path, prevnum)
660 children = self._find_children(path, prevnum)
General Comments 0
You need to be logged in to leave comments. Login now