← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2007-02-16 07:02:19 UTC
  • mfrom: (2292 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20070216070219-b22k0gwnisnxawnk
Merged bzr.dev (17 tests failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
1430
1430
                yield stem
1431
1431
 
1432
1432
    @needs_write_lock
1433
 
    def pull(self, source, overwrite=False, stop_revision=None):
 
1433
    def pull(self, source, overwrite=False, stop_revision=None,
 
1434
             change_reporter=None):
1434
1435
        top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1435
1436
        source.lock_read()
1436
1437
        try:
1451
1452
                                new_basis_tree,
1452
1453
                                basis_tree,
1453
1454
                                this_tree=self,
1454
 
                                pb=pb)
 
1455
                                pb=pb,
 
1456
                                change_reporter=change_reporter)
1455
1457
                    if (basis_tree.inventory.root is None and
1456
1458
                        new_basis_tree.inventory.root is not None):
1457
1459
                        self.set_root_id(new_basis_tree.inventory.root.file_id)
2134
2136
            kind = 'tree-reference'
2135
2137
        return kind, executable, stat_value
2136
2138
 
 
2139
    def kind(self, file_id):
 
2140
        kind = WorkingTree3.kind(self, file_id)
 
2141
        if kind == 'directory':
 
2142
            entry = self.inventory[file_id]
 
2143
            if entry.kind == 'tree-reference':
 
2144
                kind = 'tree-reference'
 
2145
        return kind
 
2146
 
2137
2147
    def add_reference(self, sub_tree):
2138
2148
        try:
2139
2149
            sub_tree_path = self.relpath(sub_tree.basedir)