- c = [filter(matchfn, l) for l in (m, a, r)]
- match = scmutil.matchfiles(repo, set(c + c + c + inclsubs))
+ # create 'match' that includes the files to be recommited.
+ # apply matchfn via repo.status to ensure correct case handling.
+ cm, ca, cr, cd = repo.status(patchparent, match=matchfn)[:4]
+ allmatches = set(cm + ca + cr + cd)
+ refreshchanges = [x.intersection(allmatches) for x in (mm, aa, dd)]
+ for x in refreshchanges:
+ match = scmutil.matchfiles(repo, files)
bmlist = repo[top].bookmarks()
n = newcommit(repo, oldphase, message, user, ph.date,
# only write patch after a successful commit
+ c = [list(x) for x in refreshchanges]
chunks = patchmod.diff(repo, patchparent,