[MERGE] pull converges

Aaron Bentley aaron.bentley at utoronto.ca
Wed Apr 12 05:26:38 BST 2006


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

+1.  I did have a couple of suggestions, but it's your call.

Robert Collins wrote:
| +            new_history = []
| +            while current_rev_id not in (None, NULL_REVISION):
| +                new_history.append(current_rev_id)
| +                current_rev_id_parents = stop_graph[current_rev_id]
| +                try:
| +                    current_rev_id = current_rev_id_parents[0]
| +                except IndexError:
| +                    current_rev_id = None
| +            new_history.reverse()

It might be nice to split this out to a separate left_parent_history
function.

| +    @deprecated_method(zero_eight)
|      def pullable_revisions(self, other, stop_revision):
| +        """Please use bzrlib.missing instead."""
|          other_revno = other.revision_id_to_revno(stop_revision)
|          try:
|              return self.missing_revisions(other, other_revno)

Also, perhaps we should deprecate get_intervening_revisions.  It seems
to be in competition with (my suggested) left_parent_history, obsolete,
and totally unused.

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

iD8DBQFEPIF+0F+nu1YWqI0RAubuAJ90RHEtaq7Ky5NDKN7xbpcFyYNGbACaAoId
jLqBHiyOlAGefqyMmRteLlM=
=sRb0
-----END PGP SIGNATURE-----




More information about the bazaar mailing list