equal
deleted
inserted
replaced
2125 hexfunc = short |
2125 hexfunc = short |
2126 revs = [hexfunc(node) for node in [ctx1.node(), ctx2.node()] if node] |
2126 revs = [hexfunc(node) for node in [ctx1.node(), ctx2.node()] if node] |
2127 |
2127 |
2128 copy = {} |
2128 copy = {} |
2129 if opts.git or opts.upgrade: |
2129 if opts.git or opts.upgrade: |
2130 copy = copies.pathcopies(ctx1, ctx2) |
2130 copy = copies.pathcopies(ctx1, ctx2, match=match) |
2131 |
2131 |
2132 if relroot is not None: |
2132 if relroot is not None: |
2133 if not relfiltered: |
2133 if not relfiltered: |
2134 # XXX this would ideally be done in the matcher, but that is |
2134 # XXX this would ideally be done in the matcher, but that is |
2135 # generally meant to 'or' patterns, not 'and' them. In this case we |
2135 # generally meant to 'or' patterns, not 'and' them. In this case we |