equal
deleted
inserted
replaced
15 if topic is not None and branch is not None: |
15 if topic is not None and branch is not None: |
16 raise error.ProgrammingError('both branch and topic specified (not defined yet)') |
16 raise error.ProgrammingError('both branch and topic specified (not defined yet)') |
17 elif topic is not None: |
17 elif topic is not None: |
18 trevs = repo.revs("topic(%s) - obsolete()", topic) |
18 trevs = repo.revs("topic(%s) - obsolete()", topic) |
19 elif branch is not None: |
19 elif branch is not None: |
20 trevs = repo.revs("branch(%s) - obsolete()", branch) |
20 trevs = repo.revs("branch(%s) - public() - obsolete() - topic()", branch) |
21 else: |
21 else: |
22 raise error.ProgrammingError('neither branch and topic specified (not defined yet)') |
22 raise error.ProgrammingError('neither branch and topic specified (not defined yet)') |
23 return _orderrevs(repo, trevs) |
23 return _orderrevs(repo, trevs) |
24 |
24 |
25 def labelsgen(prefix, labelssuffix): |
25 def labelsgen(prefix, labelssuffix): |