equal
deleted
inserted
replaced
98 |
98 |
99 def commitstatus(orig, repo, node, branch, bheads=None, opts=None): |
99 def commitstatus(orig, repo, node, branch, bheads=None, opts=None): |
100 # wrap commit status use the topic branch heads |
100 # wrap commit status use the topic branch heads |
101 ctx = repo[node] |
101 ctx = repo[node] |
102 if ctx.topic() and ctx.branch() == branch: |
102 if ctx.topic() and ctx.branch() == branch: |
103 subbranch = "%s:%s" % (branch, ctx.topic()) |
103 bheads = repo.branchheads("%s:%s" % (branch, ctx.topic())) |
104 bheads = repo.branchheads("%s:%s" % (subbranch, ctx.topic())) |
|
105 |
104 |
106 ret = orig(repo, node, branch, bheads=bheads, opts=opts) |
105 ret = orig(repo, node, branch, bheads=bheads, opts=opts) |
107 |
106 |
108 # logic copy-pasted from cmdutil.commitstatus() |
107 # logic copy-pasted from cmdutil.commitstatus() |
109 if opts is None: |
108 if opts is None: |