equal
deleted
inserted
replaced
399 if dsrc in invalid: |
399 if dsrc in invalid: |
400 # already seen to be uninteresting |
400 # already seen to be uninteresting |
401 continue |
401 continue |
402 elif dsrc in d1 and ddst in d1: |
402 elif dsrc in d1 and ddst in d1: |
403 # directory wasn't entirely moved locally |
403 # directory wasn't entirely moved locally |
404 invalid.add(dsrc) |
404 invalid.add(dsrc + "/") |
405 elif dsrc in d2 and ddst in d2: |
405 elif dsrc in d2 and ddst in d2: |
406 # directory wasn't entirely moved remotely |
406 # directory wasn't entirely moved remotely |
407 invalid.add(dsrc) |
407 invalid.add(dsrc + "/") |
408 elif dsrc in dirmove and dirmove[dsrc] != ddst: |
408 elif dsrc + "/" in dirmove and dirmove[dsrc + "/"] != ddst + "/": |
409 # files from the same directory moved to two different places |
409 # files from the same directory moved to two different places |
410 invalid.add(dsrc) |
410 invalid.add(dsrc + "/") |
411 else: |
411 else: |
412 # looks good so far |
412 # looks good so far |
413 dirmove[dsrc + "/"] = ddst + "/" |
413 dirmove[dsrc + "/"] = ddst + "/" |
414 |
414 |
415 for i in invalid: |
415 for i in invalid: |