Rev 1958: Fix tests. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1958
revision-id: jelmer at samba.org-20081103185114-orya3vcabf5h0gj0
parent: jelmer at samba.org-20081103143535-27cqeihgv1t1yau1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-11-03 19:51:14 +0100
message:
  Fix tests.
modified:
  branch.py                      svnbranch.py-20051017135706-11c749eb0dab04a7
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
=== modified file 'branch.py'
--- a/branch.py	2008-10-02 21:18:28 +0000
+++ b/branch.py	2008-11-03 18:51:14 +0000
@@ -227,7 +227,7 @@
     def get_config(self):
         return BranchConfig(self)
        
-    def _get_nick(self):
+    def _get_nick(self, possible_master_transports=None):
         """Find the nick name for this branch.
 
         :return: Branch nick

=== modified file 'commit.py'
--- a/commit.py	2008-11-03 03:55:00 +0000
+++ b/commit.py	2008-11-03 18:51:14 +0000
@@ -163,8 +163,7 @@
     # Loop over entries of file_id in old_inv
     # remove if they no longer exist with the same name
     # or parents
-    if (file_id in old_inv and
-        self.old_inv[file_id].kind == 'directory'):
+    if (file_id in old_inv and old_inv[file_id].kind == 'directory'):
         for child_name in old_inv[file_id].children:
             child_ie = old_inv.get_child(file_id, child_name)
             # remove if...