equal
deleted
inserted
replaced
384 elif state == 'a': |
384 elif state == 'a': |
385 lfdirstate.add(lfile) |
385 lfdirstate.add(lfile) |
386 elif state == '?': |
386 elif state == '?': |
387 lfdirstate.drop(lfile) |
387 lfdirstate.drop(lfile) |
388 |
388 |
|
389 def markcommitted(orig, ctx, node): |
|
390 repo = ctx._repo |
|
391 |
|
392 orig(node) |
|
393 |
|
394 lfdirstate = openlfdirstate(repo.ui, repo) |
|
395 for f in ctx.files(): |
|
396 if isstandin(f): |
|
397 lfile = splitstandin(f) |
|
398 synclfdirstate(repo, lfdirstate, lfile, False) |
|
399 lfdirstate.write() |
|
400 |
389 def getlfilestoupdate(oldstandins, newstandins): |
401 def getlfilestoupdate(oldstandins, newstandins): |
390 changedstandins = set(oldstandins).symmetric_difference(set(newstandins)) |
402 changedstandins = set(oldstandins).symmetric_difference(set(newstandins)) |
391 filelist = [] |
403 filelist = [] |
392 for f in changedstandins: |
404 for f in changedstandins: |
393 if f[0] not in filelist: |
405 if f[0] not in filelist: |