# HG changeset patch # User Denis Laxalde <denis.laxa...@logilab.fr> # Date 1488554237 -3600 # Fri Mar 03 16:17:17 2017 +0100 # Node ID 539c8f94f4d878173ee105fc2628f1b899299d82 # Parent 201a5066da14bc8272b057eb2130bd1f12ace96c # Available At http://hg.logilab.org/users/dlaxalde/hg # hg pull http://hg.logilab.org/users/dlaxalde/hg -r 539c8f94f4d8 # EXP-Topic diffhunks test: end printed diff "hunks" with an empty string in test-context.py
So that the resulting diff is correct and does not include a spurious empty line between lines "diff --git a/foo b/foo" and "--- a/foo". diff --git a/tests/test-context.py b/tests/test-context.py --- a/tests/test-context.py +++ b/tests/test-context.py @@ -59,7 +59,7 @@ print(ctxb.status(ctxa)) # test performing a diff on a memctx for d in ctxb.diff(ctxa, git=True): - print(d) + print(d, end='') # test safeness and correctness of "ctx.status()" print('= checking context.status():') diff --git a/tests/test-context.py.out b/tests/test-context.py.out --- a/tests/test-context.py.out +++ b/tests/test-context.py.out @@ -4,13 +4,11 @@ Latin-1 : Grüezi! UTF-8 : Grüezi! <status modified=['foo'], added=[], removed=[], deleted=[], unknown=[], ignored=[], clean=[]> diff --git a/foo b/foo - --- a/foo +++ b/foo @@ -1,1 +1,2 @@ foo +bar - = checking context.status(): == checking workingctx.status: wctx._status=<status modified=['bar-m'], added=['bar-a'], removed=['bar-r'], deleted=[], unknown=[], ignored=[], clean=[]> _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel