Mercurial > evolve
changeset 6363:f168c0fdbde9 stable
topic: copy parent branch check in commitstatus() from core
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 13 Dec 2022 20:03:23 +0400 |
| parents | 7933292aa102 |
| children | e8d85d51c7b2 |
| files | hgext3rd/topic/topicmap.py |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/topicmap.py Mon Dec 12 17:59:18 2022 +0400 +++ b/hgext3rd/topic/topicmap.py Tue Dec 13 20:03:23 2022 +0400 @@ -110,8 +110,9 @@ return ret parents = ctx.parents() - if (not opts.get(b'amend') and bheads and node not in bheads and not - [x for x in parents if x.node() in bheads and x.branch() == branch]): + if (not opts.get(b'amend') and bheads and node not in bheads and not any( + p.node() in bheads and p.branch() == branch for p in parents + )): repo.ui.status(_(b"(consider using topic for lightweight branches." b" See 'hg help topic')\n"))