Rev 1825: Fix blackbox dumpfile test. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1825
revision-id: jelmer at samba.org-20080906124037-8f8mnnb6xgqoh5vl
parent: jelmer at samba.org-20080906045426-1jxisk7mpmiv0ebi
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2008-09-06 14:40:37 +0200
message:
  Fix blackbox dumpfile test.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
=== modified file '__init__.py'
--- a/__init__.py	2008-09-04 11:47:09 +0000
+++ b/__init__.py	2008-09-06 12:40:37 +0000
@@ -272,16 +272,16 @@
 
         from_repos.lock_read()
         try:
-            (guessed_layout, layout) = repository_guess_layout(from_repos, 
+            (guessed_overall_layout, guessed_layout) = repository_guess_layout(from_repos, 
                 from_repos.get_latest_revnum())
 
             if prefix is not None:
                 prefix = prefix.strip("/") + "/"
-                if guessed_layout.is_branch(prefix):
+                if guessed_overall__layout.is_branch(prefix):
                     raise BzrCommandError("%s appears to contain a branch. " 
                             "For individual branches, use 'bzr branch'." % 
                             from_location)
-                elif guessed_layout.is_branch_parent(prefix):
+                elif guessed_overall_layout.is_branch_parent(prefix):
                     self.outf.write("Importing branches with prefix /%s\n" % 
                         urlutils.unescape_for_display(prefix, self.outf.encoding))
                 else:
@@ -298,6 +298,9 @@
                     return False
                 return True
 
+            if layout is None:
+                layout = guessed_layout
+
             convert_repository(from_repos, to_location, layout, 
                                not standalone, trees, all, 
                                filter_branch=filter_branch,

=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2008-09-02 17:37:02 +0000
+++ b/tests/test_commit.py	2008-09-06 12:40:37 +0000
@@ -136,7 +136,7 @@
         self.client_add("dc/foo")
         wt = WorkingTree.open("dc")
         wt.set_pending_merges(["some-ghost-revision"])
-        self.assertEqual(("some-ghost-revision",), wt.pending_merges())
+        self.assertEqual(["some-ghost-revision"], wt.get_parent_ids()[1:])
         wt.commit(message="data")
         self.assertEqual("some-ghost-revision\n", 
                 self.client_get_prop(repos_url, "bzr:ancestry:v3-none", 1))