comparison mercurial/revset.py @ 23726:d944492445fa

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Jan 2015 15:46:14 -0600
parents 6a81f88758aa aafeaba22826
children 07a6faf939dc
comparison
equal deleted inserted replaced
23725:6a81f88758aa 23726:d944492445fa
252 252
253 def stringset(repo, subset, x): 253 def stringset(repo, subset, x):
254 x = repo[x].rev() 254 x = repo[x].rev()
255 if x == -1 and len(subset) == len(repo): 255 if x == -1 and len(subset) == len(repo):
256 return baseset([-1]) 256 return baseset([-1])
257 if len(subset) == len(repo) or x in subset: 257 if x in subset:
258 return baseset([x]) 258 return baseset([x])
259 return baseset() 259 return baseset()
260 260
261 def symbolset(repo, subset, x): 261 def symbolset(repo, subset, x):
262 if x in symbols: 262 if x in symbols: