/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Aaron Bentley
  • Date: 2008-02-24 17:19:56 UTC
  • mto: This revision was merged to the branch mainline in revision 3235.
  • Revision ID: aaron@aaronbentley.com-20080224171956-0qu73pf4pol2utu4
Clean error if filesystem does not support hard-links

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1322
1322
            else:
1323
1323
                parents_list = [(revision_id, basis)]
1324
1324
            basis.lock_read()
1325
 
            wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1326
 
            wt.flush()
1327
 
            # if the basis has a root id we have to use that; otherwise we use
1328
 
            # a new random one
1329
 
            basis_root_id = basis.get_root_id()
1330
 
            if basis_root_id is not None:
1331
 
                wt._set_root_id(basis_root_id)
 
1325
            try:
 
1326
                wt.set_parent_trees(parents_list, allow_leftmost_as_ghost=True)
1332
1327
                wt.flush()
1333
 
            transform.build_tree(basis, wt, accelerator_tree,
1334
 
                                 hardlink=hardlink)
1335
 
            basis.unlock()
 
1328
                # if the basis has a root id we have to use that; otherwise we
 
1329
                # use a new random one
 
1330
                basis_root_id = basis.get_root_id()
 
1331
                if basis_root_id is not None:
 
1332
                    wt._set_root_id(basis_root_id)
 
1333
                    wt.flush()
 
1334
                transform.build_tree(basis, wt, accelerator_tree,
 
1335
                                     hardlink=hardlink)
 
1336
            finally:
 
1337
                basis.unlock()
1336
1338
        finally:
1337
1339
            control_files.unlock()
1338
1340
            wt.unlock()