# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1529125812 -32400
# Node ID 6a8ed5c7e1123ce5bd6b1bbecddc6f71eb60aa15
# Parent  70f551a3f52efea4fd3d399e78de97d06f09a177
tests: fold test-template-filters.t into test-template-functions.t

diff -r 70f551a3f52e -r 6a8ed5c7e112 contrib/python3-whitelist
--- a/contrib/python3-whitelist	Sat Jun 16 13:17:11 2018 +0900
+++ b/contrib/python3-whitelist	Sat Jun 16 14:10:12 2018 +0900
@@ -489,7 +489,6 @@
 test-symlinks.t
 test-tag.t
 test-tags.t
-test-template-filters.t
 test-template-functions.t
 test-template-map.t
 test-transplant.t
diff -r 70f551a3f52e -r 6a8ed5c7e112 tests/test-template-filters.t
--- a/tests/test-template-filters.t	Sat Jun 16 13:17:11 2018 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-  $ hg debugtemplate '{""|splitlines|commondir}\n'
-  
-  $ hg debugtemplate '{"foo/bar\nfoo/baz\nfoo/foobar\n"|splitlines|commondir}\n'
-  foo
-  $ hg debugtemplate '{"foo/bar\nfoo/bar\n"|splitlines|commondir}\n'
-  foo
-  $ hg debugtemplate '{"/foo/bar\n/foo/bar\n"|splitlines|commondir}\n'
-  foo
-  $ hg debugtemplate '{"/foo\n/foo\n"|splitlines|commondir}\n'
-  
-  $ hg debugtemplate '{"foo/bar\nbar/baz"|splitlines|commondir}\n'
-  
-  $ hg debugtemplate '{"foo/bar\nbar/baz\nbar/foo\n"|splitlines|commondir}\n'
-  
-  $ hg debugtemplate '{"foo/../bar\nfoo/bar"|splitlines|commondir}\n'
-  foo
-  $ hg debugtemplate '{"foo\n/foo"|splitlines|commondir}\n'
-  
-  $ hg init
-  $ hg log -r null -T '{rev|commondir}'
-  hg: parse error: argument is not a list of text
-  (template filter 'commondir' is not compatible with keyword 'rev')
-  [255]
diff -r 70f551a3f52e -r 6a8ed5c7e112 tests/test-template-functions.t
--- a/tests/test-template-functions.t	Sat Jun 16 13:17:11 2018 +0900
+++ b/tests/test-template-functions.t	Sat Jun 16 14:10:12 2018 +0900
@@ -216,6 +216,32 @@
   $ hg debugtemplate '{"foo/bar"|stripdir}|{"foo/"|stripdir}|{"foo"|stripdir}|\n'
   foo|foo|foo|
 
+commondir() filter:
+
+  $ hg debugtemplate '{""|splitlines|commondir}\n'
+  
+  $ hg debugtemplate '{"foo/bar\nfoo/baz\nfoo/foobar\n"|splitlines|commondir}\n'
+  foo
+  $ hg debugtemplate '{"foo/bar\nfoo/bar\n"|splitlines|commondir}\n'
+  foo
+  $ hg debugtemplate '{"/foo/bar\n/foo/bar\n"|splitlines|commondir}\n'
+  foo
+  $ hg debugtemplate '{"/foo\n/foo\n"|splitlines|commondir}\n'
+  
+  $ hg debugtemplate '{"foo/bar\nbar/baz"|splitlines|commondir}\n'
+  
+  $ hg debugtemplate '{"foo/bar\nbar/baz\nbar/foo\n"|splitlines|commondir}\n'
+  
+  $ hg debugtemplate '{"foo/../bar\nfoo/bar"|splitlines|commondir}\n'
+  foo
+  $ hg debugtemplate '{"foo\n/foo"|splitlines|commondir}\n'
+  
+
+  $ hg log -r null -T '{rev|commondir}'
+  hg: parse error: argument is not a list of text
+  (template filter 'commondir' is not compatible with keyword 'rev')
+  [255]
+
 Add a dummy commit to make up for the instability of the above:
 
   $ echo a > a