← Back to branch summary

~jelmer/ubuntu/maverick/bzr/2.2.5

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_workingtree.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-08-07 00:54:52 UTC
  • mfrom: (1.4.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100807005452-g4zb99ezl3xn44r4
http://bugs.debian.org/473450
http://bugs.debian.org/585193
https://launchpad.net/bugs/586926
https://launchpad.net/bugs/583941
http://bugs.debian.org/577110
http://bugs.debian.org/542105
https://launchpad.net/bugs/320035
https://launchpad.net/bugs/376388
https://launchpad.net/bugs/571467
https://launchpad.net/bugs/322767
https://launchpad.net/bugs/502076
https://launchpad.net/bugs/521989
https://launchpad.net/bugs/528041
* New upstream release.
 + Adds support for setting timestamps to originating revisions.
   Closes: #473450
 + Removes remaining string exception. Closes: #585193, LP: #586926
 + Add C extension to work around Python issue 1628205. LP: #583941,
   Closes: #577110
 + Avoids showing progress bars when --quiet is used. Closes: #542105,
   LP: #320035
 + No longer creates ~/.bazaar as root when run under sudo. LP: #376388
 + 'bzr commit' now supports -p as alternative for --show-diff. LP: #571467
 + 'bzr add' no longer adds .THIS/.BASE/.THEIRS files unless
   explicitly requested. LP: #322767
 + When parsing patch files, Bazaar now supports diff lines before each
   patch. LP: #502076
 + WorkingTrees now no longer requires using signal.signal, so can
   be used in a threaded environment. LP: #521989
 + An assertion error is no longer triggered when pushing to a pre-1.6
   Bazaar server. LP: #528041
* Bump standards version to 3.9.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_workingtree.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
22
22
    bzrdir,
23
23
    conflicts,
24
24
    errors,
 
25
    transport,
25
26
    workingtree,
26
27
    )
27
28
from bzrlib.branch import Branch
29
30
from bzrlib.lockdir import LockDir
30
31
from bzrlib.mutabletree import needs_tree_write_lock
31
32
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
32
 
from bzrlib.transport import get_transport
33
33
from bzrlib.workingtree import (
34
34
    TreeEntry,
35
35
    TreeDirectory,
138
138
            dir.create_repository()
139
139
            dir.create_branch()
140
140
            format.initialize(dir)
141
 
            t = get_transport(url)
 
141
            t = transport.get_transport(url)
142
142
            found_format = workingtree.WorkingTreeFormat.find_format(dir)
143
143
            self.failUnless(isinstance(found_format, format.__class__))
144
144
        check_format(workingtree.WorkingTreeFormat3(), "bar")
303
303
        self.assertEqual(
304
304
            'method_with_tree_write_lock',
305
305
            tree.method_with_tree_write_lock.__name__)
306
 
        self.assertEqual(
 
306
        self.assertDocstring(
307
307
            "A lock_tree_write decorated method that returns its arguments.",
308
 
            tree.method_with_tree_write_lock.__doc__)
 
308
            tree.method_with_tree_write_lock)
309
309
        args = (1, 2, 3)
310
310
        kwargs = {'a':'b'}
311
311
        result = tree.method_with_tree_write_lock(1,2,3, a='b')