Mercurial > hgsubversion
comparison hg_delta_editor.py @ 41:496c0354019c
Improved handling of copies from outside of trunk.
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Sun, 26 Oct 2008 22:39:17 -0500 |
| parents | b3c7b844b782 |
| children | af7ac6c03452 |
comparison
equal
deleted
inserted
replaced
| 40:9952f03ddfbe | 41:496c0354019c |
|---|---|
| 530 junk, branch = self._path_and_branch_for_path(path) | 530 junk, branch = self._path_and_branch_for_path(path) |
| 531 if not copyfrom_path and not junk: | 531 if not copyfrom_path and not junk: |
| 532 self.commit_branches_empty[branch] = True | 532 self.commit_branches_empty[branch] = True |
| 533 else: | 533 else: |
| 534 self.commit_branches_empty[branch] = False | 534 self.commit_branches_empty[branch] = False |
| 535 if not (self._is_path_valid(path) and copyfrom_path and | 535 if not self._is_path_valid(path) or not copyfrom_path: |
| 536 self._is_path_valid(copyfrom_path)): | 536 return |
| 537 if copyfrom_path and not self._is_path_valid(copyfrom_path): | |
| 538 self.missing_plaintexts.add('%s/' % path) | |
| 537 return | 539 return |
| 538 | 540 |
| 539 cp_f, br_from = self._path_and_branch_for_path(copyfrom_path) | 541 cp_f, br_from = self._path_and_branch_for_path(copyfrom_path) |
| 540 new_hash = self.get_parent_revision(copyfrom_revision + 1, br_from) | 542 new_hash = self.get_parent_revision(copyfrom_revision + 1, br_from) |
| 541 if new_hash == node.nullid: | 543 if new_hash == node.nullid: |