# HG changeset patch # User Boris Feld # Date 1527259804 -7200 # Node ID 7b782e419df70268320467d0d8815e1f91c6d0a8 # Parent 8c368720f0102efaada3516bf14875c78f26c225 obslog: check filtered output with splitted changesets diff -r 8c368720f010 -r 7b782e419df7 tests/test-evolve-obshistory-split.t --- a/tests/test-evolve-obshistory-split.t Fri May 25 11:52:48 2018 +0200 +++ b/tests/test-evolve-obshistory-split.t Fri May 25 16:50:04 2018 +0200 @@ -13,8 +13,10 @@ ---------- $ hg init $TESTTMP/local-split + $ hg init $TESTTMP/server $ cd $TESTTMP/local-split $ mkcommit ROOT + $ sync $ echo 42 >> a $ echo 43 >> b $ hg commit -A -m "A0" @@ -67,6 +69,8 @@ no more change to split + $ sync + $ hg log --hidden -G @ changeset: 3:f257fde29c7a | tag: tip @@ -91,8 +95,8 @@ date: Thu Jan 01 00:00:00 1970 +0000 summary: ROOT -Actual test ------------ +Check output on the client side +------------------------------- Check that debugobshistory on splitted commit show both targets $ hg obslog 471597cad322 --hidden --patch @@ -204,3 +208,46 @@ (hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a) working directory parent is obsolete! (471597cad322) (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) + +Check output on the server side +------------------------------- + + $ hg obslog -R $TESTTMP/server --patch tip + o f257fde29c7a (2) A0 + | + x 471597cad322 + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + note: testing split + (No patch available, context is not local) + + $ hg obslog -R $TESTTMP/server -f --patch tip + o f257fde29c7a (2) A0 + + $ hg obslog -R $TESTTMP/server --all --patch tip + o 337fec4d2edc (1) A0 + | + | o f257fde29c7a (2) A0 + |/ + x 471597cad322 + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + note: testing split + (No patch available, context is not local) + + $ hg obslog -R $TESTTMP/server --all -f --patch tip + o 337fec4d2edc (1) A0 + + o f257fde29c7a (2) A0 + + $ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip + f257fde29c7a (2) A0 + 471597cad322 + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + note: testing split + (No patch available, context is not local) + + $ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip + f257fde29c7a (2) A0 + 471597cad322 + rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) + note: testing split + (No patch available, context is not local)