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

  • Committer: Martin Pool
  • Date: 2005-09-16 03:32:44 UTC
  • mfrom: (1185.1.23)
  • mto: (1185.8.2) (974.1.91)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: mbp@sourcefrog.net-20050916033244-18c4f4bcba663e42
- merge in many integration fixes from Robert

  * xml escaping of unprintable characters

  * 'make clean'

  * new, more consistent Branch constructors 

  * RemoteBranch tests against local farmework

  * scott's non-verbose commit fix 

This seems to break this usage though 

  bzr diff -r 1207..1208 ../bzr.robertc-integration

robertc@robertcollins.net-20050915175953-a16fdc627ce7c541

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