← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/repository.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-13 23:06:42 UTC
  • mfrom: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: john@arbash-meinel.com-20100113230642-gr0vg8u3qyzz3p2b
Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/repository.py
1
 
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
41
41
    osutils,
42
42
    revision as _mod_revision,
43
43
    symbol_versioning,
 
44
    trace,
44
45
    tsort,
45
46
    ui,
46
47
    versionedfile,
4008
4009
        """See InterRepository.fetch()."""
4009
4010
        if fetch_spec is not None:
4010
4011
            raise AssertionError("Not implemented yet...")
 
4012
        # See <https://launchpad.net/bugs/456077> asking for a warning here
 
4013
        #
 
4014
        # nb this is only active for local-local fetches; other things using
 
4015
        # streaming.
 
4016
        trace.warning("Fetching between repositories with different formats\n"
 
4017
            "from %s to %s.\n"
 
4018
            "This may take some time. Upgrade the branches to the same format \n"
 
4019
            "for better results.\n"
 
4020
            % (self.source._format, self.target._format))
4011
4021
        if (not self.source.supports_rich_root()
4012
4022
            and self.target.supports_rich_root()):
4013
4023
            self._converting_to_rich_root = True