hgext/largefiles/overrides.py
changeset 31618 8228bc8fed8c
parent 31617 1f6c932862e5
child 31653 32d998dc2a00
equal deleted inserted replaced
31617:1f6c932862e5 31618:8228bc8fed8c
   737         s = lfutil.lfdirstatestatus(lfdirstate, repo)
   737         s = lfutil.lfdirstatestatus(lfdirstate, repo)
   738         lfdirstate.write()
   738         lfdirstate.write()
   739         for lfile in s.modified:
   739         for lfile in s.modified:
   740             lfutil.updatestandin(repo, lfutil.standin(lfile))
   740             lfutil.updatestandin(repo, lfutil.standin(lfile))
   741         for lfile in s.deleted:
   741         for lfile in s.deleted:
   742             if (repo.wvfs.exists(lfutil.standin(lfile))):
   742             fstandin = lfutil.standin(lfile)
   743                 repo.wvfs.unlink(lfutil.standin(lfile))
   743             if (repo.wvfs.exists(fstandin)):
       
   744                 repo.wvfs.unlink(fstandin)
   744 
   745 
   745         oldstandins = lfutil.getstandinsstate(repo)
   746         oldstandins = lfutil.getstandinsstate(repo)
   746 
   747 
   747         def overridematch(mctx, pats=(), opts=None, globbed=False,
   748         def overridematch(mctx, pats=(), opts=None, globbed=False,
   748                 default='relpath', badfn=None):
   749                 default='relpath', badfn=None):
  1078         repo.lfstatus = False
  1079         repo.lfstatus = False
  1079     forget = sorted(s.modified + s.added + s.deleted + s.clean)
  1080     forget = sorted(s.modified + s.added + s.deleted + s.clean)
  1080     forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()]
  1081     forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()]
  1081 
  1082 
  1082     for f in forget:
  1083     for f in forget:
  1083         if lfutil.standin(f) not in repo.dirstate and not \
  1084         fstandin = lfutil.standin(f)
  1084                 repo.wvfs.isdir(lfutil.standin(f)):
  1085         if fstandin not in repo.dirstate and not repo.wvfs.isdir(fstandin):
  1085             ui.warn(_('not removing %s: file is already untracked\n')
  1086             ui.warn(_('not removing %s: file is already untracked\n')
  1086                     % m.rel(f))
  1087                     % m.rel(f))
  1087             bad.append(f)
  1088             bad.append(f)
  1088 
  1089 
  1089     for f in forget:
  1090     for f in forget: