Re: [PATCH] filemerge: move decorator definition for internal merge tools to registrar
At Tue, 8 Aug 2017 00:12:51 +0900, Yuya Nishihara wrote: > > On Mon, 07 Aug 2017 00:20:36 +0900, FUJIWARA Katsunori wrote: > > At Sun, 6 Aug 2017 22:16:04 +0900, > > Yuya Nishihara wrote: > > > On Sun, 06 Aug 2017 03:51:49 +0900, FUJIWARA Katsunori wrote: > > > > # HG changeset patch > > > > # User FUJIWARA Katsunori> > > > # Date 1501949637 -32400 > > > > # Sun Aug 06 01:13:57 2017 +0900 > > > > # Node ID 2430ac5b30e11c6cdc7309b3c2741cd3878b4b36 > > > > # Parent 93422d0068f8979b33a02e5003fd4b6c23413361 > > > > # Available At https://bitbucket.org/foozy/mercurial-wip > > > > # hg pull https://bitbucket.org/foozy/mercurial-wip -r > > > > 2430ac5b30e1 > > > > # EXP-Topic filemerge-refactor > > > > filemerge: move decorator definition for internal merge tools to > > > > registrar > > > > > > Queued, thanks. Do you have any example extension that will register an > > > inprocess merge tool? > > > > Once I wrote an inprocess merge tool "mergebypatch". This already uses > > filemerge.internaltool decorator directly, but can become an example > > client of new registrar decorator, too. > > > > https://bitbucket.org/foozy/hgext-mergebypatch > > Thanks for the info. It'll be nice if we have at least one example in core > hgext or tests. I'll post follow up for that. -- -- [FUJIWARA Katsunori] fo...@lares.dti.ne.jp ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH] filemerge: move decorator definition for internal merge tools to registrar
On Mon, 07 Aug 2017 00:20:36 +0900, FUJIWARA Katsunori wrote: > At Sun, 6 Aug 2017 22:16:04 +0900, > Yuya Nishihara wrote: > > On Sun, 06 Aug 2017 03:51:49 +0900, FUJIWARA Katsunori wrote: > > > # HG changeset patch > > > # User FUJIWARA Katsunori> > > # Date 1501949637 -32400 > > > # Sun Aug 06 01:13:57 2017 +0900 > > > # Node ID 2430ac5b30e11c6cdc7309b3c2741cd3878b4b36 > > > # Parent 93422d0068f8979b33a02e5003fd4b6c23413361 > > > # Available At https://bitbucket.org/foozy/mercurial-wip > > > # hg pull https://bitbucket.org/foozy/mercurial-wip -r > > > 2430ac5b30e1 > > > # EXP-Topic filemerge-refactor > > > filemerge: move decorator definition for internal merge tools to registrar > > > > Queued, thanks. Do you have any example extension that will register an > > inprocess merge tool? > > Once I wrote an inprocess merge tool "mergebypatch". This already uses > filemerge.internaltool decorator directly, but can become an example > client of new registrar decorator, too. > > https://bitbucket.org/foozy/hgext-mergebypatch Thanks for the info. It'll be nice if we have at least one example in core hgext or tests. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH] filemerge: move decorator definition for internal merge tools to registrar
At Sun, 6 Aug 2017 22:16:04 +0900, Yuya Nishihara wrote: > > On Sun, 06 Aug 2017 03:51:49 +0900, FUJIWARA Katsunori wrote: > > # HG changeset patch > > # User FUJIWARA Katsunori> > # Date 1501949637 -32400 > > # Sun Aug 06 01:13:57 2017 +0900 > > # Node ID 2430ac5b30e11c6cdc7309b3c2741cd3878b4b36 > > # Parent 93422d0068f8979b33a02e5003fd4b6c23413361 > > # Available At https://bitbucket.org/foozy/mercurial-wip > > # hg pull https://bitbucket.org/foozy/mercurial-wip -r > > 2430ac5b30e1 > > # EXP-Topic filemerge-refactor > > filemerge: move decorator definition for internal merge tools to registrar > > Queued, thanks. Do you have any example extension that will register an > inprocess merge tool? > Once I wrote an inprocess merge tool "mergebypatch". This already uses filemerge.internaltool decorator directly, but can become an example client of new registrar decorator, too. https://bitbucket.org/foozy/hgext-mergebypatch -- -- [FUJIWARA Katsunori] fo...@lares.dti.ne.jp ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH] filemerge: move decorator definition for internal merge tools to registrar
On Sun, 06 Aug 2017 03:51:49 +0900, FUJIWARA Katsunori wrote: > # HG changeset patch > # User FUJIWARA Katsunori> # Date 1501949637 -32400 > # Sun Aug 06 01:13:57 2017 +0900 > # Node ID 2430ac5b30e11c6cdc7309b3c2741cd3878b4b36 > # Parent 93422d0068f8979b33a02e5003fd4b6c23413361 > # Available At https://bitbucket.org/foozy/mercurial-wip > # hg pull https://bitbucket.org/foozy/mercurial-wip -r > 2430ac5b30e1 > # EXP-Topic filemerge-refactor > filemerge: move decorator definition for internal merge tools to registrar Queued, thanks. Do you have any example extension that will register an inprocess merge tool? ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel