equal
deleted
inserted
replaced
1432 return baseset() |
1432 return baseset() |
1433 |
1433 |
1434 ps = set() |
1434 ps = set() |
1435 cl = repo.changelog |
1435 cl = repo.changelog |
1436 for r in getset(repo, fullreposet(repo), x): |
1436 for r in getset(repo, fullreposet(repo), x): |
1437 ps.add(cl.parentrevs(r)[1]) |
1437 try: |
|
1438 ps.add(cl.parentrevs(r)[1]) |
|
1439 except error.WdirUnsupported: |
|
1440 parents = repo[r].parents() |
|
1441 if len(parents) == 2: |
|
1442 ps.add(parents[1]) |
1438 ps -= {node.nullrev} |
1443 ps -= {node.nullrev} |
1439 # XXX we should turn this into a baseset instead of a set, smartset may do |
1444 # XXX we should turn this into a baseset instead of a set, smartset may do |
1440 # some optimizations from the fact this is a baseset. |
1445 # some optimizations from the fact this is a baseset. |
1441 return subset & ps |
1446 return subset & ps |
1442 |
1447 |