mercurial/revset.py
changeset 29139 64c1955a0461
parent 29119 a032ebea4e97
child 29146 b175d9cc3ee8
equal deleted inserted replaced
29138:a29f071751df 29139:64c1955a0461
   384 
   384 
   385 def dagrange(repo, subset, x, y):
   385 def dagrange(repo, subset, x, y):
   386     r = fullreposet(repo)
   386     r = fullreposet(repo)
   387     xs = reachableroots(repo, getset(repo, r, x), getset(repo, r, y),
   387     xs = reachableroots(repo, getset(repo, r, x), getset(repo, r, y),
   388                          includepath=True)
   388                          includepath=True)
   389     # XXX We should combine with subset first: 'subset & baseset(...)'. This is
   389     return subset & xs
   390     # necessary to ensure we preserve the order in subset.
       
   391     return xs & subset
       
   392 
   390 
   393 def andset(repo, subset, x, y):
   391 def andset(repo, subset, x, y):
   394     return getset(repo, getset(repo, subset, x), y)
   392     return getset(repo, getset(repo, subset, x), y)
   395 
   393 
   396 def differenceset(repo, subset, x, y):
   394 def differenceset(repo, subset, x, y):