Mercurial > hg-stable
changeset 8885:2c184bd2b37a
convert/svn: remove confusing unicode variable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 21 Jun 2009 23:04:02 +0200 |
| parents | 8b603c7c808e |
| children | 0593c5b5b1f0 |
| files | hgext/convert/subversion.py |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/subversion.py Sun Jun 21 23:04:02 2009 +0200 +++ b/hgext/convert/subversion.py Sun Jun 21 23:04:02 2009 +0200 @@ -624,11 +624,10 @@ for path, ent in paths: entrypath = self.getrelpath(path) - entry = entrypath.decode(self.encoding) kind = self._checkpath(entrypath, revnum) if kind == svn.core.svn_node_file: - entries.append(self.recode(entry)) + entries.append(self.recode(entrypath)) if not ent.copyfrom_path or not parents: continue # Copy sources not in parent revisions cannot be @@ -641,7 +640,7 @@ continue self.ui.debug(_("copied to %s from %s@%s\n") % (entrypath, copyfrom_path, ent.copyfrom_rev)) - copies[self.recode(entry)] = self.recode(copyfrom_path) + copies[self.recode(entrypath)] = 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) pmodule, prevnum = self.revsplit(parents[0])[1:] @@ -655,7 +654,7 @@ self.reparent(prevmodule) if fromkind == svn.core.svn_node_file: - entries.append(self.recode(entry)) + entries.append(self.recode(entrypath)) elif fromkind == svn.core.svn_node_dir: if ent.action == 'C': children = self._find_children(path, prevnum)