~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Robert Collins
  • Date: 2007-07-02 22:36:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2581.
  • Revision ID: robertc@robertcollins.net-20070702223611-50tnzmbeoryqid75
* New method ``_glob_expand_file_list_if_needed`` on the ``Command`` class
  for dealing with unexpanded glob lists - e.g. on the win32 platform. This
  was moved from ``bzrlib.add._prepare_file_list``. (Robert Collins)

* ``bzrlib.add.smart_add_tree`` will no longer perform glob expansion on
  win32. Callers of the function should do this. (Robert Collins)

* ``bzrlib.add.glob_expand_for_win32`` is now
  ``bzrlib.win32utils.glob_expand``.  (Robert Collins)

* ``bzrlib.smart_add`` is deprecated. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
384
384
        if base_tree:
385
385
            base_tree.lock_read()
386
386
        try:
387
 
            added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
388
 
                action=action, save=not dry_run)
 
387
            file_list = self._glob_expand_file_list_if_needed(file_list)
 
388
            if file_list:
 
389
                tree = WorkingTree.open_containing(file_list[0])[0]
 
390
            else:
 
391
                tree = WorkingTree.open_containing(u'.')[0]
 
392
            added, ignored = bzrlib.add.smart_add_tree(tree, file_list, not
 
393
                no_recurse, action=action, save=not dry_run)
389
394
        finally:
390
395
            if base_tree is not None:
391
396
                base_tree.unlock()