~bzr-pqm/bzr/bzr.dev

# Copyright (C) 2005, 2006, 2007 Canonical Ltd

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

import os

from cStringIO import StringIO

from bzrlib import (

    errors,

    log,

    registry,

    revision,

    revisionspec,

    tests,

    )

class TestCaseWithoutPropsHandler(tests.TestCaseWithTransport):

    def setUp(self):

        super(TestCaseWithoutPropsHandler, self).setUp()

        # keep a reference to the "current" custom prop. handler registry

        self.properties_handler_registry = log.properties_handler_registry

        # Use a clean registry for log

        log.properties_handler_registry = registry.Registry()

        def restore():

            log.properties_handler_registry = self.properties_handler_registry

        self.addCleanup(restore)

class LogCatcher(log.LogFormatter):

    """Pull log messages into a list rather than displaying them.

    To simplify testing we save logged revisions here rather than actually

    formatting anything, so that we can precisely check the result without

    being dependent on the formatting.

    """

    supports_delta = True

    def __init__(self):

        super(LogCatcher, self).__init__(to_file=None)

        self.revisions = []

    def log_revision(self, revision):

        self.revisions.append(revision)

class TestShowLog(tests.TestCaseWithTransport):

    def checkDelta(self, delta, **kw):

        """Check the filenames touched by a delta are as expected.

        Caller only have to pass in the list of files for each part, all

        unspecified parts are considered empty (and checked as such).

        """

        for n in 'added', 'removed', 'renamed', 'modified', 'unchanged':

            # By default we expect an empty list

            expected = kw.get(n, [])

            # strip out only the path components

            got = [x[0] for x in getattr(delta, n)]

            self.assertEqual(expected, got)

    def assertInvalidRevisonNumber(self, br, start, end):

        lf = LogCatcher()

        self.assertRaises(errors.InvalidRevisionNumber,

                          log.show_log, br, lf,

                          start_revision=start, end_revision=end)

    def test_cur_revno(self):

        wt = self.make_branch_and_tree('.')

        b = wt.branch

        lf = LogCatcher()

        wt.commit('empty commit')

        log.show_log(b, lf, verbose=True, start_revision=1, end_revision=1)

        # Since there is a single revision in the branch all the combinations

        # below should fail.

        self.assertInvalidRevisonNumber(b, 2, 1)

        self.assertInvalidRevisonNumber(b, 1, 2)

        self.assertInvalidRevisonNumber(b, 0, 2)

        self.assertInvalidRevisonNumber(b, 1, 0)

        self.assertInvalidRevisonNumber(b, -1, 1)

        self.assertInvalidRevisonNumber(b, 1, -1)

    def test_empty_branch(self):

        wt = self.make_branch_and_tree('.')

        lf = LogCatcher()

        log.show_log(wt.branch, lf)

        # no entries yet

        self.assertEqual([], lf.revisions)

    def test_empty_commit(self):

        wt = self.make_branch_and_tree('.')

        wt.commit('empty commit')

        lf = LogCatcher()

        log.show_log(wt.branch, lf, verbose=True)

        revs = lf.revisions

        self.assertEqual(1, len(revs))

        self.assertEqual('1', revs[0].revno)

        self.assertEqual('empty commit', revs[0].rev.message)

        self.checkDelta(revs[0].delta)

    def test_simple_commit(self):

        wt = self.make_branch_and_tree('.')

        wt.commit('empty commit')

        self.build_tree(['hello'])

        wt.add('hello')

        wt.commit('add one file',

                  committer=u'\u013d\xf3r\xe9m \xcdp\u0161\xfam '

                            u'<test@example.com>')

        lf = LogCatcher()

        log.show_log(wt.branch, lf, verbose=True)

        self.assertEqual(2, len(lf.revisions))

        # first one is most recent

        log_entry = lf.revisions[0]

        self.assertEqual('2', log_entry.revno)

        self.assertEqual('add one file', log_entry.rev.message)

        self.checkDelta(log_entry.delta, added=['hello'])

    def test_commit_message_with_control_chars(self):

        wt = self.make_branch_and_tree('.')

        msg = u"All 8-bit chars: " +  ''.join([unichr(x) for x in range(256)])

        msg = msg.replace(u'\r', u'\n')

        wt.commit(msg)

        lf = LogCatcher()

        log.show_log(wt.branch, lf, verbose=True)

        committed_msg = lf.revisions[0].rev.message

        if wt.branch.repository._serializer.squashes_xml_invalid_characters:

            self.assertNotEqual(msg, committed_msg)

            self.assertTrue(len(committed_msg) > len(msg))

        else:

            self.assertEqual(msg, committed_msg)

    def test_commit_message_without_control_chars(self):

        wt = self.make_branch_and_tree('.')

        # escaped.  As ElementTree apparently does some kind of

        # newline conversion, neither LF (\x0A) nor CR (\x0D) are

        # included in the test commit message, even though they are

        # valid XML 1.0 characters.

        msg = "\x09" + ''.join([unichr(x) for x in range(0x20, 256)])

        wt.commit(msg)

        lf = LogCatcher()

        log.show_log(wt.branch, lf, verbose=True)

        committed_msg = lf.revisions[0].rev.message

        self.assertEqual(msg, committed_msg)

    def test_deltas_in_merge_revisions(self):

        """Check deltas created for both mainline and merge revisions"""

        wt = self.make_branch_and_tree('parent')

        self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])

        wt.add('file1')

        wt.add('file2')

        wt.commit(message='add file1 and file2')

        self.run_bzr('branch parent child')

        os.unlink('child/file1')

        file('child/file2', 'wb').write('hello\n')

        self.run_bzr(['commit', '-m', 'remove file1 and modify file2',

            'child'])

        os.chdir('parent')

        self.run_bzr('merge ../child')

        wt.commit('merge child branch')

        os.chdir('..')

        b = wt.branch

        lf = LogCatcher()

        lf.supports_merge_revisions = True

        log.show_log(b, lf, verbose=True)

        revs = lf.revisions

        self.assertEqual(3, len(revs))

        logentry = revs[0]

        self.assertEqual('2', logentry.revno)

        self.assertEqual('merge child branch', logentry.rev.message)

        self.checkDelta(logentry.delta, removed=['file1'], modified=['file2'])

        logentry = revs[1]

        self.assertEqual('1.1.1', logentry.revno)

        self.assertEqual('remove file1 and modify file2', logentry.rev.message)

        self.checkDelta(logentry.delta, removed=['file1'], modified=['file2'])

        logentry = revs[2]

        self.assertEqual('1', logentry.revno)

        self.assertEqual('add file1 and file2', logentry.rev.message)

        self.checkDelta(logentry.delta, added=['file1', 'file2'])

def make_commits_with_trailing_newlines(wt):

    """Helper method for LogFormatter tests"""

    b = wt.branch

    b.nick='test'

    open('a', 'wb').write('hello moto\n')

    wt.add('a')

    wt.commit('simple log message', rev_id='a1',

              timestamp=1132586655.459960938, timezone=-6*3600,

              committer='Joe Foo <joe@foo.com>')

    open('b', 'wb').write('goodbye\n')

    wt.add('b')

    wt.commit('multiline\nlog\nmessage\n', rev_id='a2',

              timestamp=1132586842.411175966, timezone=-6*3600,

              committer='Joe Foo <joe@foo.com>',

              authors=['Joe Bar <joe@bar.com>'])

    open('c', 'wb').write('just another manic monday\n')

    wt.add('c')

    wt.commit('single line with trailing newline\n', rev_id='a3',

              timestamp=1132587176.835228920, timezone=-6*3600,

              committer = 'Joe Foo <joe@foo.com>')

    return b

def normalize_log(log):

    """Replaces the variable lines of logs with fixed lines"""

    author = 'author: Dolor Sit <test@example.com>'

    committer = 'committer: Lorem Ipsum <test@example.com>'

    lines = log.splitlines(True)

    for idx,line in enumerate(lines):

        stripped_line = line.lstrip()

        indent = ' ' * (len(line) - len(stripped_line))

        if stripped_line.startswith('author:'):

            lines[idx] = indent + author + '\n'

        elif stripped_line.startswith('committer:'):

            lines[idx] = indent + committer + '\n'

        elif stripped_line.startswith('timestamp:'):

            lines[idx] = indent + 'timestamp: Just now\n'

    return ''.join(lines)

class TestShortLogFormatter(tests.TestCaseWithTransport):

    def test_trailing_newlines(self):

        wt = self.make_branch_and_tree('.')

        b = make_commits_with_trailing_newlines(wt)

        sio = self.make_utf8_encoded_stringio()

        lf = log.ShortLogFormatter(to_file=sio)

        log.show_log(b, lf)

        self.assertEqualDiff("""\

    3 Joe Foo\t2005-11-21

      single line with trailing newline

    2 Joe Bar\t2005-11-21

      multiline

      log

      message

    1 Joe Foo\t2005-11-21

      simple log message

""",

                             sio.getvalue())

    def _prepare_tree_with_merges(self, with_tags=False):

        wt = self.make_branch_and_memory_tree('.')

        wt.lock_write()

        self.addCleanup(wt.unlock)

        wt.add('')

        wt.commit('rev-1', rev_id='rev-1',

                  timestamp=1132586655, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.commit('rev-merged', rev_id='rev-2a',

                  timestamp=1132586700, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.set_parent_ids(['rev-1', 'rev-2a'])

        wt.branch.set_last_revision_info(1, 'rev-1')

        wt.commit('rev-2', rev_id='rev-2b',

                  timestamp=1132586800, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        if with_tags:

            branch = wt.branch

            branch.tags.set_tag('v0.2', 'rev-2b')

            wt.commit('rev-3', rev_id='rev-3',

                      timestamp=1132586900, timezone=36000,

                      committer='Jane Foo <jane@foo.com>')

            branch.tags.set_tag('v1.0rc1', 'rev-3')

            branch.tags.set_tag('v1.0', 'rev-3')

        return wt

    def test_short_log_with_merges(self):

        wt = self._prepare_tree_with_merges()

        logfile = self.make_utf8_encoded_stringio()

        formatter = log.ShortLogFormatter(to_file=logfile)

        log.show_log(wt.branch, formatter)

        self.assertEqualDiff("""\

    2 Joe Foo\t2005-11-22 [merge]

      rev-2

    1 Joe Foo\t2005-11-22

      rev-1

""",

                             logfile.getvalue())

    def test_short_log_with_merges_and_advice(self):

        wt = self._prepare_tree_with_merges()

        logfile = self.make_utf8_encoded_stringio()

        formatter = log.ShortLogFormatter(to_file=logfile,

            show_advice=True)

        log.show_log(wt.branch, formatter)

        self.assertEqualDiff("""\

    2 Joe Foo\t2005-11-22 [merge]

      rev-2

    1 Joe Foo\t2005-11-22

      rev-1

Use --include-merges or -n0 to see merged revisions.

""",

                             logfile.getvalue())

    def test_short_log_with_merges_and_range(self):

        wt = self.make_branch_and_memory_tree('.')

        wt.lock_write()

        self.addCleanup(wt.unlock)

        wt.add('')

        wt.commit('rev-1', rev_id='rev-1',

                  timestamp=1132586655, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.commit('rev-merged', rev_id='rev-2a',

                  timestamp=1132586700, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.branch.set_last_revision_info(1, 'rev-1')

        wt.set_parent_ids(['rev-1', 'rev-2a'])

        wt.commit('rev-2b', rev_id='rev-2b',

                  timestamp=1132586800, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.commit('rev-3a', rev_id='rev-3a',

                  timestamp=1132586800, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.branch.set_last_revision_info(2, 'rev-2b')

        wt.set_parent_ids(['rev-2b', 'rev-3a'])

        wt.commit('rev-3b', rev_id='rev-3b',

                  timestamp=1132586800, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        logfile = self.make_utf8_encoded_stringio()

        formatter = log.ShortLogFormatter(to_file=logfile)

        log.show_log(wt.branch, formatter,

            start_revision=2, end_revision=3)

        self.assertEqualDiff("""\

    3 Joe Foo\t2005-11-22 [merge]

      rev-3b

    2 Joe Foo\t2005-11-22 [merge]

      rev-2b

""",

                             logfile.getvalue())

    def test_short_log_with_tags(self):

        wt = self._prepare_tree_with_merges(with_tags=True)

        logfile = self.make_utf8_encoded_stringio()

        formatter = log.ShortLogFormatter(to_file=logfile)

        log.show_log(wt.branch, formatter)

        self.assertEqualDiff("""\

    3 Jane Foo\t2005-11-22 {v1.0, v1.0rc1}

      rev-3

    2 Joe Foo\t2005-11-22 {v0.2} [merge]

      rev-2

    1 Joe Foo\t2005-11-22

      rev-1

""",

                             logfile.getvalue())

    def test_short_log_single_merge_revision(self):

        wt = self.make_branch_and_memory_tree('.')

        wt.lock_write()

        self.addCleanup(wt.unlock)

        wt.add('')

        wt.commit('rev-1', rev_id='rev-1',

                  timestamp=1132586655, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.commit('rev-merged', rev_id='rev-2a',

                  timestamp=1132586700, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.set_parent_ids(['rev-1', 'rev-2a'])

        wt.branch.set_last_revision_info(1, 'rev-1')

        wt.commit('rev-2', rev_id='rev-2b',

                  timestamp=1132586800, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        logfile = self.make_utf8_encoded_stringio()

        formatter = log.ShortLogFormatter(to_file=logfile)

        revspec = revisionspec.RevisionSpec.from_string('1.1.1')

        wtb = wt.branch

        rev = revspec.in_history(wtb)

        log.show_log(wtb, formatter, start_revision=rev, end_revision=rev)

        self.assertEqualDiff("""\

      1.1.1 Joe Foo\t2005-11-22

            rev-merged

""",

                             logfile.getvalue())

class TestShortLogFormatterWithMergeRevisions(tests.TestCaseWithTransport):

    def test_short_merge_revs_log_with_merges(self):

        wt = self.make_branch_and_memory_tree('.')

        wt.lock_write()

        self.addCleanup(wt.unlock)

        wt.add('')

        wt.commit('rev-1', rev_id='rev-1',

                  timestamp=1132586655, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.commit('rev-merged', rev_id='rev-2a',

                  timestamp=1132586700, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.set_parent_ids(['rev-1', 'rev-2a'])

        wt.branch.set_last_revision_info(1, 'rev-1')

        wt.commit('rev-2', rev_id='rev-2b',

                  timestamp=1132586800, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        logfile = self.make_utf8_encoded_stringio()

        formatter = log.ShortLogFormatter(to_file=logfile, levels=0)

        log.show_log(wt.branch, formatter)

        # Note that the 1.1.1 indenting is in fact correct given that

        # the revision numbers are right justified within 5 characters

        # for mainline revnos and 9 characters for dotted revnos.

        self.assertEqualDiff("""\

    2 Joe Foo\t2005-11-22 [merge]

      rev-2

          1.1.1 Joe Foo\t2005-11-22

                rev-merged

    1 Joe Foo\t2005-11-22

      rev-1

""",

                             logfile.getvalue())

    def test_short_merge_revs_log_single_merge_revision(self):

        wt = self.make_branch_and_memory_tree('.')

        wt.lock_write()

        self.addCleanup(wt.unlock)

        wt.add('')

        wt.commit('rev-1', rev_id='rev-1',

                  timestamp=1132586655, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.commit('rev-merged', rev_id='rev-2a',

                  timestamp=1132586700, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        wt.set_parent_ids(['rev-1', 'rev-2a'])

        wt.branch.set_last_revision_info(1, 'rev-1')

        wt.commit('rev-2', rev_id='rev-2b',

                  timestamp=1132586800, timezone=36000,

                  committer='Joe Foo <joe@foo.com>')

        logfile = self.make_utf8_encoded_stringio()

        formatter = log.ShortLogFormatter(to_file=logfile, levels=0)

        revspec = revisionspec.RevisionSpec.from_string('1.1.1')

        wtb = wt.branch

        rev = revspec.in_history(wtb)

        log.show_log(wtb, formatter, start_revision=rev, end_revision=rev)

        self.assertEqualDiff("""\

      1.1.1 Joe Foo\t2005-11-22

            rev-merged

""",

                             logfile.getvalue())

class TestLongLogFormatter(TestCaseWithoutPropsHandler):

    def test_verbose_log(self):

        """Verbose log includes changed files

        bug #4676

        """

        wt = self.make_branch_and_tree('.')

        b = wt.branch

        self.build_tree(['a'])

        wt.add('a')

        # XXX: why does a longer nick show up?

        b.nick = 'test_verbose_log'

        wt.commit(message='add a',

                  timestamp=1132711707,

                  timezone=36000,

                  committer='Lorem Ipsum <test@example.com>')

        logfile = file('out.tmp', 'w+')

        formatter = log.LongLogFormatter(to_file=logfile)

        log.show_log(b, formatter, verbose=True)

        logfile.flush()

        logfile.seek(0)

        log_contents = logfile.read()

        self.assertEqualDiff('''\

------------------------------------------------------------

revno: 1

committer: Lorem Ipsum <test@example.com>

branch nick: test_verbose_log

timestamp: Wed 2005-11-23 12:08:27 +1000

message:

  add a

added:

  a

''',

                             log_contents)

    def test_merges_are_indented_by_level(self):

        wt = self.make_branch_and_tree('parent')

        wt.commit('first post')

        self.run_bzr('branch parent child')

        self.run_bzr(['commit', '-m', 'branch 1', '--unchanged', 'child'])

        self.run_bzr('branch child smallerchild')

        self.run_bzr(['commit', '-m', 'branch 2', '--unchanged',

            'smallerchild'])

        os.chdir('child')

        self.run_bzr('merge ../smallerchild')

        self.run_bzr(['commit', '-m', 'merge branch 2'])

        os.chdir('../parent')

        self.run_bzr('merge ../child')

        wt.commit('merge branch 1')

        b = wt.branch

        sio = self.make_utf8_encoded_stringio()

        lf = log.LongLogFormatter(to_file=sio, levels=0)

        log.show_log(b, lf, verbose=True)

        the_log = normalize_log(sio.getvalue())

        self.assertEqualDiff("""\

------------------------------------------------------------

revno: 2 [merge]

committer: Lorem Ipsum <test@example.com>

branch nick: parent

timestamp: Just now

message:

  merge branch 1

    ------------------------------------------------------------

    revno: 1.1.2 [merge]

    committer: Lorem Ipsum <test@example.com>

    branch nick: child

    timestamp: Just now

    message:

      merge branch 2

        ------------------------------------------------------------

        revno: 1.2.1

        committer: Lorem Ipsum <test@example.com>

        branch nick: smallerchild

        timestamp: Just now

        message:

          branch 2

    ------------------------------------------------------------

    revno: 1.1.1

    committer: Lorem Ipsum <test@example.com>

    branch nick: child

    timestamp: Just now

    message:

      branch 1

------------------------------------------------------------

revno: 1

committer: Lorem Ipsum <test@example.com>

branch nick: parent

timestamp: Just now

message:

  first post

""",

                             the_log)

    def test_verbose_merge_revisions_contain_deltas(self):

        wt = self.make_branch_and_tree('parent')

        self.build_tree(['parent/f1', 'parent/f2'])

        wt.add(['f1','f2'])

        wt.commit('first post')

        self.run_bzr('branch parent child')

        os.unlink('child/f1')

        file('child/f2', 'wb').write('hello\n')

        self.run_bzr(['commit', '-m', 'removed f1 and modified f2',

            'child'])

        os.chdir('parent')

        self.run_bzr('merge ../child')

        wt.commit('merge branch 1')

        b = wt.branch

        sio = self.make_utf8_encoded_stringio()

        lf = log.LongLogFormatter(to_file=sio, levels=0)

        log.show_log(b, lf, verbose=True)

        the_log = normalize_log(sio.getvalue())

        self.assertEqualDiff("""\

------------------------------------------------------------

revno: 2 [merge]

committer: Lorem Ipsum <test@example.com>

branch nick: parent

timestamp: Just now

message:

  merge branch 1

removed:

  f1

modified:

  f2

    ------------------------------------------------------------

    revno: 1.1.1

    committer: Lorem Ipsum <test@example.com>

    branch nick: child

    timestamp: Just now

    message:

      removed f1 and modified f2

    removed:

      f1

    modified:

      f2

------------------------------------------------------------

revno: 1

committer: Lorem Ipsum <test@example.com>

branch nick: parent

timestamp: Just now

message:

  first post