Mercurial > hgsubversion
comparison hg_delta_editor.py @ 222:f2c65dd3d5c0
Avoid problems in _localname for commits to tags by ignoring them
author | Luke Opperman <luke@loppear.com> |
---|---|
date | Tue, 31 Mar 2009 15:23:38 -0500 |
parents | a360ddc97719 |
children | f71af18c4379 |
comparison
equal
deleted
inserted
replaced
221:ced45b753ba7 | 222:f2c65dd3d5c0 |
---|---|
219 while filepaths: | 219 while filepaths: |
220 path = filepaths.pop(0) | 220 path = filepaths.pop(0) |
221 parentdir = '/'.join(path[:-1]) | 221 parentdir = '/'.join(path[:-1]) |
222 filepaths = [p for p in filepaths if not '/'.join(p).startswith(parentdir)] | 222 filepaths = [p for p in filepaths if not '/'.join(p).startswith(parentdir)] |
223 branchpath = self._normalize_path(parentdir) | 223 branchpath = self._normalize_path(parentdir) |
224 if branchpath.startswith('tags/'): | |
225 continue | |
224 branchname = self._localname(branchpath) | 226 branchname = self._localname(branchpath) |
225 if branchpath.startswith('trunk/'): | 227 if branchpath.startswith('trunk/'): |
226 branches[self._localname('trunk')] = 'trunk' | 228 branches[self._localname('trunk')] = 'trunk' |
227 continue | 229 continue |
228 if branchname and branchname.startswith('../'): | 230 if branchname and branchname.startswith('../'): |