# HG changeset patch # User Marcin Kasperski # Date 1474834337 -7200 # Node ID 14a3ffbba22b79117965a201a955a1826fc54ce1 # Parent 55469dbb19c40f7dcad707e3cd8f836cf78034a9 Fixing tests for older mercurials diff -r 55469dbb19c4 -r 14a3ffbba22b tests/basic.t --- a/tests/basic.t Sun Sep 25 22:02:55 2016 +0200 +++ b/tests/basic.t Sun Sep 25 22:12:17 2016 +0200 @@ -70,13 +70,13 @@ adding file changes added 1 changesets with 1 changes to 1 files - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 0: First Let's also test pulling @@ -145,7 +145,7 @@ searching for changes no changes found - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 2: In repo2 1: In repo1 0: First @@ -242,25 +242,25 @@ adding file changes added 2 changesets with 2 changes to 1 files - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 4: Normal 3: Br1 2: In repo2 1: In repo1 0: First - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 3: Normal 2: In repo2 1: In repo1 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' 2: Normal 1: In repo2 0: First - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 2: Normal 1: In repo2 0: First diff -r 55469dbb19c4 -r 14a3ffbba22b tests/duplicates.t --- a/tests/duplicates.t Sun Sep 25 22:02:55 2016 +0200 +++ b/tests/duplicates.t Sun Sep 25 22:12:17 2016 +0200 @@ -79,13 +79,13 @@ Skipping alias1again as path remote1 was already handled - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 0: First Let's also test pulling @@ -165,7 +165,7 @@ Skipping alias1again as path remote1 was already handled - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 2: In repo2 1: In repo1 0: First diff -r 55469dbb19c4 -r 14a3ffbba22b tests/facing_problems.t --- a/tests/facing_problems.t Sun Sep 25 22:02:55 2016 +0200 +++ b/tests/facing_problems.t Sun Sep 25 22:12:17 2016 +0200 @@ -70,12 +70,12 @@ abort: repository is unrelated [255] - $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n' + $ hg --cwd $GOOD1 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $GOOD2 log -T '{rev}: {desc}\n' + $ hg --cwd $GOOD2 log --template '{rev}: {desc}\n' - $ hg --cwd $UNREL log -T '{rev}: {desc}\n' + $ hg --cwd $UNREL log --template '{rev}: {desc}\n' 0: Unrelated and again, but in non-breaking mode @@ -106,15 +106,15 @@ adding file changes added 2 changesets with 2 changes to 1 files - $ hg --cwd $GOOD1 log -T '{rev}: {desc}\n' + $ hg --cwd $GOOD1 log --template '{rev}: {desc}\n' 1: Second 0: First - $ hg --cwd $GOOD2 log -T '{rev}: {desc}\n' + $ hg --cwd $GOOD2 log --template '{rev}: {desc}\n' 1: Second 0: First - $ hg --cwd $UNREL log -T '{rev}: {desc}\n' + $ hg --cwd $UNREL log --template '{rev}: {desc}\n' 0: Unrelated Let's also test pulling @@ -198,7 +198,7 @@ abort: repository is unrelated [255] - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 2: In repo1 1: Second 0: First @@ -223,7 +223,7 @@ added 1 changesets with 0 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 3: In good2 2: In repo1 1: Second diff -r 55469dbb19c4 -r 14a3ffbba22b tests/groups-legacy.t --- a/tests/groups-legacy.t Sun Sep 25 22:02:55 2016 +0200 +++ b/tests/groups-legacy.t Sun Sep 25 22:12:17 2016 +0200 @@ -69,15 +69,15 @@ adding file changes added 1 changesets with 1 changes to 1 files - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP4 log -T '{rev}: {desc}\n' + $ hg --cwd $REP4 log --template '{rev}: {desc}\n' $ cat >> $BASE/file.txt << EOF @@ -102,17 +102,17 @@ adding file changes added 2 changesets with 2 changes to 1 files - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' 1: Second 0: First - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP4 log -T '{rev}: {desc}\n' + $ hg --cwd $REP4 log --template '{rev}: {desc}\n' 1: Second 0: First @@ -179,7 +179,7 @@ searching for changes no changes found - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 2: In repo1 1: Second 0: First @@ -290,24 +290,24 @@ adding file changes added 2 changesets with 2 changes to 2 files - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 4: Normal 3: Br1 2: In repo1 1: Second 0: First - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 2: Normal 1: In repo1 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' 2: In repo2 1: Second 0: First - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 2: Normal 1: In repo1 0: First diff -r 55469dbb19c4 -r 14a3ffbba22b tests/groups-modern.t --- a/tests/groups-modern.t Sun Sep 25 22:02:55 2016 +0200 +++ b/tests/groups-modern.t Sun Sep 25 22:12:17 2016 +0200 @@ -71,15 +71,15 @@ adding file changes added 1 changesets with 1 changes to 1 files - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP4 log -T '{rev}: {desc}\n' + $ hg --cwd $REP4 log --template '{rev}: {desc}\n' $ cat >> $BASE/file.txt << EOF @@ -104,17 +104,17 @@ adding file changes added 2 changesets with 2 changes to 1 files - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' 1: Second 0: First - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP4 log -T '{rev}: {desc}\n' + $ hg --cwd $REP4 log --template '{rev}: {desc}\n' 1: Second 0: First @@ -181,7 +181,7 @@ searching for changes no changes found - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 2: In repo1 1: Second 0: First @@ -312,7 +312,7 @@ adding file changes added 3 changesets with 3 changes to 1 files - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 5: Normal 4: Br1 3: In repo2 @@ -320,19 +320,19 @@ 1: Second 0: First - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 4: Normal 3: In repo2 2: Second 1: In repo1 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' 2: In repo2 1: Second 0: First - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 3: Normal 2: In repo2 1: Second diff -r 55469dbb19c4 -r 14a3ffbba22b tests/ignore_and_prioritize.t --- a/tests/ignore_and_prioritize.t Sun Sep 25 22:02:55 2016 +0200 +++ b/tests/ignore_and_prioritize.t Sun Sep 25 22:12:17 2016 +0200 @@ -66,12 +66,12 @@ adding file changes added 1 changesets with 1 changes to 1 files - $ hg --cwd $REP1 log -T '{rev}: {desc}\n' + $ hg --cwd $REP1 log --template '{rev}: {desc}\n' 0: First - $ hg --cwd $REP2 log -T '{rev}: {desc}\n' + $ hg --cwd $REP2 log --template '{rev}: {desc}\n' - $ hg --cwd $REP3 log -T '{rev}: {desc}\n' + $ hg --cwd $REP3 log --template '{rev}: {desc}\n' 0: First Let's also test pulling @@ -125,7 +125,7 @@ added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) - $ hg --cwd $BASE log -T '{rev}: {desc}\n' + $ hg --cwd $BASE log --template '{rev}: {desc}\n' 1: In repo1 0: First