← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-11-20 06:44:32 UTC
  • mfrom: (4816.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091120064432-kq66yp5jkffi1ijo
(igc) Trivial formatting fix to merge help

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
65
65
    merge,
66
66
    revision as _mod_revision,
67
67
    revisiontree,
 
68
    textui,
68
69
    trace,
69
70
    transform,
70
71
    ui,
1947
1948
 
1948
1949
        new_files=set()
1949
1950
        unknown_nested_files=set()
1950
 
        if to_file is None:
1951
 
            to_file = sys.stdout
1952
1951
 
1953
1952
        def recurse_directory_to_add_files(directory):
1954
1953
            # Recurse directory and add all files
2024
2023
                        new_status = 'I'
2025
2024
                    else:
2026
2025
                        new_status = '?'
2027
 
                    # XXX: Really should be a more abstract reporter interface
2028
 
                    kind_ch = osutils.kind_marker(self.kind(fid))
2029
 
                    to_file.write(new_status + '       ' + f + kind_ch + '\n')
 
2026
                    textui.show_status(new_status, self.kind(fid), f,
 
2027
                                       to_file=to_file)
2030
2028
                # Unversion file
2031
2029
                inv_delta.append((f, None, fid, None))
2032
2030
                message = "removed %s" % (f,)