← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
126
126
    def __fetch(self):
127
127
        """Primary worker function.
128
128
 
129
 
        This initialises all the needed variables, and then fetches the 
 
129
        This initialises all the needed variables, and then fetches the
130
130
        requested revisions, finally clearing the progress bar.
131
131
        """
132
132
        # Roughly this is what we're aiming for fetch to become:
318
318
 
319
319
class Inter1and2Helper(object):
320
320
    """Helper for operations that convert data from model 1 and 2
321
 
    
 
321
 
322
322
    This is for use by fetchers and converters.
323
323
    """
324
324