Test Failure (Filterhunks) with hg 1.4

Create issue
Issue #139 resolved
Paul Sargent created an issue

After the latest updates 5 tests fail when using hg 1.4. All failures are down to filterhunks().

I notice filterhunks has recently been updated for hg 1.5, so is 1.4 compatability broken on purpose?

{{{

ERROR: test_author_map_closing_author_stupid (test_fetch_mappings.MapTests)

Traceback (most recent call last): File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_mappings.py", line 58, in test_author_map_closing_author_stupid self.test_author_map_closing_author(True) File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_mappings.py", line 51, in test_author_map_closing_author self.wc_path, authors=self.authors) File "/v/home/rad/radpxs/lib/python/mercurial/commands.py", line 649, in clone update=opts.get('updaterev') or not opts.get('noupdate')) File "/v/home/rad/radpxs/lib/python/mercurial/hg.py", line 292, in clone dest_repo.clone(src_repo, heads=revs, stream=stream) File "/v/home/rad/radpxs/lib/python/mercurial/localrepo.py", line 2144, in clone return self.pull(remote, heads) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 43, in wrapper return fn(self, args, *opts) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 57, in pull return wrappers.pull(self, remote, heads, force) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/wrappers.py", line 283, in pull close = pullfunshave_replay File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 580, in convert_rev ui, svn, meta, b, r, parentctx) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 162, in diff_branchrev {}, strip=0) File "/v/home/rad/radpxs/lib/python/mercurial/patch.py", line 967, in applydiff for state, values in iterhunks(ui, fp, sourcefile, textmode): TypeError: filterhunks() takes at most 3 arguments (4 given)

====================================================================== ERROR: test_author_map_stupid (test_fetch_mappings.MapTests)


Traceback (most recent call last): File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_mappings.py", line 40, in test_author_map_stupid self.test_author_map(True) File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_mappings.py", line 33, in test_author_map self.wc_path, authors=self.authors) File "/v/home/rad/radpxs/lib/python/mercurial/commands.py", line 649, in clone update=opts.get('updaterev') or not opts.get('noupdate')) File "/v/home/rad/radpxs/lib/python/mercurial/hg.py", line 292, in clone dest_repo.clone(src_repo, heads=revs, stream=stream) File "/v/home/rad/radpxs/lib/python/mercurial/localrepo.py", line 2144, in clone return self.pull(remote, heads) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 43, in wrapper return fn(self, args, *opts) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 57, in pull return wrappers.pull(self, remote, heads, force) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/wrappers.py", line 283, in pull close = pullfunshave_replay File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 580, in convert_rev ui, svn, meta, b, r, parentctx) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 162, in diff_branchrev {}, strip=0) File "/v/home/rad/radpxs/lib/python/mercurial/patch.py", line 967, in applydiff for state, values in iterhunks(ui, fp, sourcefile, textmode): TypeError: filterhunks() takes at most 3 arguments (4 given)

====================================================================== ERROR: test_file_map_exclude_stupid (test_fetch_mappings.MapTests)


Traceback (most recent call last): File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_mappings.py", line 102, in test_file_map_exclude_stupid self.test_file_map_exclude(True) File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_mappings.py", line 97, in test_file_map_exclude self.wc_path, filemap=self.filemap) File "/v/home/rad/radpxs/lib/python/mercurial/commands.py", line 649, in clone update=opts.get('updaterev') or not opts.get('noupdate')) File "/v/home/rad/radpxs/lib/python/mercurial/hg.py", line 292, in clone dest_repo.clone(src_repo, heads=revs, stream=stream) File "/v/home/rad/radpxs/lib/python/mercurial/localrepo.py", line 2144, in clone return self.pull(remote, heads) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 43, in wrapper return fn(self, args, *opts) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 57, in pull return wrappers.pull(self, remote, heads, force) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/wrappers.py", line 283, in pull close = pullfunshave_replay File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 580, in convert_rev ui, svn, meta, b, r, parentctx) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 162, in diff_branchrev {}, strip=0) File "/v/home/rad/radpxs/lib/python/mercurial/patch.py", line 967, in applydiff for state, values in iterhunks(ui, fp, sourcefile, textmode): TypeError: filterhunks() takes at most 3 arguments (4 given)

====================================================================== ERROR: test_file_map_stupid (test_fetch_mappings.MapTests)


Traceback (most recent call last): File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_mappings.py", line 86, in test_file_map_stupid self.test_file_map(True) File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_mappings.py", line 81, in test_file_map self.wc_path, filemap=self.filemap) File "/v/home/rad/radpxs/lib/python/mercurial/commands.py", line 649, in clone update=opts.get('updaterev') or not opts.get('noupdate')) File "/v/home/rad/radpxs/lib/python/mercurial/hg.py", line 292, in clone dest_repo.clone(src_repo, heads=revs, stream=stream) File "/v/home/rad/radpxs/lib/python/mercurial/localrepo.py", line 2144, in clone return self.pull(remote, heads) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 43, in wrapper return fn(self, args, *opts) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 57, in pull return wrappers.pull(self, remote, heads, force) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/wrappers.py", line 283, in pull close = pullfunshave_replay File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 580, in convert_rev ui, svn, meta, b, r, parentctx) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 162, in diff_branchrev {}, strip=0) File "/v/home/rad/radpxs/lib/python/mercurial/patch.py", line 967, in applydiff for state, values in iterhunks(ui, fp, sourcefile, textmode): TypeError: filterhunks() takes at most 3 arguments (4 given)

====================================================================== ERROR: test_truncated_history_stupid (test_fetch_truncated.TestFetchTruncatedHistory)


Traceback (most recent call last): File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_truncated.py", line 34, in test_truncated_history_stupid self.test_truncated_history(True) File "/v/home/rad/radpxs/Downloads/hgsubversion/tests/test_fetch_truncated.py", line 16, in test_truncated_history commands.clone(_ui, svn_url, self.wc_path, noupdate=True) File "/v/home/rad/radpxs/lib/python/mercurial/commands.py", line 649, in clone update=opts.get('updaterev') or not opts.get('noupdate')) File "/v/home/rad/radpxs/lib/python/mercurial/hg.py", line 292, in clone dest_repo.clone(src_repo, heads=revs, stream=stream) File "/v/home/rad/radpxs/lib/python/mercurial/localrepo.py", line 2144, in clone return self.pull(remote, heads) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 43, in wrapper return fn(self, args, *opts) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/svnrepo.py", line 57, in pull return wrappers.pull(self, remote, heads, force) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/wrappers.py", line 283, in pull close = pullfunshave_replay File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 580, in convert_rev ui, svn, meta, b, r, parentctx) File "/v/home/rad/radpxs/Downloads/hgsubversion/hgsubversion/stupid.py", line 162, in diff_branchrev {}, strip=0) File "/v/home/rad/radpxs/lib/python/mercurial/patch.py", line 967, in applydiff for state, values in iterhunks(ui, fp, sourcefile, textmode): TypeError: filterhunks() takes at most 3 arguments (4 given)


Ran 278 tests in 89.163s

FAILED (errors=5) }}}

Comments (4)

  1. Log in to comment