Rev 1129: merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1129
revision-id: jelmer at samba.org-20080825021412-b33enhho4rhbq7it
parent: jelmer at samba.org-20080825020356-9b7fylpm8d3nq65s
parent: jelmer at samba.org-20080825021247-95tfdxg6bw2ikuf5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Mon 2008-08-25 04:14:12 +0200
message:
  merge 0.4.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
    ------------------------------------------------------------
    revno: 950.24.226
    revision-id: jelmer at samba.org-20080825021247-95tfdxg6bw2ikuf5
    parent: jelmer at samba.org-20080825020339-0xtn3igqndm1ybxs
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-08-25 04:12:47 +0200
    message:
      Merge correct return types.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
=== modified file 'commit.py'
--- a/commit.py	2008-08-25 01:58:11 +0000
+++ b/commit.py	2008-08-25 02:14:12 +0000
@@ -585,10 +585,13 @@
                 it is a candidate to commit.
         """
         self.new_inventory.add(ie)
-        assert ie.file_id not in self.old_inv or self.old_inv[ie.file_id].revision is not None
+        assert (ie.file_id not in self.old_inv or 
+                self.old_inv[ie.file_id].revision is not None)
+        version_recorded = (ie.revision is None)
+        # If nothing changed since the lhs parent, return:
         if (ie.file_id in self.old_inv and ie == self.old_inv[ie.file_id] and 
             (ie.kind != 'directory' or ie.children == self.old_inv[ie.file_id].children)):
-            return
+            return self._get_delta(ie, self.old_inv, self.new_inventory.id2path(ie.file_id)), version_recorded
         if ie.kind == 'file':
             self.modified_files[ie.file_id] = tree.get_file_text(ie.file_id)
         elif ie.kind == 'symlink':
@@ -599,6 +602,7 @@
         while fid is not None and fid not in self.visit_dirs:
             self.visit_dirs.add(fid)
             fid = self.new_inventory[fid].parent_id
+        return self._get_delta(ie, self.old_inv, self.new_inventory.id2path(ie.file_id)), version_recorded
 
 
 def replay_delta(builder, old_tree, new_tree):