Mercurial > public > mercurial-scm > hg-stable
diff mercurial/archival.py @ 25601:3ec8351fa6ed
archive: support 'wdir()'
This is a step toward replacing the extdiff internals with archive, in order to
support 'extdiff -S'. Only Mercurial subrepos are supported for now.
If a file is missing from the filesystem, it is silently skipped. Perhaps it
should warn, but it cannot abort when working with extdiff because deleting a
file is a legitimate diff.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 16 Jun 2015 23:06:57 -0400 |
| parents | 3f0744eeaeaf |
| children | dc707fb35550 |
line wrap: on
line diff
--- a/mercurial/archival.py Tue Jun 16 23:03:36 2015 -0400 +++ b/mercurial/archival.py Tue Jun 16 23:06:57 2015 -0400 @@ -315,7 +315,7 @@ if subrepos: for subpath in sorted(ctx.substate): - sub = ctx.sub(subpath) + sub = ctx.workingsub(subpath) submatch = matchmod.narrowmatcher(subpath, matchfn) total += sub.archive(archiver, prefix, submatch)