equal
deleted
inserted
replaced
237 if topic is not None and branch is not None: |
237 if topic is not None and branch is not None: |
238 msg = 'both branch and topic specified [%s]{%s}(not defined yet)' |
238 msg = 'both branch and topic specified [%s]{%s}(not defined yet)' |
239 msg %= (branch, topic) |
239 msg %= (branch, topic) |
240 raise error.ProgrammingError(msg) |
240 raise error.ProgrammingError(msg) |
241 elif topic is not None: |
241 elif topic is not None: |
242 prefix = 't' |
242 prefix = 's' |
243 if topic not in repo.topics: |
243 if topic not in repo.topics: |
244 raise error.Abort(_('cannot resolve "%s": no such topic found') % topic) |
244 raise error.Abort(_('cannot resolve "%s": no such topic found') % topic) |
245 elif branch is not None: |
245 elif branch is not None: |
246 prefix = 'b' |
246 prefix = 's' |
247 else: |
247 else: |
248 raise error.ProgrammingError('neither branch and topic specified (not defined yet)') |
248 raise error.ProgrammingError('neither branch and topic specified (not defined yet)') |
249 |
249 |
250 fm = ui.formatter('topicstack', opts) |
250 fm = ui.formatter('topicstack', opts) |
251 prev = None |
251 prev = None |