Mercurial > evolve
comparison hgext3rd/topic/topicmap.py @ 6369:3271ec128328
branching: merge with stable
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Tue, 17 Jan 2023 17:54:24 +0400 |
| parents | 453861da6922 f168c0fdbde9 |
| children | 5c8196a550b6 |
comparison
equal
deleted
inserted
replaced
| 6368:7434edba87a0 | 6369:3271ec128328 |
|---|---|
| 108 opts = {} | 108 opts = {} |
| 109 if ctx.topic(): | 109 if ctx.topic(): |
| 110 return ret | 110 return ret |
| 111 parents = ctx.parents() | 111 parents = ctx.parents() |
| 112 | 112 |
| 113 if (not opts.get(b'amend') and bheads and node not in bheads and not | 113 if (not opts.get(b'amend') and bheads and node not in bheads and not any( |
| 114 [x for x in parents if x.node() in bheads and x.branch() == branch]): | 114 p.node() in bheads and p.branch() == branch for p in parents |
| 115 )): | |
| 115 repo.ui.status(_(b"(consider using topic for lightweight branches." | 116 repo.ui.status(_(b"(consider using topic for lightweight branches." |
| 116 b" See 'hg help topic')\n")) | 117 b" See 'hg help topic')\n")) |
| 117 | 118 |
| 118 return ret | 119 return ret |
| 119 | 120 |