Rev 4380: (igc) two simple log dotted revno tests (Marius Kruger) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4380
revision-id: pqm at pqm.ubuntu.com-20090525081809-9z1knxaipz0p3pw6
parent: pqm at pqm.ubuntu.com-20090523064024-0o95iuqvh8wj2zuz
parent: ian.clatworthy at canonical.com-20090525072554-8ff1qn1tc56ixvin
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-05-25 09:18:09 +0100
message:
  (igc) two simple log dotted revno tests (Marius Kruger)
modified:
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
    ------------------------------------------------------------
    revno: 4379.1.1
    revision-id: ian.clatworthy at canonical.com-20090525072554-8ff1qn1tc56ixvin
    parent: pqm at pqm.ubuntu.com-20090523064024-0o95iuqvh8wj2zuz
    parent: amanic at gmail.com-20090516010205-0jlizxz3it6j7xxa
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: integration
    timestamp: Mon 2009-05-25 17:25:54 +1000
    message:
      (igc) two simple log dootted revno tests (Marius Kruger)
    modified:
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
    ------------------------------------------------------------
    revno: 4369.2.2
    revision-id: amanic at gmail.com-20090516010205-0jlizxz3it6j7xxa
    parent: amanic at gmail.com-20090516003437-3e3zzbs68c992emr
    committer: Marius Kruger <amanic at gmail.com>
    branch nick: bzr.log_tests
    timestamp: Sat 2009-05-16 03:02:05 +0200
    message:
      use make_linear_branch in make_merged_branch
    modified:
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
    ------------------------------------------------------------
    revno: 4369.2.1
    revision-id: amanic at gmail.com-20090516003437-3e3zzbs68c992emr
    parent: pqm at pqm.ubuntu.com-20090515112941-ajpr1cci95j47aje
    committer: Marius Kruger <amanic at gmail.com>
    branch nick: bzr.log_tests
    timestamp: Sat 2009-05-16 02:34:37 +0200
    message:
      add some leftover log tests
    modified:
      bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py	2009-05-08 13:39:32 +0000
+++ b/bzrlib/tests/blackbox/test_log.py	2009-05-16 01:02:05 +0000
@@ -53,6 +53,25 @@
         tree.commit(message='message3')
         return tree
 
+    def make_merged_branch(self, path='.', format=None):
+        tree = self.make_linear_branch(path, format)
+        tree2 = tree.bzrdir.sprout('tree2',
+            revision_id=tree.branch.get_rev_id(1)).open_workingtree()
+        tree2.commit(message='tree2 message2')
+        tree2.commit(message='tree2 message3')
+        tree.merge_from_branch(tree2.branch)
+        tree.commit(message='merge')
+        return tree
+
+    def assertRevnos(self, log, must_have=(), must_not_have=()):
+        """Check if revnos are in or not in the log output"""
+        for revno in must_have:
+            self.assertTrue(('revno: %s\n' % revno) in log,
+                'Does not contain expected revno %s' % revno)
+        for revno in must_not_have:
+            self.assertFalse(('revno: %s\n' % revno) in log,
+                'Contains unexpected revno %s' % revno)
+
     def commit_options(self):
         """Use some mostly fixed values for commits to simplify tests.
 
@@ -147,12 +166,23 @@
         log = self.run_bzr("log -r 1..3")[0]
         self.assertEqualDiff(full_log, log)
 
+    def test_log_dotted_revspecs(self):
+        self.make_merged_branch()
+        log = self.run_bzr("log -n0 -r 1..1.1.1")[0]
+        self.assertRevnos(log, (1, '1.1.1'), (2, 3, '1.1.2', 4))
+
     def test_log_reversed_revspecs(self):
         self.make_linear_branch()
         self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
                             'the end revision.\n',),
                            ['log', '-r3..1'])
 
+    def test_log_reversed_dotted_revspecs(self):
+        self.make_merged_branch()
+        self.run_bzr_error(('bzr: ERROR: Start revision not found in '
+                            'left-hand history of end revision.\n',),
+                           "log -r 1.1.1..1")
+
     def test_log_revno_n_path(self):
         self.make_linear_branch('branch1')
         self.make_linear_branch('branch2')