equal
deleted
inserted
replaced
109 opts = {} |
109 opts = {} |
110 if ctx.topic(): |
110 if ctx.topic(): |
111 return ret |
111 return ret |
112 parents = ctx.parents() |
112 parents = ctx.parents() |
113 |
113 |
114 if (not opts.get('amend') and bheads and node not in bheads and not |
114 if (not opts.get(b'amend') and bheads and node not in bheads and not |
115 [x for x in parents if x.node() in bheads and x.branch() == branch]): |
115 [x for x in parents if x.node() in bheads and x.branch() == branch]): |
116 repo.ui.status(_("(consider using topic for lightweight branches." |
116 repo.ui.status(_("(consider using topic for lightweight branches." |
117 " See 'hg help topic')\n")) |
117 " See 'hg help topic')\n")) |
118 |
118 |
119 return ret |
119 return ret |