Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert/svn: read trunk name once, use None for default
authorPatrick Mezard <pmezard@gmail.com>
Thu, 03 Mar 2011 22:19:28 +0100
changeset 13529 9b62cbe81f44
parent 13528 73bf872a91d8
child 13530 5f69af0d2fb3
convert/svn: read trunk name once, use None for default
hgext/convert/subversion.py file | annotate | diff | comparison | revisions 
--- a/hgext/convert/subversion.py	Thu Mar 03 21:42:15 2011 +0100
+++ b/hgext/convert/subversion.py	Thu Mar 03 22:19:28 2011 +0100
@@ -259,6 +259,7 @@
             except ValueError:
                 raise util.Abort(_('svn: revision %s is not an integer') % rev)
 
+        self.trunkname = self.ui.config('convert', 'svn.trunk', 'trunk').strip('/')
         self.startrev = self.ui.config('convert', 'svn.startrev', default=0)
         try:
             self.startrev = int(self.startrev)
@@ -761,9 +762,8 @@
             author = author and self.recode(author) or ''
             try:
                 branch = self.module.split("/")[-1]
-                trunkname = self.ui.config('convert', 'svn.trunk', 'trunk')
-                if branch == trunkname.strip('/'):
-                    branch = ''
+                if branch == self.trunkname:
+                    branch = None
             except IndexError:
                 branch = None
hg-stable