/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/bundle/apply_bundle.py

  • Committer: Vincent Ladeuil
  • Date: 2007-06-06 14:26:08 UTC
  • mto: (2485.8.44 bzr.connection.sharing)
  • mto: This revision was merged to the branch mainline in revision 2646.
  • Revision ID: v.ladeuil+lp@free.fr-20070606142608-i9ufaqewadslf1cn
Finish sftp refactoring. Test suite passing.

* bzrlib/transport/sftp.py:
(clear_connection_cache): Deprecated.
(_sftp_connect, _sftp_connect_uncached): Deleted.
(SFTPTransport.__init__): Simplified.
(SFTPTransport._create_connection): New method. Copied from
_sftp_connect_uncached
(SFTPTransport._get_sftp): New method. Ensures that the connection
is established.
(SFTPTransport.clone): Deleted.
(SFTPTransport.has, SFTPTransport.get, SFTPTransport.readv,
SFTPTransport._put,
SFTPTransport._put_non_atomic_helper._open_and_write_file,
SFTPTransport._mkdir, SFTPTransport.append_file,
SFTPTransport.rename, SFTPTransport._rename_and_overwrite,
SFTPTransport.delete, SFTPTransport.rmdir, SFTPTransport.stat):
Use _get_sftp.

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_connection_error): Simplified now that sftp
does not connection on construction.

* bzrlib/tests/test_sftp_transport.py:
(SFTPLockTests.test_sftp_locks): Delete test_multiple_connections.
(FakeSFTPTransport): Deleted.
(SFTPNonServerTest.test_parse_url_with_home_dir,
SFTPNonServerTest.test_relpath,
SSHVendorBadConnection.test_bad_connection_paramiko): Delete the
from_transport parameter as it's not needed anymore.
(SFTPLatencyKnob.test_latency_knob_slows_transport,
SFTPLatencyKnob.test_default): Force connection by issuing a
request.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/apply_bundle.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
This contains functionality for installing bundles into repositories
18
18
"""
25
25
 
26
26
 
27
27
def install_bundle(repository, bundle_reader):
28
 
    custom_install = getattr(bundle_reader, 'install', None)
29
 
    if custom_install is not None:
30
 
        return custom_install(repository)
31
28
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
32
29
    repository.lock_write()
33
30
    try:
44
41
        pb.finished()
45
42
 
46
43
 
47
 
def merge_bundle(reader, tree, check_clean, merge_type,
 
44
def merge_bundle(reader, tree, check_clean, merge_type, 
48
45
                    reprocess, show_base, change_reporter=None):
49
46
    """Merge a revision bundle into the current tree."""
50
47
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
52
49
        pp = ProgressPhase("Merge phase", 6, pb)
53
50
        pp.next_phase()
54
51
        install_bundle(tree.branch.repository, reader)
55
 
        merger = Merger(tree.branch, this_tree=tree,
 
52
        merger = Merger(tree.branch, this_tree=tree, pb=pb,
56
53
                        change_reporter=change_reporter)
57
54
        merger.pp = pp
58
55
        merger.pp.next_phase()
59
 
        if check_clean and tree.has_changes():
60
 
            raise errors.UncommittedChanges(self)
 
56
        merger.check_basis(check_clean, require_commits=False)
61
57
        merger.other_rev_id = reader.target
62
58
        merger.other_tree = merger.revision_tree(reader.target)
63
59
        merger.other_basis = reader.target