← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 19:20:57 UTC
  • mfrom: (4988.10.5 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100210192057-uvi7tmdubcvh9xpo
(Michal Junák) Bug #511987, support 'bzr export FILE'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
"""Helper functions for adding files to working trees."""
18
18
 
 
19
import errno
 
20
import os
19
21
import sys
20
22
 
21
 
from bzrlib import (
22
 
    osutils,
23
 
    )
 
23
import bzrlib.bzrdir
 
24
import bzrlib.errors as errors
 
25
import bzrlib.osutils
 
26
from bzrlib.symbol_versioning import *
 
27
from bzrlib.workingtree import WorkingTree
24
28
 
25
29
 
26
30
class AddAction(object):
40
44
        if should_print is not None:
41
45
            self.should_print = should_print
42
46
 
43
 
    def __call__(self, inv, parent_ie, path, kind, _quote=osutils.quotefn):
 
47
    def __call__(self, inv, parent_ie, path, kind, _quote=bzrlib.osutils.quotefn):
44
48
        """Add path to inventory.
45
49
 
46
50
        The default action does nothing.
50
54
        :param kind: The kind of the object being added.
51
55
        """
52
56
        if self.should_print:
53
 
            self._to_file.write('adding %s\n' % _quote(path))
 
57
            self._to_file.write('adding %s\n' % _quote(path.raw_path))
54
58
        return None
55
59
 
56
60
 
70
74
        if file_id is not None:
71
75
            if self.should_print:
72
76
                self._to_file.write('adding %s w/ file id from %s\n'
73
 
                                    % (path, base_path))
 
77
                                    % (path.raw_path, base_path))
74
78
        else:
75
79
            # we aren't doing anything special, so let the default
76
80
            # reporter happen
86
90
        Else, we look for an entry in the base tree with the same path.
87
91
        """
88
92
 
89
 
        if self.base_tree.has_id(parent_ie.file_id):
 
93
        if (parent_ie.file_id in self.base_tree):
90
94
            base_parent_ie = self.base_tree.inventory[parent_ie.file_id]
91
 
            base_child_ie = base_parent_ie.children.get(
92
 
                osutils.basename(path))
 
95
            base_child_ie = base_parent_ie.children.get(path.base_path)
93
96
            if base_child_ie is not None:
94
97
                return (base_child_ie.file_id,
95
98
                        self.base_tree.id2path(base_child_ie.file_id))
96
 
        full_base_path = osutils.pathjoin(self.base_path, path)
 
99
        full_base_path = bzrlib.osutils.pathjoin(self.base_path, path.raw_path)
97
100
        # This may return None, but it is our last attempt
98
101
        return self.base_tree.path2id(full_base_path), full_base_path
 
102
 
 
103
 
 
104
# TODO: jam 20050105 These could be used for compatibility
 
105
#       however, they bind against the current stdout, not the
 
106
#       one which exists at the time they are called, so they
 
107
#       don't work for the test suite.
 
108
# deprecated
 
109
add_action_add = AddAction()
 
110
add_action_null = add_action_add
 
111
add_action_add_and_print = AddAction(should_print=True)
 
112
add_action_print = add_action_add_and_print