Mercurial > hg
diff hgext/convert/subversion.py @ 8882:48a04961b0dd
convert/svn: remove useless encoding/decoding calls (issue1676)
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 21 Jun 2009 23:04:02 +0200 |
| parents | 76d3cd914c5e |
| children | ede2247e61aa |
line wrap: on
line diff
--- a/hgext/convert/subversion.py Sun Jun 21 23:04:01 2009 +0200 +++ b/hgext/convert/subversion.py Sun Jun 21 23:04:02 2009 +0200 @@ -744,8 +744,7 @@ pmodule, prevnum = self.revsplit(parents[0])[1:] if ent.copyfrom_rev < prevnum: continue - copyfrompath = ent.copyfrom_path.decode(self.encoding) - copyfrompath = self.getrelpath(copyfrompath, pmodule) + copyfrompath = self.getrelpath(ent.copyfrom_path, pmodule) if not copyfrompath: continue copyfrom[path] = ent @@ -757,10 +756,9 @@ entrypath = self.getrelpath("/" + child, pmodule) if not entrypath: continue - entry = entrypath.decode(self.encoding) - copytopath = path + entry[len(copyfrompath):] + copytopath = path + entrypath[len(copyfrompath):] copytopath = self.getrelpath(copytopath) - copies[self.recode(copytopath)] = self.recode(entry, pmodule) + copies[self.recode(copytopath)] = self.recode(entrypath) return (list(set(entries)), copies)