Mercurial > hg
comparison hgext/convert/filemap.py @ 15565:3992c7df85f2 stable
convert: handle trailing slashes in filemap better (issue3124)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 23 Nov 2011 16:25:44 -0600 |
| parents | 2433525a9e1e |
| children | 5146de7bce96 32b2e6d641e4 |
comparison
equal
deleted
inserted
replaced
| 15564:e45dadde2761 | 15565:3992c7df85f2 |
|---|---|
| 97 newpre, pre, suf = self.lookup(name, self.rename) | 97 newpre, pre, suf = self.lookup(name, self.rename) |
| 98 if newpre: | 98 if newpre: |
| 99 if newpre == '.': | 99 if newpre == '.': |
| 100 return suf | 100 return suf |
| 101 if suf: | 101 if suf: |
| 102 if newpre.endswith('/'): | |
| 103 return newpre + suf | |
| 102 return newpre + '/' + suf | 104 return newpre + '/' + suf |
| 103 return newpre | 105 return newpre |
| 104 return name | 106 return name |
| 105 | 107 |
| 106 def active(self): | 108 def active(self): |