equal
deleted
inserted
replaced
30 diffhelper, |
30 diffhelper, |
31 diffutil, |
31 diffutil, |
32 encoding, |
32 encoding, |
33 error, |
33 error, |
34 mail, |
34 mail, |
35 match as matchmod, |
|
36 mdiff, |
35 mdiff, |
37 pathutil, |
36 pathutil, |
38 pycompat, |
37 pycompat, |
39 scmutil, |
38 scmutil, |
40 similar, |
39 similar, |
2318 order.append(f) |
2317 order.append(f) |
2319 return fctx |
2318 return fctx |
2320 return getfilectx |
2319 return getfilectx |
2321 getfilectx = lrugetfilectx() |
2320 getfilectx = lrugetfilectx() |
2322 |
2321 |
2323 if relroot: |
|
2324 relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path') |
|
2325 match = matchmod.intersectmatchers(match, relrootmatch) |
|
2326 |
|
2327 if not changes: |
2322 if not changes: |
2328 changes = ctx1.status(ctx2, match=match) |
2323 changes = ctx1.status(ctx2, match=match) |
2329 modified, added, removed = changes[:3] |
2324 modified, added, removed = changes[:3] |
2330 |
2325 |
2331 if not modified and not added and not removed: |
2326 if not modified and not added and not removed: |