equal
deleted
inserted
replaced
1023 |
1023 |
1024 repo.dirstate.setparents(*cparents) |
1024 repo.dirstate.setparents(*cparents) |
1025 copies = {} |
1025 copies = {} |
1026 for dst in a: |
1026 for dst in a: |
1027 src = repo.dirstate.copied(dst) |
1027 src = repo.dirstate.copied(dst) |
1028 if src is None: |
1028 if src is not None: |
1029 continue |
1029 copies.setdefault(src, []).append(dst) |
1030 copies.setdefault(src, []).append(dst) |
|
1031 repo.dirstate.add(dst) |
1030 repo.dirstate.add(dst) |
1032 # remember the copies between patchparent and tip |
1031 # remember the copies between patchparent and tip |
1033 # this may be slow, so don't do it if we're not tracking copies |
1032 # this may be slow, so don't do it if we're not tracking copies |
1034 if self.diffopts().git: |
1033 if self.diffopts().git: |
1035 for dst in aaa: |
1034 for dst in aaa: |