equal
deleted
inserted
replaced
71 relroot += '/' |
71 relroot += '/' |
72 for matchroot in match.files(): |
72 for matchroot in match.files(): |
73 if not matchroot.startswith(relroot): |
73 if not matchroot.startswith(relroot): |
74 ui.warn(_('warning: %s not inside relative root %s\n') % ( |
74 ui.warn(_('warning: %s not inside relative root %s\n') % ( |
75 match.uipath(matchroot), uirelroot)) |
75 match.uipath(matchroot), uirelroot)) |
|
76 |
|
77 relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path') |
|
78 match = matchmod.intersectmatchers(match, relrootmatch) |
76 |
79 |
77 if stat: |
80 if stat: |
78 diffopts = diffopts.copy(context=0, noprefix=False) |
81 diffopts = diffopts.copy(context=0, noprefix=False) |
79 width = 80 |
82 width = 80 |
80 if not ui.plain(): |
83 if not ui.plain(): |