equal
deleted
inserted
replaced
61 def commitctx(self, ctx, error=None): |
61 def commitctx(self, ctx, error=None): |
62 if isinstance(ctx, context.workingcommitctx): |
62 if isinstance(ctx, context.workingcommitctx): |
63 current = self.currenttopic |
63 current = self.currenttopic |
64 if current: |
64 if current: |
65 ctx.extra()[constants.extrakey] = current |
65 ctx.extra()[constants.extrakey] = current |
|
66 if (isinstance(ctx, context.memctx) and |
|
67 ctx.extra().get('amend_source') and |
|
68 ctx.topic() and |
|
69 not self.currenttopic): |
|
70 # we are amending and need to remove a topic |
|
71 del ctx.extra()[constants.extrakey] |
66 return orig.commitctx(self, ctx, error=error) |
72 return orig.commitctx(self, ctx, error=error) |
67 |
73 |
68 @property |
74 @property |
69 def topics(self): |
75 def topics(self): |
70 topics = set(['', self.currenttopic]) |
76 topics = set(['', self.currenttopic]) |