← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Robert Collins
  • Date: 2005-09-28 05:25:54 UTC
  • mfrom: (1185.1.42)
  • mto: (1092.2.18)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20050928052554-beb985505f77ea6a
update symlink branch to integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
22
22
 
23
23
def glob_expand_for_win32(file_list):
24
24
    import glob
25
 
    
26
25
    expanded_file_list = []
27
26
    for possible_glob in file_list:
28
27
        glob_files = glob.glob(possible_glob)
64
63
    Returns the number of files added.
65
64
    """
66
65
    file_list = _prepare_file_list(file_list)
67
 
    b = Branch(file_list[0], find_root=True)
 
66
    b = Branch.open_containing(file_list[0])
68
67
    return smart_add_branch(b, file_list, recurse, reporter)
69
68
 
70
69
        
112
111
 
113
112
        if kind == 'directory':
114
113
            try:
115
 
                sub_branch = Branch(af, find_root=False)
 
114
                sub_branch = Branch.open(af)
116
115
                sub_tree = True
117
116
            except NotBranchError:
118
117
                sub_tree = False