/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/builtins.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-10-17 14:01:12 UTC
  • mfrom: (2084 +trunk)
  • mto: (2145.1.1 keepalive)
  • mto: This revision was merged to the branch mainline in revision 2146.
  • Revision ID: v.ladeuil+lp@free.fr-20061017140112-8ae6aac456429ccf
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1
 
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
1291
1291
        for file_id in inv:
1292
1292
            if file_id in basis_inv:
1293
1293
                continue
 
1294
            if inv.is_root(file_id) and len(basis_inv) == 0:
 
1295
                continue
1294
1296
            path = inv.id2path(file_id)
1295
1297
            if not os.access(osutils.abspath(path), os.F_OK):
1296
1298
                continue
1503
1505
            tree = tree.branch.repository.revision_tree(
1504
1506
                revision[0].in_history(tree.branch).rev_id)
1505
1507
 
1506
 
        for fp, fc, kind, fid, entry in tree.list_files():
 
1508
        for fp, fc, kind, fid, entry in tree.list_files(include_root=False):
1507
1509
            if fp.startswith(relpath):
1508
1510
                fp = fp[len(relpath):]
1509
1511
                if non_recursive and '/' in fp:
2326
2328
                    for name, ie in tree.inventory.iter_entries(file_id):
2327
2329
                        interesting_ids.add(ie.file_id)
2328
2330
                new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
 
2331
            else:
 
2332
                restore_files = [c.path for c in conflicts]
2329
2333
            _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
2330
2334
            tree.set_conflicts(ConflictList(new_conflicts))
2331
 
            if file_list is None:
2332
 
                restore_files = list(tree.iter_conflicts())
2333
 
            else:
 
2335
            if file_list is not None:
2334
2336
                restore_files = file_list
2335
2337
            for filename in restore_files:
2336
2338
                try: