Mercurial > public > mercurial-scm > hg
diff mercurial/subrepo.py @ 25600:70ac1868b707
subrepo: allow a representation of the working directory subrepo
Some code cannot handle a subrepo based on the working directory (e.g.
sub.dirty()), so the caller must opt in. This will be useful for archive, and
perhaps some other commands. The git and svn methods where this is used may
need to be fixed up on a case by case basis.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 16 Jun 2015 23:03:36 -0400 |
| parents | f1d46075b13a |
| children | 3ec8351fa6ed |
line wrap: on
line diff
--- a/mercurial/subrepo.py Tue Jun 16 22:13:19 2015 +0900 +++ b/mercurial/subrepo.py Tue Jun 16 23:03:36 2015 -0400 @@ -324,7 +324,7 @@ "in '%s'\n") % vfs.join(dirname)) vfs.unlink(vfs.reljoin(dirname, f)) -def subrepo(ctx, path): +def subrepo(ctx, path, allowwdir=False): """return instance of the right subrepo class for subrepo in path""" # subrepo inherently violates our import layering rules # because it wants to make repo objects from deep inside the stack @@ -338,6 +338,8 @@ state = ctx.substate[path] if state[2] not in types: raise util.Abort(_('unknown subrepo type %s') % state[2]) + if allowwdir: + state = (state[0], ctx.subrev(path), state[2]) return types[state[2]](ctx, path, state[:2]) def nullsubrepo(ctx, path, pctx):