merging chg into contrib tree?

Yuya Nishihara yuya at tcha.org
Mon Nov 2 15:35:21 UTC 2015


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, ...)

 2. source layout

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

 3. C coding style

    * replace 4 spaces by tab
    * replace C99 comments by /**/

    (not sure)
    * move variable declarations to top

Thoughts?


More information about the Mercurial-devel mailing list