← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
16
16
 
17
17
"""Helper functions for adding files to working trees."""
18
18
 
19
 
import errno
20
 
import os
21
19
import sys
22
20
 
23
21
import bzrlib.bzrdir
24
 
import bzrlib.errors as errors
25
22
import bzrlib.osutils
26
23
from bzrlib.symbol_versioning import *
27
 
from bzrlib.workingtree import WorkingTree
28
24
 
29
25
 
30
26
class AddAction(object):
35
31
 
36
32
        :param to_file: The stream to write into. This is expected to take
37
33
            Unicode paths. If not supplied, it will default to ``sys.stdout``.
38
 
        :param should_print: If False, printing will be supressed.
 
34
        :param should_print: If False, printing will be suppressed.
39
35
        """
40
36
        self._to_file = to_file
41
37
        if to_file is None: