[PATCH] convert: Make P4 conversion cope with keywords, binary files and symbolic links

Patrick Mézard pmezard at gmail.com
Thu Jun 18 15:22:04 CDT 2009


Frank Kingswood a écrit :
>  hgext/convert/p4.py                 |   46 ++-
>  tests/test-convert-p4-filetypes     |  102 ++++++
>  tests/test-convert-p4-filetypes.out |  642 ++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 780 insertions(+), 10 deletions(-)
> 
> 
> # HG changeset patch
> # User Frank Kingswood <frank at kingswood-consulting.co.uk>
> # Date 1245317944 -3600
> # Node ID a63bada786db1c66f0ec089371a2ff4655c3dce6
> # Parent  2aff285b902f2f970d275255fde758a343ae0074
> convert: Make P4 conversion cope with keywords, binary files and symbolic links.
> 
> Convert now handles errors from p4 during conversion more gracefully.
> If keyword expansion is enabled in a P4 file then keywords will be
> unexpanded in hg.
> Added testcase for p4 filetypes and keyword (un)expansion.
> This testcase ignores UTF and Apple files to avoid binary data.

In crew as ce4b92f5cea7, with minor changes to fix collation issues and a remaining echo -n.

Thanks!

--
Patrick Mézard


More information about the Mercurial-devel mailing list