← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Andrew Bennetts
  • Date: 2010-07-28 08:12:09 UTC
  • mto: (5050.3.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100728081209-lxm2wbfksmypr7bz
Rename _Wrapper to _MergeTypeParameterizer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1814
1814
        self.show_base = False
1815
1815
        self.reprocess = False
1816
1816
        self.interesting_ids = None
1817
 
        self.merge_type = _Wrapper(MergeIntoMergeType,
1818
 
                                  target_subdir=self._target_subdir,
1819
 
                                  source_subpath=self._source_subpath)
 
1817
        self.merge_type = _MergeTypeParameterizer(MergeIntoMergeType,
 
1818
              target_subdir=self._target_subdir,
 
1819
              source_subpath=self._source_subpath)
1820
1820
        if self._source_subpath != '':
1821
1821
            # If this isn't a partial merge make sure the revisions will be
1822
1822
            # present.
1829
1829
        Merger.set_pending(self)
1830
1830
 
1831
1831
 
1832
 
class _Wrapper(object):
 
1832
class _MergeTypeParameterizer(object):
1833
1833
    """Wrap a merge-type class to provide extra parameters.
1834
1834
    
1835
1835
    This is hack used by MergeIntoMerger to pass some extra parameters to its