equal
deleted
inserted
replaced
32 self.topic = topic |
32 self.topic = topic |
33 self.behinderror = None |
33 self.behinderror = None |
34 if topic is not None and branch is not None: |
34 if topic is not None and branch is not None: |
35 raise error.ProgrammingError('both branch and topic specified (not defined yet)') |
35 raise error.ProgrammingError('both branch and topic specified (not defined yet)') |
36 elif topic is not None: |
36 elif topic is not None: |
37 trevs = repo.revs("topic(%s) - obsolete()", topic) |
37 trevs = repo.revs("not obsolete() and topic(%s) - obsolete()", topic) |
38 elif branch is not None: |
38 elif branch is not None: |
39 trevs = repo.revs("branch(%s) - public() - obsolete() - topic()", branch) |
39 trevs = repo.revs("not public() and branch(%s) - obsolete() - topic()", branch) |
40 else: |
40 else: |
41 raise error.ProgrammingError('neither branch and topic specified (not defined yet)') |
41 raise error.ProgrammingError('neither branch and topic specified (not defined yet)') |
42 self._revs = trevs |
42 self._revs = trevs |
43 |
43 |
44 def __iter__(self): |
44 def __iter__(self): |