diff mercurial/subrepo.py @ 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 a99931201d1b
children b5513ee85dd8
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