/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_commit.py

  • Committer: Vincent Ladeuil
  • Date: 2008-12-10 09:33:06 UTC
  • mto: (3941.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3942.
  • Revision ID: v.ladeuil+lp@free.fr-20081210093306-j4l1wiesc76519fy
Make the filter work for paths and file ids.

* bzrlib/tests/test_delta.py:
(TestDeltaShow): Fix failing tests, the previous commit was wrong.
(TestDeltaShow._get_delta): Baah, fix status outputs.
(TestDeltaShow.test_delta_show_short_status_single_file_id_filter):
Test for file id filter.

* bzrlib/delta.py:
(TreeDelta): Rename path_filter to filter and pass it the file id
too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
18
from bzrlib import (
53
53
        # commit do not provide a directory parameter, we have to change dir
54
54
        # manually
55
55
        os.chdir('local')
56
 
        self.assertRaises(errors.BoundBranchOutOfDate, commit.run,
 
56
        # cmd_commit translates BoundBranchOutOfDate into BzrCommandError
 
57
        self.assertRaises(errors.BzrCommandError, commit.run,
57
58
                          message=u'empty commit', unchanged=True)
58
59
        self.assertEquals(1, len(self.connections))
59
60