equal
deleted
inserted
replaced
357 tostrip = set(repo.revs(revset, revs, revs, phases.internal, revs)) |
357 tostrip = set(repo.revs(revset, revs, revs, phases.internal, revs)) |
358 notstrip = revs - tostrip |
358 notstrip = revs - tostrip |
359 if notstrip: |
359 if notstrip: |
360 nodestr = b', '.join(sorted(short(repo[n].node()) for n in notstrip)) |
360 nodestr = b', '.join(sorted(short(repo[n].node()) for n in notstrip)) |
361 ui.warn( |
361 ui.warn( |
362 _(b'warning: orphaned descendants detected, ' b'not stripping %s\n') |
362 _(b'warning: orphaned descendants detected, not stripping %s\n') |
363 % nodestr |
363 % nodestr |
364 ) |
364 ) |
365 return [c.node() for c in repo.set(b'roots(%ld)', tostrip)] |
365 return [c.node() for c in repo.set(b'roots(%ld)', tostrip)] |
366 |
366 |
367 |
367 |