~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 3677.1.1.

  • Committer: Vincent Ladeuil
  • Date: 2008-09-03 16:33:27 UTC
  • mto: (3705.1.1 trunk2)
  • mto: This revision was merged to the branch mainline in revision 3708.
  • Revision ID: v.ladeuil+lp@free.fr-20080903163327-hpgcpvx2ziit96og
Begin fixing bug #233817.

* tests/test_missing.py:
revnos returned by fin_unmerged are strings, update tests.
(TestFindUnmerged.test_include_merges): Check that we get the
merged revisions too.

* missing.py:
(find_unmerged): Add 'reverse' and 'include_merges' parameters.
(_enumerate_mainline): Add reverse parameter so that we reverse
the mainline revision list only when needed.
(_enumerate_with_merges): When including merges, building the
revision list is a bit more work.
(_find_unmerged): Build the revision list depending on
include_merges.

* log.py:
(LineLogFormatter.log_string): Fix doc string, the revno may be a
string.

* builtins.py:
(cmd_missing): Add an '--include-merges' option. Let fin_unmerged
handles the ordering.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: