equal
deleted
inserted
replaced
419 def getstandinsstate(repo): |
419 def getstandinsstate(repo): |
420 standins = [] |
420 standins = [] |
421 matcher = getstandinmatcher(repo) |
421 matcher = getstandinmatcher(repo) |
422 for standin in repo.dirstate.walk(matcher, [], False, False): |
422 for standin in repo.dirstate.walk(matcher, [], False, False): |
423 lfile = splitstandin(standin) |
423 lfile = splitstandin(standin) |
424 standins.append((lfile, readstandin(repo, lfile))) |
424 try: |
|
425 hash = readstandin(repo, lfile) |
|
426 except IOError: |
|
427 hash = None |
|
428 standins.append((lfile, hash)) |
425 return standins |
429 return standins |
426 |
430 |
427 def getlfilestoupdate(oldstandins, newstandins): |
431 def getlfilestoupdate(oldstandins, newstandins): |
428 changedstandins = set(oldstandins).symmetric_difference(set(newstandins)) |
432 changedstandins = set(oldstandins).symmetric_difference(set(newstandins)) |
429 filelist = [] |
433 filelist = [] |