comparison hgext/mq.py @ 7453:9898427add1c

mq: drop copy sources removed during qfold (see issue1405)
author Brendan Cully <brendan@kublai.com>
date Mon, 01 Dec 2008 20:09:10 -0800
parents 4c4324476be6
children 1d5ecaa47abb
comparison
equal deleted inserted replaced
7452:89c516430107 7453:9898427add1c
1191 1191
1192 try: 1192 try:
1193 copies = {} 1193 copies = {}
1194 for dst in a: 1194 for dst in a:
1195 src = repo.dirstate.copied(dst) 1195 src = repo.dirstate.copied(dst)
1196 if src is not None: 1196 # during qfold, the source file for copies may
1197 # be removed. Treat this as a simple add.
1198 if src is not None and src in repo.dirstate:
1197 copies.setdefault(src, []).append(dst) 1199 copies.setdefault(src, []).append(dst)
1198 repo.dirstate.add(dst) 1200 repo.dirstate.add(dst)
1199 # remember the copies between patchparent and tip 1201 # remember the copies between patchparent and tip
1200 # this may be slow, so don't do it if we're not tracking copies 1202 # this may be slow, so don't do it if we're not tracking copies
1201 if self.diffopts().git: 1203 if self.diffopts().git: