/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-26 19:35:47 UTC
  • mfrom: (1813.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060626193547-43661d1377f72b4d
(robertc) Misc minor typos and the like.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
1
1
# Copyright (C) 2004, 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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
import errno
 
18
import os
 
19
import subprocess
 
20
import sys
 
21
import tempfile
 
22
import time
 
23
 
17
24
from bzrlib.delta import compare_trees
18
25
from bzrlib.errors import BzrError
19
26
import bzrlib.errors as errors
20
 
from bzrlib.symbol_versioning import *
21
 
from bzrlib.trace import mutter
 
27
import bzrlib.osutils
 
28
from bzrlib.patiencediff import unified_diff
 
29
import bzrlib.patiencediff
 
30
from bzrlib.symbol_versioning import (deprecated_function,
 
31
        zero_eight)
 
32
from bzrlib.textfile import check_text_lines
 
33
from bzrlib.trace import mutter, warning
 
34
 
22
35
 
23
36
# TODO: Rather than building a changeset object, we should probably
24
37
# invoke callbacks on an object.  That object can either accumulate a
25
38
# list, write them out directly, etc etc.
26
39
 
27
 
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file):
28
 
    import difflib
29
 
    
 
40
def internal_diff(old_filename, oldlines, new_filename, newlines, to_file,
 
41
                  allow_binary=False, sequence_matcher=None,
 
42
                  path_encoding='utf8'):
30
43
    # FIXME: difflib is wrong if there is no trailing newline.
31
44
    # The syntax used by patch seems to be "\ No newline at
32
45
    # end of file" following the last diff line from that
42
55
    # both sequences are empty.
43
56
    if not oldlines and not newlines:
44
57
        return
 
58
    
 
59
    if allow_binary is False:
 
60
        check_text_lines(oldlines)
 
61
        check_text_lines(newlines)
45
62
 
46
 
    ud = difflib.unified_diff(oldlines, newlines,
47
 
                              fromfile=old_filename+'\t', 
48
 
                              tofile=new_filename+'\t')
 
63
    if sequence_matcher is None:
 
64
        sequence_matcher = bzrlib.patiencediff.PatienceSequenceMatcher
 
65
    ud = unified_diff(oldlines, newlines,
 
66
                      fromfile=old_filename.encode(path_encoding),
 
67
                      tofile=new_filename.encode(path_encoding),
 
68
                      sequencematcher=sequence_matcher)
49
69
 
50
70
    ud = list(ud)
51
71
    # work-around for difflib being too smart for its own good
68
88
def external_diff(old_filename, oldlines, new_filename, newlines, to_file,
69
89
                  diff_opts):
70
90
    """Display a diff by calling out to the external diff program."""
71
 
    import sys
 
91
    if hasattr(to_file, 'fileno'):
 
92
        out_file = to_file
 
93
        have_fileno = True
 
94
    else:
 
95
        out_file = subprocess.PIPE
 
96
        have_fileno = False
72
97
    
73
 
    if to_file != sys.stdout:
74
 
        raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
75
 
                                  to_file)
76
 
 
77
98
    # make sure our own output is properly ordered before the diff
78
99
    to_file.flush()
79
100
 
80
 
    from tempfile import NamedTemporaryFile
81
 
    import os
82
 
 
83
 
    oldtmpf = NamedTemporaryFile()
84
 
    newtmpf = NamedTemporaryFile()
 
101
    oldtmp_fd, old_abspath = tempfile.mkstemp(prefix='bzr-diff-old-')
 
102
    newtmp_fd, new_abspath = tempfile.mkstemp(prefix='bzr-diff-new-')
 
103
    oldtmpf = os.fdopen(oldtmp_fd, 'wb')
 
104
    newtmpf = os.fdopen(newtmp_fd, 'wb')
85
105
 
86
106
    try:
87
107
        # TODO: perhaps a special case for comparing to or from the empty
94
114
        oldtmpf.writelines(oldlines)
95
115
        newtmpf.writelines(newlines)
96
116
 
97
 
        oldtmpf.flush()
98
 
        newtmpf.flush()
 
117
        oldtmpf.close()
 
118
        newtmpf.close()
99
119
 
100
120
        if not diff_opts:
101
121
            diff_opts = []
102
122
        diffcmd = ['diff',
103
 
                   '--label', old_filename+'\t',
104
 
                   oldtmpf.name,
105
 
                   '--label', new_filename+'\t',
106
 
                   newtmpf.name]
 
123
                   '--label', old_filename,
 
124
                   old_abspath,
 
125
                   '--label', new_filename,
 
126
                   new_abspath,
 
127
                   '--binary',
 
128
                  ]
107
129
 
108
130
        # diff only allows one style to be specified; they don't override.
109
131
        # note that some of these take optargs, and the optargs can be
129
151
        if diff_opts:
130
152
            diffcmd.extend(diff_opts)
131
153
 
132
 
        rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
 
154
        try:
 
155
            pipe = subprocess.Popen(diffcmd,
 
156
                                    stdin=subprocess.PIPE,
 
157
                                    stdout=out_file)
 
158
        except OSError, e:
 
159
            if e.errno == errno.ENOENT:
 
160
                raise errors.NoDiff(str(e))
 
161
            raise
 
162
        pipe.stdin.close()
 
163
 
 
164
        if not have_fileno:
 
165
            bzrlib.osutils.pumpfile(pipe.stdout, to_file)
 
166
        rc = pipe.wait()
133
167
        
134
168
        if rc != 0 and rc != 1:
135
169
            # returns 1 if files differ; that's OK
142
176
    finally:
143
177
        oldtmpf.close()                 # and delete
144
178
        newtmpf.close()
 
179
        # Clean up. Warn in case the files couldn't be deleted
 
180
        # (in case windows still holds the file open, but not
 
181
        # if the files have already been deleted)
 
182
        try:
 
183
            os.remove(old_abspath)
 
184
        except OSError, e:
 
185
            if e.errno not in (errno.ENOENT,):
 
186
                warning('Failed to delete temporary file: %s %s',
 
187
                        old_abspath, e)
 
188
        try:
 
189
            os.remove(new_abspath)
 
190
        except OSError:
 
191
            if e.errno not in (errno.ENOENT,):
 
192
                warning('Failed to delete temporary file: %s %s',
 
193
                        new_abspath, e)
145
194
 
146
195
 
147
196
@deprecated_function(zero_eight)
161
210
    supplies any two trees.
162
211
    """
163
212
    if output is None:
164
 
        import sys
165
213
        output = sys.stdout
166
214
 
167
215
    if from_spec is None:
184
232
 
185
233
 
186
234
def diff_cmd_helper(tree, specific_files, external_diff_options, 
187
 
                    old_revision_spec=None, new_revision_spec=None):
 
235
                    old_revision_spec=None, new_revision_spec=None,
 
236
                    old_label='a/', new_label='b/'):
188
237
    """Helper for cmd_diff.
189
238
 
190
239
   tree 
207
256
    The more general form is show_diff_trees(), where the caller
208
257
    supplies any two trees.
209
258
    """
210
 
    import sys
211
259
    output = sys.stdout
212
260
    def spec_tree(spec):
213
261
        revision_id = spec.in_store(tree.branch).rev_id
223
271
        new_tree = spec_tree(new_revision_spec)
224
272
 
225
273
    return show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
226
 
                           external_diff_options)
 
274
                           external_diff_options,
 
275
                           old_label=old_label, new_label=new_label)
227
276
 
228
277
 
229
278
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
230
 
                    external_diff_options=None):
 
279
                    external_diff_options=None,
 
280
                    old_label='a/', new_label='b/'):
231
281
    """Show in text form the changes from one tree to another.
232
282
 
233
283
    to_files
241
291
        new_tree.lock_read()
242
292
        try:
243
293
            return _show_diff_trees(old_tree, new_tree, to_file,
244
 
                                    specific_files, external_diff_options)
 
294
                                    specific_files, external_diff_options,
 
295
                                    old_label=old_label, new_label=new_label)
245
296
        finally:
246
297
            new_tree.unlock()
247
298
    finally:
249
300
 
250
301
 
251
302
def _show_diff_trees(old_tree, new_tree, to_file,
252
 
                     specific_files, external_diff_options):
253
 
 
254
 
    # TODO: Options to control putting on a prefix or suffix, perhaps
255
 
    # as a format string?
256
 
    old_label = 'a/'
257
 
    new_label = 'b/'
258
 
 
259
 
    DEVNULL = '/dev/null'
260
 
    # Windows users, don't panic about this filename -- it is a
261
 
    # special signal to GNU patch that the file should be created or
262
 
    # deleted respectively.
 
303
                     specific_files, external_diff_options, 
 
304
                     old_label='a/', new_label='b/' ):
 
305
 
 
306
    # GNU Patch uses the epoch date to detect files that are being added
 
307
    # or removed in a diff.
 
308
    EPOCH_DATE = '1970-01-01 00:00:00 +0000'
263
309
 
264
310
    # TODO: Generation of pseudo-diffs for added/deleted files could
265
311
    # be usefully made into a much faster special case.
280
326
    has_changes = 0
281
327
    for path, file_id, kind in delta.removed:
282
328
        has_changes = 1
283
 
        print >>to_file, '=== removed %s %r' % (kind, old_label + path)
284
 
        old_tree.inventory[file_id].diff(diff_file, old_label + path, old_tree,
285
 
                                         DEVNULL, None, None, to_file)
 
329
        print >>to_file, '=== removed %s %r' % (kind, path.encode('utf8'))
 
330
        old_name = '%s%s\t%s' % (old_label, path,
 
331
                                 _patch_header_date(old_tree, file_id, path))
 
332
        new_name = '%s%s\t%s' % (new_label, path, EPOCH_DATE)
 
333
        old_tree.inventory[file_id].diff(diff_file, old_name, old_tree,
 
334
                                         new_name, None, None, to_file)
286
335
    for path, file_id, kind in delta.added:
287
336
        has_changes = 1
288
 
        print >>to_file, '=== added %s %r' % (kind, new_label + path)
289
 
        new_tree.inventory[file_id].diff(diff_file, new_label + path, new_tree,
290
 
                                         DEVNULL, None, None, to_file, 
 
337
        print >>to_file, '=== added %s %r' % (kind, path.encode('utf8'))
 
338
        old_name = '%s%s\t%s' % (old_label, path, EPOCH_DATE)
 
339
        new_name = '%s%s\t%s' % (new_label, path,
 
340
                                 _patch_header_date(new_tree, file_id, path))
 
341
        new_tree.inventory[file_id].diff(diff_file, new_name, new_tree,
 
342
                                         old_name, None, None, to_file, 
291
343
                                         reverse=True)
292
344
    for (old_path, new_path, file_id, kind,
293
345
         text_modified, meta_modified) in delta.renamed:
294
346
        has_changes = 1
295
347
        prop_str = get_prop_change(meta_modified)
296
348
        print >>to_file, '=== renamed %s %r => %r%s' % (
297
 
                    kind, old_label + old_path, new_label + new_path, prop_str)
298
 
        _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
299
 
                                    new_label, new_path, new_tree,
 
349
                    kind, old_path.encode('utf8'),
 
350
                    new_path.encode('utf8'), prop_str)
 
351
        old_name = '%s%s\t%s' % (old_label, old_path,
 
352
                                 _patch_header_date(old_tree, file_id,
 
353
                                                    old_path))
 
354
        new_name = '%s%s\t%s' % (new_label, new_path,
 
355
                                 _patch_header_date(new_tree, file_id,
 
356
                                                    new_path))
 
357
        _maybe_diff_file_or_symlink(old_name, old_tree, file_id,
 
358
                                    new_name, new_tree,
300
359
                                    text_modified, kind, to_file, diff_file)
301
360
    for path, file_id, kind, text_modified, meta_modified in delta.modified:
302
361
        has_changes = 1
303
362
        prop_str = get_prop_change(meta_modified)
304
 
        print >>to_file, '=== modified %s %r%s' % (kind, old_label + path,
305
 
                    prop_str)
 
363
        print >>to_file, '=== modified %s %r%s' % (kind, path.encode('utf8'), prop_str)
 
364
        old_name = '%s%s\t%s' % (old_label, path,
 
365
                                 _patch_header_date(old_tree, file_id, path))
 
366
        new_name = '%s%s\t%s' % (new_label, path,
 
367
                                 _patch_header_date(new_tree, file_id, path))
306
368
        if text_modified:
307
 
            _maybe_diff_file_or_symlink(old_label, path, old_tree, file_id,
308
 
                                        new_label, path, new_tree,
 
369
            _maybe_diff_file_or_symlink(old_name, old_tree, file_id,
 
370
                                        new_name, new_tree,
309
371
                                        True, kind, to_file, diff_file)
310
372
 
311
373
    return has_changes
312
374
 
313
375
 
 
376
def _patch_header_date(tree, file_id, path):
 
377
    """Returns a timestamp suitable for use in a patch header."""
 
378
    tm = time.gmtime(tree.get_file_mtime(file_id, path))
 
379
    return time.strftime('%Y-%m-%d %H:%M:%S +0000', tm)
 
380
 
 
381
 
314
382
def _raise_if_doubly_unversioned(specific_files, old_tree, new_tree):
315
383
    """Complain if paths are not versioned in either tree."""
316
384
    if not specific_files:
322
390
        raise errors.PathsNotVersionedError(sorted(unversioned))
323
391
    
324
392
 
 
393
def _raise_if_nonexistent(paths, old_tree, new_tree):
 
394
    """Complain if paths are not in either inventory or tree.
 
395
 
 
396
    It's OK with the files exist in either tree's inventory, or 
 
397
    if they exist in the tree but are not versioned.
 
398
    
 
399
    This can be used by operations such as bzr status that can accept
 
400
    unknown or ignored files.
 
401
    """
 
402
    mutter("check paths: %r", paths)
 
403
    if not paths:
 
404
        return
 
405
    s = old_tree.filter_unversioned_files(paths)
 
406
    s = new_tree.filter_unversioned_files(s)
 
407
    s = [path for path in s if not new_tree.has_filename(path)]
 
408
    if s:
 
409
        raise errors.PathsDoNotExist(sorted(s))
 
410
 
 
411
 
325
412
def get_prop_change(meta_modified):
326
413
    if meta_modified:
327
414
        return " (properties changed)"
329
416
        return  ""
330
417
 
331
418
 
332
 
def _maybe_diff_file_or_symlink(old_label, old_path, old_tree, file_id,
333
 
                                new_label, new_path, new_tree, text_modified,
 
419
def _maybe_diff_file_or_symlink(old_path, old_tree, file_id,
 
420
                                new_path, new_tree, text_modified,
334
421
                                kind, to_file, diff_file):
335
422
    if text_modified:
336
423
        new_entry = new_tree.inventory[file_id]
337
424
        old_tree.inventory[file_id].diff(diff_file,
338
 
                                         old_label + old_path, old_tree,
339
 
                                         new_label + new_path, new_entry, 
 
425
                                         old_path, old_tree,
 
426
                                         new_path, new_entry, 
340
427
                                         new_tree, to_file)