Merge lp:~abentley/bzr/last-revision into lp:~bzr/bzr/trunk-old

[Aaron Bentley]

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

This patch cleans up our support for last_revision. This API was
supposed to be deprecated, but has turned out to be too useful.
Therefore, I've added tests and a default implementation on Tree.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkoWlIEACgkQ0F+nu1YWqI0a/QCfSCzyrts6HY0902CCsW2Mr2F7
rN4An05UjaT5msCupEINNLe3CxPaypof
=GsVB
-----END PGP SIGNATURE-----

[Ian Clatworthy (ian-clatworthy)]

review: Approve

[John A Meinel (jameinel)]

I use Branch.last_revision() all the time, but I don't feel that maps well into "Tree.last_revision()".

I would really prefer it to use a different name, since it doesn't return the 'same' results. For Tree/WorkingTree it seems to be returning the revision of the left-hand parent, while for Branch it is giving the *current* revision.

Can you define what/where you are using it? (I overlooked this patch originally because I was thinking about Branch.last_revision().)

The code change is fine, I'm just trying to understand the utility of "give me one of, but not all of the parents". Especially considering what answer do we want to give if the left-hand parent is a ghost, etc.

review: Needs Information

[Martin Pool (mbp)]

I agree with John, this seems kind of questionable.

review: Needs Information

[lp:~abentley/bzr/last-revision]

4378. By Aaron Bentley on 2009-05-28

Merge bzr.dev ito last-revision.

Unmerged revisions

4378. By Aaron Bentley on 2009-05-28

Merge bzr.dev ito last-revision.

4377. By Aaron Bentley on 2009-05-28

Merge bzr.dev into last-revision.

4376. By Aaron Bentley on 2009-05-22

Clean up last_revision support.

4375. By Aaron Bentley on 2009-05-22

Implement and test Tree.last_revision.

4374. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-20

(abentley) Enable committing from a PreviewTree.

4373. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-20

(Jelmer) Mention --default-rich-root rather than a particular format
 in the user guide.

4372. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-18

(igc) added osutils.parent_directories() (Ian Clatworthy)

4371. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-17

(Jelmer) Make dpush help/error a bit more generic.

4370. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-16

(tanner) merge bzr-1.15rc1 to trunk.

4369. By Canonical.com Patch Queue Manager <email address hidden> on 2009-05-15

(Jelmer) Include stdlib.h for malloc/realloc/free in Pyrex RIO
 implementation.

=== modified file 'bzrlib/mutabletree.py'
--- bzrlib/mutabletree.py	2009-04-09 20:23:07 +0000
+++ bzrlib/mutabletree.py	2009-05-28 12:36:11 +0000
@@ -246,22 +246,6 @@
         """
         return (self.get_file(file_id, path), None)
 
-    @needs_read_lock
-    def last_revision(self):
-        """Return the revision id of the last commit performed in this tree.
-
-        In early tree formats the result of last_revision is the same as the
-        branch last_revision, but that is no longer the case for modern tree
-        formats.
-
-        last_revision returns the left most parent id, or None if there are no
-        parents.
-
-        last_revision was deprecated as of 0.11. Please use get_parent_ids
-        instead.
-        """
-        raise NotImplementedError(self.last_revision)
-
     def lock_tree_write(self):
         """Lock the working tree for write, and the branch for read.
 
 
=== modified file 'bzrlib/tests/tree_implementations/test_tree.py'
--- bzrlib/tests/tree_implementations/test_tree.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/tree_implementations/test_tree.py	2009-05-28 12:36:11 +0000
@@ -18,6 +18,7 @@
     errors,
     conflicts,
     osutils,
+    revision,
     revisiontree,
     tests,
     workingtree_4,
@@ -292,3 +293,30 @@
         self.addCleanup(tree.unlock)
         expected = osutils.sha_strings('file content')
         self.assertEqual(expected, tree.get_file_sha1('file-id'))
+
+
+class TestParentIDs(TestCaseWithTree):
+
+    def test_get_parent_ids_NULL(self):
+        work_tree = self.make_branch_and_tree('tree')
+        tree = self._convert_tree(work_tree)
+        self.assertEqual([], tree.get_parent_ids())
+
+    def test_last_revsion_NULL(self):
+        work_tree = self.make_branch_and_tree('tree')
+        tree = self._convert_tree(work_tree)
+        self.assertEqual(revision.NULL_REVISION, tree.last_revision())
+
+    def make_tree_with_commit(self):
+        work_tree = self.make_branch_and_tree('tree')
+        rev_id = work_tree.commit('message')
+        tree = self._convert_tree(work_tree)
+        return tree, rev_id
+
+    def test_get_parent_ids_one(self):
+        tree, rev_id = self.make_tree_with_commit()
+        self.assertEqual([rev_id], tree.get_parent_ids())
+
+    def test_last_revision_one(self):
+        tree, rev_id = self.make_tree_with_commit()
+        self.assertEqual(rev_id, tree.last_revision())
 
=== modified file 'bzrlib/tree.py'
--- bzrlib/tree.py	2009-05-23 04:55:52 +0000
+++ bzrlib/tree.py	2009-05-28 12:36:11 +0000
@@ -124,6 +124,22 @@
         """
         raise NotImplementedError(self.get_parent_ids)
 
+    def last_revision(self):
+        """Return the lefthand parent of the tree.
+
+        For working trees, this will be the last revision committed to the
+        tree.
+
+        For trees with no obvious parents, this is revision.NULL_REVISION
+        The default implementation simply uses get_parent_ids.
+        :return: revision_id, as a unicode string.
+        """
+        parent_ids = self.get_parent_ids()
+        if len(parent_ids) > 0:
+            return parent_ids[0]
+        else:
+            return _mod_revision.NULL_REVISION
+
     def has_filename(self, filename):
         """True if the tree has given filename."""
         raise NotImplementedError(self.has_filename)
 
=== modified file 'bzrlib/workingtree_4.py'
--- bzrlib/workingtree_4.py	2009-05-23 04:55:52 +0000
+++ bzrlib/workingtree_4.py	2009-05-28 12:36:11 +0000
@@ -57,6 +57,7 @@
     textui,
     trace,
     transform,
+    tree,
     urlutils,
     views,
     xml5,
@@ -583,13 +584,9 @@
         return kind
 
     @needs_read_lock
-    def _last_revision(self):
+    def last_revision(self):
         """See Mutable.last_revision."""
-        parent_ids = self.current_dirstate().get_parent_ids()
-        if parent_ids:
-            return parent_ids[0]
-        else:
-            return _mod_revision.NULL_REVISION
+        return tree.Tree.last_revision(self)
 
     def lock_read(self):
         """See Branch.lock_read, and WorkingTree.unlock."""