Mercurial > hgsubversion
comparison fetch_command.py @ 184:d3ea6c98a086
Do not recurse for externals on copied directory in stupid mode
We inherit the source externals, changes to children will appear in the
changelog.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 14 Jan 2009 23:17:13 -0600 |
parents | 47d25d61abfa |
children | 57355b0e7bd1 |
comparison
equal
deleted
inserted
replaced
183:1c46ad3f56aa | 184:d3ea6c98a086 |
---|---|
456 kind = svn.checkpath(path, r.revnum) | 456 kind = svn.checkpath(path, r.revnum) |
457 if kind != 'd': | 457 if kind != 'd': |
458 continue | 458 continue |
459 path = path[len(branchprefix):] | 459 path = path[len(branchprefix):] |
460 dirs.add(path) | 460 dirs.add(path) |
461 if e.action == 'M': | 461 if e.action == 'M' or (e.action == 'A' and e.copyfrom_path): |
462 # Do not recurse in copied directories, changes are marked | |
463 # as 'M', except for the copied one. | |
462 continue | 464 continue |
463 for child, k in svn.list_files(branchprefix + path, r.revnum): | 465 for child, k in svn.list_files(branchprefix + path, r.revnum): |
464 if k == 'd': | 466 if k == 'd': |
465 dirs.add((path + '/' + child).strip('/')) | 467 dirs.add((path + '/' + child).strip('/')) |
466 | 468 |