← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/__init__.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/tests/tree_implementations/__init__.py
125
125
 
126
126
    def get_tree_no_parents_no_content(self, empty_tree, converter=None):
127
127
        """Make a tree with no parents and no contents from empty_tree.
128
 
        
 
128
 
129
129
        :param empty_tree: A working tree with no content and no parents to
130
130
            modify.
131
131
        """
147
147
 
148
148
    def get_tree_no_parents_abc_content_2(self, tree, converter=None):
149
149
        """return a test tree with a, b/, b/c contents.
150
 
        
 
150
 
151
151
        This variation changes the content of 'a' to foobar\n.
152
152
        """
153
153
        self._make_abc_tree(tree)
160
160
 
161
161
    def get_tree_no_parents_abc_content_3(self, tree, converter=None):
162
162
        """return a test tree with a, b/, b/c contents.
163
 
        
 
163
 
164
164
        This variation changes the executable flag of b/c to True.
165
165
        """
166
166
        self._make_abc_tree(tree)
172
172
 
173
173
    def get_tree_no_parents_abc_content_4(self, tree, converter=None):
174
174
        """return a test tree with d, b/, b/c contents.
175
 
        
 
175
 
176
176
        This variation renames a to d.
177
177
        """
178
178
        self._make_abc_tree(tree)
181
181
 
182
182
    def get_tree_no_parents_abc_content_5(self, tree, converter=None):
183
183
        """return a test tree with d, b/, b/c contents.
184
 
        
 
184
 
185
185
        This variation renames a to d and alters its content to 'bar\n'.
186
186
        """
187
187
        self._make_abc_tree(tree)
195
195
 
196
196
    def get_tree_no_parents_abc_content_6(self, tree, converter=None):
197
197
        """return a test tree with a, b/, e contents.
198
 
        
 
198
 
199
199
        This variation renames b/c to e, and makes it executable.
200
200
        """
201
201
        self._make_abc_tree(tree)
235
235
        where each component has the type of its name -
236
236
        i.e. '1file..' is afile.
237
237
 
238
 
        note that the order of the paths and fileids is deliberately 
 
238
        note that the order of the paths and fileids is deliberately
239
239
        mismatched to ensure that the result order is path based.
240
240
        """
241
241
        tree = self.make_branch_and_tree('.')