[PATCH 2 of 2] mq: update subrepos when applying / unapplying patches that change .hgsubstate

[Martin Geisler]

Angel Ezquerra <angel.ezquerra at gmail.com> writes:

> # HG changeset patch
> # User Angel Ezquerra <angel.ezquerra at gmail.com>
> # Date 1376350710 -7200
> #      Tue Aug 13 01:38:30 2013 +0200
> # Node ID 8921ebf2a815106702b0cb4da07177bfe61133ed
> # Parent  8d70ca4d1804ca496ecf5f19fc7987b54f2de1ba
> mq: update subrepos when applying / unapplying patches that change .hgsubstate
>
> Up until now applying or unapplying a patch that modified .hgsubstate
> would not work as expected because it would not update the subrepos
> according to the .hgsubstate change. This made it very easy to lose
> subrepo changes when using mq.
>
> This revision also changes the test-mq-subrepo test so that on the
> qpop / qpush tests. We no longer use the debugsub command to check the
> state of the subrepos after the qpop and qpush operations. Instead we
> directly run the id command on the subrepos that we want to check. The
> reason is that using the debugsub command is misleading because it
> does not really check the state of the subrepos on the working
> directory (it just returns what the change that is specified on a
> given revision). Because of this the tests did not detect the problem
> that this revision fixes (i.e. that applying a patch did not update
> the subrepos to the corresponding revisions).
>
> diff --git a/hgext/mq.py b/hgext/mq.py
> --- a/hgext/mq.py
> +++ b/hgext/mq.py
> @@ -800,6 +800,13 @@
>                  p1, p2 = repo.dirstate.parents()
>                  repo.setparents(p1, merge)
>  
> +            if all_files and '.hgsubstate' in all_files:
> +                for line in open(repo.wjoin('.hgsubstate'), 'r').readlines():
> +                    rev, s = line.split()
> +                    files.append(s)
> +                    state = (s, rev, 'any')
> +                    repo[None].sub(s).get(state, overwrite=True)

This functionality must be present somewhere else -- since the normal
update code also parses and updates subrepos as needed. I found it in
the subrepo.state function.

Maybe you could even use the entire submerge command? That should
automatically handle things like changed subrepo sources too.


-- 
Martin Geisler
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20130817/79d98646/attachment.pgp>