← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: John Arbash Meinel
  • Date: 2005-09-16 14:57:59 UTC
  • mto: (1393.2.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050916145758-ad06c9ae86840f17
Merged up-to-date against mainline, still broken.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
64
64
    Returns the number of files added.
65
65
    """
66
66
    file_list = _prepare_file_list(file_list)
67
 
    b = Branch(file_list[0], find_root=True)
 
67
    b = Branch.open_containing(file_list[0])
68
68
    return smart_add_branch(b, file_list, recurse, reporter)
69
69
 
70
70
        
112
112
 
113
113
        if kind == 'directory':
114
114
            try:
115
 
                sub_branch = Branch(af, find_root=False)
 
115
                sub_branch = Branch.open(af)
116
116
                sub_tree = True
117
117
            except NotBranchError:
118
118
                sub_tree = False