/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
1
# Copyright (C) 2005, 2006 Canonical
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
2012.1.2 by Aaron Bentley
reimplement compare_trees
17
from bzrlib import errors
1399.1.3 by Robert Collins
move change detection for text and metadata from delta to entry.detect_changes
18
from bzrlib.inventory import InventoryEntry
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
19
from bzrlib.trace import mutter
1904.2.1 by Martin Pool
compare_trees is deprecated in 0.9 not 0.10
20
from bzrlib.symbol_versioning import deprecated_function, zero_nine
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
21
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
22
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
23
class TreeDelta(object):
24
    """Describes changes from one tree to another.
25
26
    Contains four lists:
27
28
    added
29
        (path, id, kind)
30
    removed
31
        (path, id, kind)
32
    renamed
1398 by Robert Collins
integrate in Gustavos x-bit patch
33
        (oldpath, newpath, id, kind, text_modified, meta_modified)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
34
    modified
1398 by Robert Collins
integrate in Gustavos x-bit patch
35
        (path, id, kind, text_modified, meta_modified)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
36
    unchanged
37
        (path, id, kind)
38
39
    Each id is listed only once.
40
41
    Files that are both modified and renamed are listed only in
1092.2.6 by Robert Collins
symlink support updated to work
42
    renamed, with the text_modified flag true. The text_modified
43
    applies either to the the content of the file or the target of the
44
    symbolic link, depending of the kind of file.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
45
46
    Files are only considered renamed if their name has changed or
47
    their parent directory has changed.  Renaming a directory
48
    does not count as renaming all its contents.
49
50
    The lists are normally sorted when the delta is created.
51
    """
52
    def __init__(self):
53
        self.added = []
54
        self.removed = []
55
        self.renamed = []
56
        self.modified = []
57
        self.unchanged = []
58
59
    def __eq__(self, other):
60
        if not isinstance(other, TreeDelta):
61
            return False
62
        return self.added == other.added \
63
               and self.removed == other.removed \
64
               and self.renamed == other.renamed \
65
               and self.modified == other.modified \
66
               and self.unchanged == other.unchanged
67
68
    def __ne__(self, other):
69
        return not (self == other)
70
71
    def __repr__(self):
72
        return "TreeDelta(added=%r, removed=%r, renamed=%r, modified=%r," \
73
            " unchanged=%r)" % (self.added, self.removed, self.renamed,
74
            self.modified, self.unchanged)
75
76
    def has_changed(self):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
77
        return bool(self.modified
78
                    or self.added
79
                    or self.removed
80
                    or self.renamed)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
81
82
    def touches_file_id(self, file_id):
83
        """Return True if file_id is modified by this delta."""
84
        for l in self.added, self.removed, self.modified:
85
            for v in l:
86
                if v[1] == file_id:
87
                    return True
88
        for v in self.renamed:
89
            if v[2] == file_id:
90
                return True
91
        return False
92
            
93
94
    def show(self, to_file, show_ids=False, show_unchanged=False):
1780.2.1 by Robert Collins
Remove some unused imports.
95
        """output this delta in status-like form to to_file."""
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
96
        def show_list(files):
1398 by Robert Collins
integrate in Gustavos x-bit patch
97
            for item in files:
98
                path, fid, kind = item[:3]
99
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
100
                if kind == 'directory':
101
                    path += '/'
102
                elif kind == 'symlink':
103
                    path += '@'
1398 by Robert Collins
integrate in Gustavos x-bit patch
104
105
                if len(item) == 5 and item[4]:
106
                    path += '*'
107
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
108
                if show_ids:
109
                    print >>to_file, '  %-30s %s' % (path, fid)
110
                else:
111
                    print >>to_file, ' ', path
112
            
113
        if self.removed:
114
            print >>to_file, 'removed:'
115
            show_list(self.removed)
116
                
117
        if self.added:
118
            print >>to_file, 'added:'
119
            show_list(self.added)
120
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
121
        extra_modified = []
122
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
123
        if self.renamed:
124
            print >>to_file, 'renamed:'
1398 by Robert Collins
integrate in Gustavos x-bit patch
125
            for (oldpath, newpath, fid, kind,
126
                 text_modified, meta_modified) in self.renamed:
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
127
                if text_modified or meta_modified:
128
                    extra_modified.append((newpath, fid, kind,
129
                                           text_modified, meta_modified))
1398 by Robert Collins
integrate in Gustavos x-bit patch
130
                if meta_modified:
131
                    newpath += '*'
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
132
                if show_ids:
133
                    print >>to_file, '  %s => %s %s' % (oldpath, newpath, fid)
134
                else:
135
                    print >>to_file, '  %s => %s' % (oldpath, newpath)
136
                    
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
137
        if self.modified or extra_modified:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
138
            print >>to_file, 'modified:'
139
            show_list(self.modified)
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
140
            show_list(extra_modified)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
141
            
142
        if show_unchanged and self.unchanged:
143
            print >>to_file, 'unchanged:'
144
            show_list(self.unchanged)
145
146
1904.2.1 by Martin Pool
compare_trees is deprecated in 0.9 not 0.10
147
@deprecated_function(zero_nine)
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
148
def compare_trees(old_tree, new_tree, want_unchanged=False,
149
                  specific_files=None, extra_trees=None,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
150
                  require_versioned=False):
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
151
    """compare_trees was deprecated in 0.10. Please see Tree.changes_from."""
152
    return new_tree.changes_from(old_tree,
153
        want_unchanged=want_unchanged,
154
        specific_files=specific_files,
155
        extra_trees=extra_trees,
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
156
        require_versioned=require_versioned)
157
158
159
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids):
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
160
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
161
    delta = TreeDelta()
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
162
    # mutter('start compare_trees')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
163
2012.1.2 by Aaron Bentley
reimplement compare_trees
164
    root_id = new_tree.inventory.root.file_id
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
165
    # TODO: Rather than iterating over the whole tree and then filtering, we
166
    # could diff just the specified files (if any) and their subtrees.  
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
167
2012.1.2 by Aaron Bentley
reimplement compare_trees
168
    for (file_id, path, content_change, versioned, parent_id, name, kind,
169
         executable) in new_tree.iter_changes(old_tree, want_unchanged):
170
        if specific_file_ids and file_id not in specific_file_ids:
171
            continue
172
        if file_id == root_id:
173
            continue
174
        assert kind is None or None in kind
175
        # the only 'kind change' permitted is creation/deletion
176
        if kind is not None:
177
            new_kind = kind[1]
178
        else:
179
            try:
180
                new_kind = new_tree.kind(file_id)
181
            except errors.NoSuchFile:
182
                new_kind = None
183
1732.1.15 by John Arbash Meinel
Re-add the specific files handling to _compare_trees
184
        # If the name changes, or the parent_id changes, we have a rename
185
        # (if we move a parent, that doesn't count as a rename for the file)
2012.1.2 by Aaron Bentley
reimplement compare_trees
186
        if versioned is not None:
187
            if versioned == (False, True) and (kind is not None 
188
                                               and kind[1] is not None):
189
                delta.added.append((path, file_id, new_kind))
190
            else:
191
                assert versioned == (True, False)
192
                old_path = old_tree.id2path(file_id)
193
                old_kind = old_tree.kind(file_id)
194
                delta.removed.append((old_path, file_id, old_kind))
195
        elif kind is not None:
196
            if kind[0] is None:
197
                delta.added.append((path, file_id, new_kind))
198
            else:
199
                assert kind[1] is None
200
                old_path = old_tree.id2path(file_id)
201
                old_kind = old_tree.kind(file_id)
202
                delta.removed.append((old_path, file_id, old_kind))
203
                
204
        elif name is not None or parent_id is not None:
205
            old_path = old_tree.id2path(file_id)
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
206
            delta.renamed.append((old_path,
2012.1.2 by Aaron Bentley
reimplement compare_trees
207
                                  path,
208
                                  file_id, 
209
                                  new_kind,
210
                                  content_change, (executable is not None)))
211
        elif content_change is True or executable is not None:
212
            delta.modified.append((path, file_id, new_kind,
213
                                   content_change, (executable is not None)))
214
        else:
215
            delta.unchanged.append((path, file_id, new_kind))
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
216
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
217
    delta.removed.sort()
218
    delta.added.sort()
219
    delta.renamed.sort()
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
220
    # TODO: jam 20060529 These lists shouldn't need to be sorted
221
    #       since we added them in alphabetical order.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
222
    delta.modified.sort()
223
    delta.unchanged.sort()
224
225
    return delta