Mercurial > public > mercurial-scm > hg-stable
diff mercurial/logcmdutil.py @ 41641:3d094bfaf885
subrepo: adjust subrepo prefix before calling subrepo.diff() (API)
Differential Revision: https://phab.mercurial-scm.org/D5886
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 07 Feb 2019 09:52:36 -0800 |
| parents | 74f53d3bd685 |
| children | d4c9eebdd72d |
line wrap: on
line diff
--- a/mercurial/logcmdutil.py Thu Feb 07 10:01:55 2019 -0800 +++ b/mercurial/logcmdutil.py Thu Feb 07 09:52:36 2019 -0800 @@ -123,8 +123,9 @@ # subpath. The best we can do is to ignore it. tempnode2 = None submatch = matchmod.subdirmatcher(subpath, match) + subprefix = repo.wvfs.reljoin(prefix, subpath) sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, - stat=stat, fp=fp, prefix=prefix) + stat=stat, fp=fp, prefix=subprefix) class changesetdiffer(object): """Generate diff of changeset with pre-configured filtering functions"""