mercurial/templater.py
changeset 48913 f254fc73d956
parent 48875 6000f5b25c9b
child 48946 642e31cb55f0
equal deleted inserted replaced
48912:a0674e916fb6 48913:f254fc73d956
   528     (['opts'], ['opts', 'k'])
   528     (['opts'], ['opts', 'k'])
   529     """
   529     """
   530 
   530 
   531     def compiledict(xs):
   531     def compiledict(xs):
   532         return util.sortdict(
   532         return util.sortdict(
   533             (k, compileexp(x, context, curmethods))
   533             (k, compileexp(x, context, curmethods)) for k, x in xs.items()
   534             for k, x in pycompat.iteritems(xs)
       
   535         )
   534         )
   536 
   535 
   537     def compilelist(xs):
   536     def compilelist(xs):
   538         return [compileexp(x, context, curmethods) for x in xs]
   537         return [compileexp(x, context, curmethods) for x in xs]
   539 
   538 
   706         # new resources, so the defaults will be re-evaluated (issue5612)
   705         # new resources, so the defaults will be re-evaluated (issue5612)
   707         knownres = self._resources.knownkeys()
   706         knownres = self._resources.knownkeys()
   708         newres = self._resources.availablekeys(newmapping)
   707         newres = self._resources.availablekeys(newmapping)
   709         mapping = {
   708         mapping = {
   710             k: v
   709             k: v
   711             for k, v in pycompat.iteritems(origmapping)
   710             for k, v in origmapping.items()
   712             if (
   711             if (
   713                 k in knownres  # not a symbol per self.symbol()
   712                 k in knownres  # not a symbol per self.symbol()
   714                 or newres.isdisjoint(self._defaultrequires(k))
   713                 or newres.isdisjoint(self._defaultrequires(k))
   715             )
   714             )
   716         }
   715         }