Mercurial > evolve
changeset 4842:ee0866a279da stable
topic: fix some API to make it more robust
The new code can deal with changes in upstream mercurial.
| author | Valentin Gatien-Baron <vgatien-baron@janestreet.com> |
|---|---|
| date | Fri, 13 Sep 2019 16:04:32 +0200 |
| parents | 95d2b5440731 |
| children | d6e2820dac1f |
| files | hgext3rd/topic/__init__.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py Tue Sep 10 15:43:20 2019 +0700 +++ b/hgext3rd/topic/__init__.py Fri Sep 13 16:04:32 2019 +0200 @@ -393,11 +393,11 @@ finally: self.ui.restoreconfig(backup) - def commitctx(self, ctx, error=None): + def commitctx(self, ctx, *args, **kwargs): topicfilter = topicmap.topicfilter(self.filtername) if topicfilter != self.filtername: other = self.filtered(topicmap.topicfilter(self.filtername)) - other.commitctx(ctx, error=error) + other.commitctx(ctx, *args, **kwargs) if isinstance(ctx, context.workingcommitctx): current = self.currenttopic @@ -409,7 +409,7 @@ and not self.currenttopic): # we are amending and need to remove a topic del ctx.extra()[constants.extrakey] - return super(topicrepo, self).commitctx(ctx, error=error) + return super(topicrepo, self).commitctx(ctx, *args, **kwargs) @property def topics(self):