Mercurial > hgsubversion
comparison hgsubversion/editor.py @ 496:5e0dfe59d4c3
copies: fix under-reporting of copies in hg
| author | Augie Fackler <durin42@gmail.com> |
|---|---|
| date | Fri, 16 Oct 2009 19:09:25 -0400 |
| parents | fbc7cf4fd701 |
| children | cad864ed29de |
comparison
equal
deleted
inserted
replaced
| 495:44bde69b6c49 | 496:5e0dfe59d4c3 |
|---|---|
| 276 # Preserve the directory copy records if no file was changed between | 276 # Preserve the directory copy records if no file was changed between |
| 277 # the source and destination revisions, or discard it completely. | 277 # the source and destination revisions, or discard it completely. |
| 278 parentid = self.meta.get_parent_revision(self.current.rev.revnum, branch) | 278 parentid = self.meta.get_parent_revision(self.current.rev.revnum, branch) |
| 279 if parentid != revlog.nullid: | 279 if parentid != revlog.nullid: |
| 280 parentctx = self.repo.changectx(parentid) | 280 parentctx = self.repo.changectx(parentid) |
| 281 if util.aresamefiles(parentctx, cp_f_ctx, copies.values()): | 281 for k, v in copies.iteritems(): |
| 282 self.current.copies.update(copies) | 282 if util.aresamefiles(parentctx, cp_f_ctx, [v]): |
| 283 self.current.copies.update({k: v}) | |
| 283 return path | 284 return path |
| 284 | 285 |
| 285 @ieditor | 286 @ieditor |
| 286 def change_file_prop(self, file_baton, name, value, pool=None): | 287 def change_file_prop(self, file_baton, name, value, pool=None): |
| 287 if name == 'svn:executable': | 288 if name == 'svn:executable': |