Mercurial > hg
comparison hgext/convert/subversion.py @ 13529:9b62cbe81f44
convert/svn: read trunk name once, use None for default
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Thu, 03 Mar 2011 22:19:28 +0100 |
| parents | 3178aca36b0f |
| children | 5f69af0d2fb3 |
comparison
equal
deleted
inserted
replaced
| 13528:73bf872a91d8 | 13529:9b62cbe81f44 |
|---|---|
| 257 try: | 257 try: |
| 258 latest = int(rev) | 258 latest = int(rev) |
| 259 except ValueError: | 259 except ValueError: |
| 260 raise util.Abort(_('svn: revision %s is not an integer') % rev) | 260 raise util.Abort(_('svn: revision %s is not an integer') % rev) |
| 261 | 261 |
| 262 self.trunkname = self.ui.config('convert', 'svn.trunk', 'trunk').strip('/') | |
| 262 self.startrev = self.ui.config('convert', 'svn.startrev', default=0) | 263 self.startrev = self.ui.config('convert', 'svn.startrev', default=0) |
| 263 try: | 264 try: |
| 264 self.startrev = int(self.startrev) | 265 self.startrev = int(self.startrev) |
| 265 if self.startrev < 0: | 266 if self.startrev < 0: |
| 266 self.startrev = 0 | 267 self.startrev = 0 |
| 759 | 760 |
| 760 log = message and self.recode(message) or '' | 761 log = message and self.recode(message) or '' |
| 761 author = author and self.recode(author) or '' | 762 author = author and self.recode(author) or '' |
| 762 try: | 763 try: |
| 763 branch = self.module.split("/")[-1] | 764 branch = self.module.split("/")[-1] |
| 764 trunkname = self.ui.config('convert', 'svn.trunk', 'trunk') | 765 if branch == self.trunkname: |
| 765 if branch == trunkname.strip('/'): | 766 branch = None |
| 766 branch = '' | |
| 767 except IndexError: | 767 except IndexError: |
| 768 branch = None | 768 branch = None |
| 769 | 769 |
| 770 cset = commit(author=author, | 770 cset = commit(author=author, |
| 771 date=util.datestr(date), | 771 date=util.datestr(date), |