equal
deleted
inserted
replaced
253 if not l.startswith(':'): |
253 if not l.startswith(':'): |
254 continue |
254 continue |
255 entry = l.split() |
255 entry = l.split() |
256 continue |
256 continue |
257 f = l |
257 f = l |
|
258 if entry[4][0] == 'C': |
|
259 copysrc = f |
|
260 copydest = difftree[i] |
|
261 i += 1 |
|
262 f = copydest |
|
263 copies[copydest] = copysrc |
258 if f not in seen: |
264 if f not in seen: |
259 add(entry, f, False) |
265 add(entry, f, False) |
260 # A file can be copied multiple times, or modified and copied |
266 # A file can be copied multiple times, or modified and copied |
261 # simultaneously. So f can be repeated even if fdest isn't. |
267 # simultaneously. So f can be repeated even if fdest isn't. |
262 if entry[4][0] in 'RC': |
268 if entry[4][0] == 'R': |
263 # rename or copy: next line is the destination |
269 # rename: next line is the destination |
264 fdest = difftree[i] |
270 fdest = difftree[i] |
265 i += 1 |
271 i += 1 |
266 if fdest not in seen: |
272 if fdest not in seen: |
267 add(entry, fdest, True) |
273 add(entry, fdest, True) |
268 # .gitmodules isn't imported at all, so it being copied to |
274 # .gitmodules isn't imported at all, so it being copied to |