comparison mercurial/patch.py @ 4195:b5d1eaade333

Merge a bunch of matcher and locate fixes.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 10 Mar 2007 23:21:33 -0300
parents ef7c39ae5d4c da0588996ecc
children 7e95381a9f1e
comparison
equal deleted inserted replaced
4177:ba51a8225a60 4195:b5d1eaade333
462 date1 = util.datestr(ctx1.date()) 462 date1 = util.datestr(ctx1.date())
463 463
464 if not changes: 464 if not changes:
465 changes = repo.status(node1, node2, files, match=match)[:5] 465 changes = repo.status(node1, node2, files, match=match)[:5]
466 modified, added, removed, deleted, unknown = changes 466 modified, added, removed, deleted, unknown = changes
467 if files:
468 def filterfiles(filters):
469 l = [x for x in filters if x in files]
470
471 for t in files:
472 if not t.endswith("/"):
473 t += "/"
474 l += [x for x in filters if x.startswith(t)]
475 return l
476
477 modified, added, removed = map(filterfiles, (modified, added, removed))
478 467
479 if not modified and not added and not removed: 468 if not modified and not added and not removed:
480 return 469 return
481 470
482 if node2: 471 if node2: