merging chg into contrib tree?

[Pierre-Yves David]

On 11/02/2015 10:35 AM, Yuya Nishihara wrote:
> Hello,
>
> We had a little talk about merging chg at the sprint and I think it didn't
> go bad.
>
> So, before starting actual work, I want to decide the following things:
>
>   1. how to merge?
>   2. source layout
>   3. coding style
>
> https://www.mercurial-scm.org/wiki/ChgPortingPlan
>
> My preference is:
>
>   1. how to merge?
>
>      reorganize as 10+ patches (base, pager, setenv, sendfds, ...)

I would be happy to drop a full history of chg converted to dispatch the 
file in the right place. Having full history is always useful when 
digging into bugs.

>   2. source layout
>
>      (frontend)
>      contrib/chg/Makefile
>                  README
>                  chg.c
>                  hgclient.[ch]
>                  util.[ch]
>      (server)
>      hgext/chgserver.py
>      mercurial/osutil.c <- chgutil.c

Why having chgserver.py in hgext? as we know we want chg as a first 
class citizen, could have the server logic in core?

>   3. C coding style
>
>      * replace 4 spaces by tab
>      * replace C99 comments by /**/
>
>      (not sure)
>      * move variable declarations to top

Sounds fine, I know Augie was thinking about tool enforced style but I'm 
unclear what is the status of it.

> Thoughts?

Let's make it happen.

-- 
Pierre-Yves David