Re: [PATCH] filemerge: support specfiying a python function to custom merge-tools

2018-05-18 Thread Yuya Nishihara
On Thu, 17 May 2018 12:34:26 -0600, Tom Hindle wrote: > On 05/17/2018 07:14 AM, Yuya Nishihara wrote: > > On Wed, 16 May 2018 14:22:13 -0600, tom_hin...@sil.org wrote: > >> # HG changeset patch > >> # User hindlemail > > Can you suggest a proper "user" name? > > test-check-commit.t complains that "

Re: [PATCH] filemerge: support specfiying a python function to custom merge-tools

2018-05-17 Thread Tom Hindle
On 05/17/2018 07:14 AM, Yuya Nishihara wrote: On Wed, 16 May 2018 14:22:13 -0600, tom_hin...@sil.org wrote: # HG changeset patch # User hindlemail Can you suggest a proper "user" name? test-check-commit.t complains that "username is not an email address." oops sorry. My Username should have b

Re: [PATCH] filemerge: support specfiying a python function to custom merge-tools

2018-05-17 Thread Yuya Nishihara
On Wed, 16 May 2018 14:22:13 -0600, tom_hin...@sil.org wrote: > # HG changeset patch > # User hindlemail Can you suggest a proper "user" name? test-check-commit.t complains that "username is not an email address." > # Date 1526501501 21600 > # Wed May 16 14:11:41 2018 -0600 > # Node ID 7e7e8

Re: [PATCH] filemerge: support specfiying a python function to custom merge-tools

2018-05-11 Thread Yuya Nishihara
On Fri, 11 May 2018 12:05:50 -0600, Tom Hindle wrote: > > I think it's better to pass parameters by variables (e.g. base=basepath), > > instead of a packed argslist. In which case, we'll probably add a separate > > function (e.g. _pymerge().) > Sorry I don't understand this. I meant the user merge

Re: [PATCH] filemerge: support specfiying a python function to custom merge-tools

2018-05-11 Thread Tom Hindle
Hi Yuya, Thanks for the review! replying inline... On 05/10/2018 07:53 AM, Yuya Nishihara wrote: On Wed, 09 May 2018 12:33:49 -0600, tom_hin...@sil.org wrote: # HG changeset patch # User hindlemail # Date 1525890682 21600 # Wed May 09 12:31:22 2018 -0600 # Node ID ac1af9a3417eddaee93635

Re: [PATCH] filemerge: support specfiying a python function to custom merge-tools

2018-05-10 Thread Yuya Nishihara
On Wed, 09 May 2018 12:33:49 -0600, tom_hin...@sil.org wrote: > # HG changeset patch > # User hindlemail > # Date 1525890682 21600 > # Wed May 09 12:31:22 2018 -0600 > # Node ID ac1af9a3417eddaee93635682d3ebcdb8a929a8a > # Parent 8b86acc7aa64130f5b6fa69f5fc20ef4d0b09c42 > filemerge: support