Rev 1368: Use new commit editor. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

Jelmer Vernooij jelmer at samba.org
Fri Jun 27 01:08:51 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1368
revision-id: jelmer at samba.org-20080627000850-f1l89dkqlxuuye5b
parent: jelmer at samba.org-20080627000844-7z71x68p6eni2l8b
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-06-27 02:08:50 +0200
message:
  Use new commit editor.
modified:
  tests/test_repository.py       test_repos.py-20060508151940-ddc49a59257ca712
=== modified file 'tests/test_repository.py'
--- a/tests/test_repository.py	2008-06-26 23:29:48 +0000
+++ b/tests/test_repository.py	2008-06-27 00:08:50 +0000
@@ -566,26 +566,32 @@
         self.assertEqual({}, repository.get_parent_map(["notexisting"]))
 
     def test_revision_fileidmap(self):
-        repos_url = self.make_client('d', 'dc')
-        self.build_tree({'dc/foo': "data"})
-        self.client_add("dc/foo")
-        self.client_set_prop("dc", "bzr:revision-info", "")
-        self.client_set_prop("dc", "bzr:file-ids", "foo\tsomeid\n")
-        self.client_commit("dc", "My Message")
+        repos_url = self.make_repository('d')
+
+        dc = self.get_commit_editor(repos_url)
+        dc.add_file("foo").modify("data")
+        dc.change_prop("bzr:revision-info", "")
+        dc.change_prop("bzr:file-ids", "foo\tsomeid\n")
+        dc.close()
+
         repository = Repository.open("svn+%s" % repos_url)
         tree = repository.revision_tree(Branch.open(repos_url).last_revision())
         self.assertEqual("someid", tree.inventory.path2id("foo"))
         self.assertFalse("1@%s::foo" % repository.uuid in tree.inventory)
 
     def test_revision_ghost_parents(self):
-        repos_url = self.make_client('d', 'dc')
-        self.build_tree({'dc/foo': "data"})
+        repos_url = self.make_repository('d')
+
+        dc = self.get_commit_editor(repos_url)
+        dc.add_file("foo").modify("data")
         self.client_add("dc/foo")
-        self.client_commit("dc", "My Message")
-        self.client_update("dc")
-        self.build_tree({'dc/foo': "data2"})
-        self.client_set_prop("dc", "bzr:ancestry:v3-none", "ghostparent\n")
-        self.client_commit("dc", "Second Message")
+        dc.close()
+
+        dc = self.get_commit_editor(repos_url)
+        dc.open_file("foo").modify("data2")
+        dc.change_prop("bzr:ancestry:v3-none", "ghostparent\n")
+        dc.close()
+
         repository = Repository.open("svn+%s" % repos_url)
         mapping = repository.get_mapping()
         self.assertEqual((),




More information about the bazaar-commits mailing list