Mercurial > public > mercurial-scm > hg

diff setup.py @ 36763:90f8fe72446c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/setup.py	Sun Mar 04 00:17:49 2018 -0800
+++ b/setup.py	Tue Mar 06 18:41:08 2018 -0800
@@ -850,7 +850,6 @@
 
 xdiff_srcs = [
     'mercurial/thirdparty/xdiff/xdiffi.c',
-    'mercurial/thirdparty/xdiff/xemit.c',
     'mercurial/thirdparty/xdiff/xmerge.c',
     'mercurial/thirdparty/xdiff/xprepare.c',
     'mercurial/thirdparty/xdiff/xutils.c',
@@ -859,7 +858,6 @@
 xdiff_headers = [
     'mercurial/thirdparty/xdiff/xdiff.h',
     'mercurial/thirdparty/xdiff/xdiffi.h',
-    'mercurial/thirdparty/xdiff/xemit.h',
     'mercurial/thirdparty/xdiff/xinclude.h',
     'mercurial/thirdparty/xdiff/xmacros.h',
     'mercurial/thirdparty/xdiff/xprepare.h',