Mercurial > hg
changeset 24875:5135c2be6959 stable
subrepo: don't pass the outer repo's --rev or --branch to subrepo outgoing()
The previous behavior didn't reflect what would actually be pushed- push will
ignore --rev and --branch in the subrepo and push everything. Therefore,
'push -r {rev}' would not list everything, unless {rev} was also the revision of
the subrepo's tip. Worse, if a hash was passed in, the command would abort
because that hash would either not be in the outer repo or not in the subrepo.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 27 Apr 2015 21:15:25 -0400 |
| parents | 89fe9921511f |
| children | b5513ee85dd8 |
| files | mercurial/subrepo.py tests/test-subrepo.t |
| diffstat | 2 files changed, 24 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/subrepo.py Mon Apr 27 20:25:09 2015 -0400 +++ b/mercurial/subrepo.py Mon Apr 27 21:15:25 2015 -0400 @@ -873,6 +873,10 @@ @annotatesubrepoerror def outgoing(self, ui, dest, opts): + if 'rev' in opts or 'branch' in opts: + opts = copy.copy(opts) + opts.pop('rev', None) + opts.pop('branch', None) return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts) @annotatesubrepoerror
--- a/tests/test-subrepo.t Mon Apr 27 20:25:09 2015 -0400 +++ b/tests/test-subrepo.t Mon Apr 27 21:15:25 2015 -0400 @@ -598,6 +598,26 @@ $ echo foo >> s/ss/a $ hg -R s/ss commit -m 'test dirty store detection' + + $ hg out -S -r `hg log -r tip -T "{node|short}"` + comparing with $TESTTMP/t (glob) + searching for changes + no changes found + comparing with $TESTTMP/t/s + searching for changes + no changes found + comparing with $TESTTMP/t/s/ss + searching for changes + changeset: 1:79ea5566a333 + tag: tip + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: test dirty store detection + + comparing with $TESTTMP/t/t + searching for changes + no changes found + $ hg push pushing to $TESTTMP/t (glob) pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)