[PATCH] push: propagate --new-branch and --ssh options when pushing subrepos

Angel Ezquerra angel.ezquerra at gmail.com
Mon Dec 19 17:09:07 CST 2011


On Tue, Dec 20, 2011 at 12:04 AM, Angel Ezquerra
<angel.ezquerra at gmail.com> wrote:
> # HG changeset patch
> # User Angel Ezquerra <angel.ezquerra at gmail.com>
> # Date 1317309604 -7200
> # Node ID d0193b92f0cb10f6b81b79b9c27012af72946177
> # Parent  21eb048edc19a9b78ae262d222c0de1f3ad6c4d2
> push: propagate --new-branch and --ssh options when pushing subrepos
>
> Up until now the all the push command options were ignored when pushing
> subrepos. In particular, the fact that the --new-branch command was not passed
> down to subrepos made it not possible to push a repo when any of its
> subrepos had a new branch, even if you used the --new-branch option of the push
> command.
>
> In addition the error message was confusing since it showed the following hint:
> "--new-branch hint: use 'hg push --new-branch' to create new remote branches".
> However using the --new_branch flag did not fix the problem, as it was ignored
> when pushing subrepos.
>
> This patch passes the --new-branch and --ssh flags to every subrepo that is
> pushed.
>
> Issues/Limitations:
>
> - All subrepo types get these flags, but only the mercurial subrepos use them.
> - It is no longer possible to _not_ pass down these flags to subrepos when
> pushing:
>   * An alternative would be to introduce a --subrepos flag that should be
> used to pass down these flags to the subrepos.
>   * If we did this, it could make sense to make the --force flag respect this
>   new --subrepos flag as well for consistency's sake.
> - Matt suggested that the ssh related flags could also be passed down to
> subrepos during pull and clone. However it seems that it would be the "update"
> command that would need to get those, since subrepos are only pulled on update.
> In any case I'd prefer to leave that for a later patch.
>
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -4362,7 +4362,7 @@
>         c = repo['']
>         subs = c.substate # only repos that are committed
>         for s in sorted(subs):
> -            if not c.sub(s).push(opts.get('force')):
> +            if not c.sub(s).push(opts):
>                 return False
>     finally:
>         del repo._subtoppath
> diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
> --- a/mercurial/subrepo.py
> +++ b/mercurial/subrepo.py
> @@ -303,7 +303,7 @@
>         """merge currently-saved state with the new state."""
>         raise NotImplementedError
>
> -    def push(self, force):
> +    def push(self, opts):
>         """perform whatever action is analogous to 'hg push'
>
>         This may be a no-op on some systems.
> @@ -519,19 +519,23 @@
>         else:
>             mergefunc()
>
> -    def push(self, force):
> +    def push(self, opts):
> +        force = opts.get('force')
> +        newbranch = opts.get('new_branch')
> +        ssh = opts.get('ssh')
> +
>         # push subrepos depth-first for coherent ordering
>         c = self._repo['']
>         subs = c.substate # only repos that are committed
>         for s in sorted(subs):
> -            if not c.sub(s).push(force):
> +            if not c.sub(s).push(opts):
>                 return False
>
>         dsturl = _abssource(self._repo, True)
>         self._repo.ui.status(_('pushing subrepo %s to %s\n') %
>             (subrelpath(self), dsturl))
> -        other = hg.peer(self._repo.ui, {}, dsturl)
> -        return self._repo.push(other, force)
> +        other = hg.peer(self._repo.ui, {'ssh': ssh}, dsturl)
> +        return self._repo.push(other, force, newbranch=newbranch)
>
>     def outgoing(self, ui, dest, opts):
>         return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts)
> @@ -731,7 +735,7 @@
>             if _updateprompt(self._ui, self, dirty, self._wcrev(), new):
>                 self.get(state, False)
>
> -    def push(self, force):
> +    def push(self, opts):
>         # push is a no-op for SVN
>         return True
>
> @@ -1025,7 +1029,9 @@
>         else:
>             mergefunc()
>
> -    def push(self, force):
> +    def push(self, opts):
> +        force = opts.get('force')
> +
>         if not self._state[1]:
>             return True
>         if self._gitmissing():
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

This is a new version of a patch that I sent before the November
release. It takes into account some comments by Matt that suggested
passing down the push options as a dictionary to the subrepo push
method and filtering it in there.

Matt also suggested that the ssh options should be propagated to
subrepos during clone and pull. However it seems that that is used
during update, which is when the subrepos are pulled. However, the
update command currently has no ssh related flags and I am not sure
that it makes sense to add them in this same patch.

Cheers,

Angel


More information about the Mercurial-devel mailing list