##// END OF EJS Templates
revert: replace match.bad() monkey patching with match.badmatch()...
Matt Harbison -
r25439:aaede04c default
parent child Browse files
Show More
@@ -2838,8 +2838,7 b' def revert(ui, repo, ctx, parents, *pats'
2838 targetsubs = sorted(s for s in wctx.substate if m(s))
2838 targetsubs = sorted(s for s in wctx.substate if m(s))
2839
2839
2840 if not m.always():
2840 if not m.always():
2841 m.bad = lambda x, y: False
2841 for abs in repo.walk(matchmod.badmatch(m, lambda x, y: False)):
2842 for abs in repo.walk(m):
2843 names[abs] = m.rel(abs), m.exact(abs)
2842 names[abs] = m.rel(abs), m.exact(abs)
2844
2843
2845 # walk target manifest to fill `names`
2844 # walk target manifest to fill `names`
@@ -2855,8 +2854,7 b' def revert(ui, repo, ctx, parents, *pats'
2855 return
2854 return
2856 ui.warn("%s: %s\n" % (m.rel(path), msg))
2855 ui.warn("%s: %s\n" % (m.rel(path), msg))
2857
2856
2858 m.bad = badfn
2857 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
2859 for abs in ctx.walk(m):
2860 if abs not in names:
2858 if abs not in names:
2861 names[abs] = m.rel(abs), m.exact(abs)
2859 names[abs] = m.rel(abs), m.exact(abs)
2862
2860
General Comments 0
You need to be logged in to leave comments. Login now