← Back to branch summary

~ubuntu-branches/ubuntu/natty/bzr/natty-proposed

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.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
Tags: 2.2.0-1
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_foreign.py
90
90
        self._format = _format
91
91
        self._base = a_bzrdir.transport.base
92
92
        self._ignore_fallbacks = False
 
93
        self.bzrdir = a_bzrdir
93
94
        foreign.ForeignBranch.__init__(self, 
94
95
            DummyForeignVcsMapping(DummyForeignVcs()))
95
96
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
171
172
        super(DummyForeignVcsBranchFormat, self).__init__()
172
173
        self._matchingbzrdir = DummyForeignVcsDirFormat()
173
174
 
174
 
    def open(self, a_bzrdir, _found=False):
 
175
    def open(self, a_bzrdir, name=None, _found=False):
175
176
        if not _found:
176
177
            raise NotImplementedError
177
178
        try:
178
 
            transport = a_bzrdir.get_branch_transport(None)
 
179
            transport = a_bzrdir.get_branch_transport(None, name=name)
179
180
            control_files = lockable_files.LockableFiles(transport, 'lock',
180
181
                                                         lockdir.LockDir)
181
182
            return DummyForeignVcsBranch(_format=self,
243
244
        self._control_files = lockable_files.LockableFiles(self.transport,
244
245
            "lock", lockable_files.TransportLock)
245
246
 
246
 
    def open_branch(self, ignore_fallbacks=True):
 
247
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
 
248
        if name is not None:
 
249
            raise errors.NoColocatedBranchSupport(self)
247
250
        return self._format.get_branch_format().open(self, _found=True)
248
251
 
249
252
    def cloning_metadir(self, stacked=False):