equal
deleted
inserted
replaced
720 if wctx.sub(s).dirty(): |
720 if wctx.sub(s).dirty(): |
721 m1['.hgsubstate'] += '+' |
721 m1['.hgsubstate'] += '+' |
722 break |
722 break |
723 |
723 |
724 # Compare manifests |
724 # Compare manifests |
|
725 if matcher is not None: |
|
726 m1 = m1.matches(matcher) |
|
727 m2 = m2.matches(matcher) |
725 diff = m1.diff(m2) |
728 diff = m1.diff(m2) |
726 |
729 |
727 actions = {} |
730 actions = {} |
728 for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): |
731 for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): |
729 if matcher and not matcher(f): |
|
730 continue |
|
731 if n1 and n2: # file exists on both local and remote side |
732 if n1 and n2: # file exists on both local and remote side |
732 if f not in ma: |
733 if f not in ma: |
733 fa = copy.get(f, None) |
734 fa = copy.get(f, None) |
734 if fa is not None: |
735 if fa is not None: |
735 actions[f] = ('m', (f, f, fa, False, pa.node()), |
736 actions[f] = ('m', (f, f, fa, False, pa.node()), |