summaryrefslogtreecommitdiff
path: root/tests/test_pull.py
diff options
context:
space:
mode:
authorTristan Seligmann <mithrandi@debian.org>2017-08-11 11:50:14 +0200
committerTristan Seligmann <mithrandi@debian.org>2017-08-11 11:50:14 +0200
commitf505a84d33c238a892064774ca31854d3b5b1df2 (patch)
treea67f8519abfc6a529260814e24809d62356fc46a /tests/test_pull.py
parentef9caf1c5d12cf3a5886c1eb3ff5bb956fdf482f (diff)
Upstream snapsnot 1.8.7+1517-b3e41b0d50a2
Diffstat (limited to 'tests/test_pull.py')
-rw-r--r--tests/test_pull.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/test_pull.py b/tests/test_pull.py
index 3a1a217..d038094 100644
--- a/tests/test_pull.py
+++ b/tests/test_pull.py
@@ -20,37 +20,37 @@ class TestPull(test_util.TestBase):
def test_nochanges(self):
self._loadupdate('single_rev.svndump')
- state = self.repo.parents()
+ state = self.repo[None].parents()
commands.pull(self.repo.ui, self.repo)
- self.assertEqual(state, self.repo.parents())
+ self.assertEqual(state, self.repo[None].parents())
def test_onerevision_noupdate(self):
repo, repo_path = self._loadupdate('single_rev.svndump')
- state = repo.parents()
+ state = repo[None].parents()
self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'})
commands.pull(self.repo.ui, repo)
- self.assertEqual(state, repo.parents())
+ self.assertEqual(state, repo[None].parents())
self.assertTrue('tip' not in repo['.'].tags())
def test_onerevision_doupdate(self):
repo, repo_path = self._loadupdate('single_rev.svndump')
- state = repo.parents()
+ state = repo[None].parents()
self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed'})
commands.pull(self.repo.ui, repo, update=True)
- self.failIfEqual(state, repo.parents())
+ self.failIfEqual(state, repo[None].parents())
self.assertTrue('tip' in repo['.'].tags())
def test_onerevision_divergent(self):
repo, repo_path = self._loadupdate('single_rev.svndump')
self.commitchanges((('alpha', 'alpha', 'Changed another way'),))
- state = repo.parents()
+ state = repo[None].parents()
self.add_svn_rev(repo_path, {'trunk/alpha': 'Changed one way'})
try:
commands.pull(self.repo.ui, repo, update=True)
except hgutil.Abort:
# hg < 1.9 raised when crossing branches
pass
- self.assertEqual(state, repo.parents())
+ self.assertEqual(state, repo[None].parents())
self.assertTrue('tip' not in repo['.'].tags())
self.assertEqual(len(repo.heads()), 2)