# HG changeset patch # User Durham Goode # Date 1436418057 25200 # Node ID 74e82a7da3936e98d670bb18e8e7714b07372ef1 # Parent 0f1f88e71138923c4e9c5c84f9406bd42f0ea980 tests: check '.' for tags instead of None Commit 24cda1dd45ff in upstream Mercurial changed repo[None] to no longer return tags for the working copy parent. So we need to change the tests to check repo['.'] instead. This should be backwards compatible with older Mercurials. diff --git a/tests/test_pull.py b/tests/test_pull.py --- a/tests/test_pull.py +++ b/tests/test_pull.py @@ -30,7 +30,7 @@ class TestPull(test_util.TestBase): self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'}) commands.pull(self.repo.ui, repo) self.assertEqual(state, repo.parents()) - self.assertTrue('tip' not in repo[None].tags()) + self.assertTrue('tip' not in repo['.'].tags()) def test_onerevision_doupdate(self): repo, repo_path = self._loadupdate('single_rev.svndump') @@ -38,7 +38,7 @@ class TestPull(test_util.TestBase): self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'}) commands.pull(self.repo.ui, repo, update=True) self.failIfEqual(state, repo.parents()) - self.assertTrue('tip' in repo[None].tags()) + self.assertTrue('tip' in repo['.'].tags()) def test_onerevision_divergent(self): repo, repo_path = self._loadupdate('single_rev.svndump') @@ -51,7 +51,7 @@ class TestPull(test_util.TestBase): # hg < 1.9 raised when crossing branches pass self.assertEqual(state, repo.parents()) - self.assertTrue('tip' not in repo[None].tags()) + self.assertTrue('tip' not in repo['.'].tags()) self.assertEqual(len(repo.heads()), 2) def test_tag_repull_doesnt_happen(self):