Mercurial > hgsubversion
comparison cmdutil.py @ 311:b6a9cdee2f68
cmdutil: fix svn path normalization corner case
When the subpath is empty we ended with "path/" instead of "path".
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 29 Apr 2009 12:01:31 +0200 |
| parents | 75d4fde9aa2e |
| children | 067914ecb4eb |
comparison
equal
deleted
inserted
replaced
| 291:ba8e91a7c077 | 311:b6a9cdee2f68 |
|---|---|
| 228 continue | 228 continue |
| 229 action = 'delete' | 229 action = 'delete' |
| 230 file_data[file] = base_data, new_data, action | 230 file_data[file] = base_data, new_data, action |
| 231 | 231 |
| 232 def svnpath(p): | 232 def svnpath(p): |
| 233 return '%s/%s' % (branch_path, p) | 233 return ('%s/%s' % (branch_path, p)).rstrip('/') |
| 234 | 234 |
| 235 changeddirs = [] | 235 changeddirs = [] |
| 236 for d, v1, v2 in extchanges: | 236 for d, v1, v2 in extchanges: |
| 237 props.setdefault(svnpath(d), {})['svn:externals'] = v2 | 237 props.setdefault(svnpath(d), {})['svn:externals'] = v2 |
| 238 if d not in deleteddirs and d not in addeddirs: | 238 if d not in deleteddirs and d not in addeddirs: |