Rev 1256: Avoid specifying obsolete parameters. in file:///data/jelmer/bzr-svn/0.4-ra-cext/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/0.4-ra-cext/

------------------------------------------------------------
revno: 1256
revision-id: jelmer at samba.org-20080621225335-7u3jpjqjfmcd6zrj
parent: jelmer at samba.org-20080621220510-4xwfk94krvhmzm6i
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4-ra-cext
timestamp: Sun 2008-06-22 00:53:35 +0200
message:
  Avoid specifying obsolete parameters.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  editor.c                       editor.c-20080602191336-frj7az1sdk13o1tw-1
=== modified file 'commit.py'
--- a/commit.py	2008-06-18 11:58:24 +0000
+++ b/commit.py	2008-06-21 22:53:35 +0000
@@ -240,9 +240,7 @@
             # add them if they didn't exist in old_inv 
             if not child_ie.file_id in self.old_inv:
                 self.mutter('adding %s %r', child_ie.kind, new_child_path)
-                child_editor = dir_editor.add_file(
-                    full_new_child_path, None, -1)
-
+                child_editor = dir_editor.add_file(full_new_child_path)
 
             # copy if they existed at different location
             elif (self.old_inv.id2path(child_ie.file_id) != new_child_path or
@@ -312,7 +310,7 @@
                 self.mutter('adding dir %r', child_ie.name)
                 child_editor = dir_editor.add_directory(
                     urlutils.join(self.branch.get_branch_path(), 
-                                  new_child_path), None, -1)
+                                  new_child_path))
 
             # copy if they existed at different location
             elif self.old_inv.id2path(child_ie.file_id) != new_child_path:

=== modified file 'editor.c'
--- a/editor.c	2008-06-19 15:33:26 +0000
+++ b/editor.c	2008-06-21 22:53:35 +0000
@@ -270,8 +270,8 @@
 static PyObject *py_dir_editor_add_file(PyObject *self, PyObject *args)
 {
 	char *path, *copy_path=NULL;
-	int copy_rev=-1;
-	void *file_baton;
+	long copy_rev=-1;
+	void *file_baton = NULL;
 	EditorObject *editor = (EditorObject *)self;
 
 	if (!DirectoryEditor_Check(self)) {