~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/selftest/test_ancestry.py

Committer: Martin Pool
Date: 2005-09-13 05:11:27 UTC
Revision ID: mbp@sourcefrog.net-20050913051127-47c500210200a219

- branch now tracks ancestry - all merged revisions

- new Branch.get_ancestry() returns them as a list

- basic test for this

- commit appends to ancestry (only for non-merge commits)

- clean up imports

files added:
bzrlib/selftest/test_ancestry.py

files modified:
bzrlib/branch.py

bzrlib/builtins.py

bzrlib/commit.py

Show diffs side-by-side

added added

removed removed

bzrlib/selftest/test_ancestry.py

# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

import sys

import os

from cStringIO import StringIO

from bzrlib.selftest import TestCase, TestCaseInTempDir

from bzrlib.branch import Branch

class TestAncestry(TestCaseInTempDir):

def test_straightline_ancestry(self):

"""Test ancestry file when just committing."""

b = Branch('.', init=True)

b.commit(message='one',

allow_pointless=True,

rev_id='tester@foo--1')

b.commit(message='two',

allow_pointless=True,

rev_id='tester@foo--2')

ancs = b.get_ancestry('tester@foo--2')

# TODO: check that ancestry is updated to include indirectly merged revisions

if __name__ == '__main__':

import unittest

sys.exit(unittest.main())

Older »