comparison setup.py @ 36763:90f8fe72446c

xdiff: remove xemit related logic xemit handles "diff formatting and output" with options like context lines, whether show function names, etc. That is handled more cleanly at a higher level in hg. Removing context line parameters would also make the trimming logic (D2686) cleaner and more confident. See [1]. [1]: https://github.com/git/git/commit/d2f82950a9226ae1102a7a97f03440a4bf8c6c09 Differential Revision: https://phab.mercurial-scm.org/D2705
author Jun Wu <quark@fb.com>
date Tue, 06 Mar 2018 18:41:08 -0800
parents 5f41e3418407
children 3cf40112efb7
comparison
equal deleted inserted replaced
36762:b5bb0f99064d 36763:90f8fe72446c
848 if sys.platform == 'darwin': 848 if sys.platform == 'darwin':
849 osutil_ldflags += ['-framework', 'ApplicationServices'] 849 osutil_ldflags += ['-framework', 'ApplicationServices']
850 850
851 xdiff_srcs = [ 851 xdiff_srcs = [
852 'mercurial/thirdparty/xdiff/xdiffi.c', 852 'mercurial/thirdparty/xdiff/xdiffi.c',
853 'mercurial/thirdparty/xdiff/xemit.c',
854 'mercurial/thirdparty/xdiff/xmerge.c', 853 'mercurial/thirdparty/xdiff/xmerge.c',
855 'mercurial/thirdparty/xdiff/xprepare.c', 854 'mercurial/thirdparty/xdiff/xprepare.c',
856 'mercurial/thirdparty/xdiff/xutils.c', 855 'mercurial/thirdparty/xdiff/xutils.c',
857 ] 856 ]
858 857
859 xdiff_headers = [ 858 xdiff_headers = [
860 'mercurial/thirdparty/xdiff/xdiff.h', 859 'mercurial/thirdparty/xdiff/xdiff.h',
861 'mercurial/thirdparty/xdiff/xdiffi.h', 860 'mercurial/thirdparty/xdiff/xdiffi.h',
862 'mercurial/thirdparty/xdiff/xemit.h',
863 'mercurial/thirdparty/xdiff/xinclude.h', 861 'mercurial/thirdparty/xdiff/xinclude.h',
864 'mercurial/thirdparty/xdiff/xmacros.h', 862 'mercurial/thirdparty/xdiff/xmacros.h',
865 'mercurial/thirdparty/xdiff/xprepare.h', 863 'mercurial/thirdparty/xdiff/xprepare.h',
866 'mercurial/thirdparty/xdiff/xtypes.h', 864 'mercurial/thirdparty/xdiff/xtypes.h',
867 'mercurial/thirdparty/xdiff/xutils.h', 865 'mercurial/thirdparty/xdiff/xutils.h',