mercurial/subrepo.py
branchstable
changeset 24876 b5513ee85dd8
parent 24875 5135c2be6959
child 24877 cc497780eaf9
equal deleted inserted replaced
24875:5135c2be6959 24876:b5513ee85dd8
   879             opts.pop('branch', None)
   879             opts.pop('branch', None)
   880         return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts)
   880         return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts)
   881 
   881 
   882     @annotatesubrepoerror
   882     @annotatesubrepoerror
   883     def incoming(self, ui, source, opts):
   883     def incoming(self, ui, source, opts):
       
   884         if 'rev' in opts or 'branch' in opts:
       
   885             opts = copy.copy(opts)
       
   886             opts.pop('rev', None)
       
   887             opts.pop('branch', None)
   884         return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts)
   888         return hg.incoming(ui, self._repo, _abssource(self._repo, False), opts)
   885 
   889 
   886     @annotatesubrepoerror
   890     @annotatesubrepoerror
   887     def files(self):
   891     def files(self):
   888         rev = self._state[1]
   892         rev = self._state[1]