/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/mdiff.py

  • Committer: Vincent Ladeuil
  • Date: 2009-04-11 16:06:53 UTC
  • mto: (4286.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4287.
  • Revision ID: v.ladeuil+lp@free.fr-20090411160653-eq1gfn41q3lzhmss
Cleanup test imports and use features to better track skipped tests.

* bzrlib/tests/workingtree_implementations/__init__.py: 
Fix imports. Delete obsolete comment.

* bzrlib/tests/tree_implementations/test_walkdirs.py:
(TestWalkdirs.get_all_subdirs_expected): Reduce duplication.

* bzrlib/tests/tree_implementations/test_test_trees.py: 
Fix import.

* bzrlib/tests/tree_implementations/test_path_content_summary.py: 
Fix imports.

(TestPathContentSummary.test_unicode_symlink_content_summary,
TestPathContentSummary.test_unicode_symlink_target_summary):Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/test_inv.py: 
Fix imports.
(TestInventoryWithSymlinks): Factor out test that requires
symlinks and use _test_needs_features.
(TestInventory.test_canonical_path,
TestInventory.test_canonical_path_dir,
TestInventory.test_canonical_path_root,
TestInventory.test_canonical_path_invalid_all,
TestInventory.test_canonical_invalid_child): Use assert(expected,
actual)

* bzrlib/tests/tree_implementations/test_get_symlink_target.py: 
Fix imports.
(TestGetSymlinkTarget.test_get_unicode_symlink_target): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/tree_implementations/__init__.py: 
Fix imports.

(TestCaseWithTree.get_tree_with_subdirs_and_all_supported_content_types,
TestCaseWithTree._create_tree_with_utf8): Use
UnicodeFilenameFeature instead of try/except UnicodeError.

* bzrlib/tests/test_workingtree_4.py:
Fix too long lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mdiff.py
1
 
# (C) 2005 Matt Mackall
2
 
# (C) 2005 Canonical Ltd
3
 
 
4
 
# based on code by Matt Mackall, hacked by Martin Pool
5
 
 
6
 
# mm's code works line-by-line; this just works on byte strings.
7
 
# Possibly slower; possibly gives better results for code not
8
 
# regularly separated by newlines and anyhow a bit simpler.
9
 
 
10
 
 
11
 
# This program is free software; you can redistribute it and/or modify
12
 
# it under the terms of the GNU General Public License as published by
13
 
# the Free Software Foundation; either version 2 of the License, or
14
 
# (at your option) any later version.
15
 
 
16
 
# This program is distributed in the hope that it will be useful,
17
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
18
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19
 
# GNU General Public License for more details.
20
 
 
21
 
# You should have received a copy of the GNU General Public License
22
 
# along with this program; if not, write to the Free Software
23
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
24
 
 
25
 
 
26
 
# TODO: maybe work on files not strings?
27
 
 
28
 
 
29
 
import difflib, sys, struct
30
 
from cStringIO import StringIO
31
 
 
32
 
def diff(a, b):
33
 
    d = difflib.SequenceMatcher(None, a, b)
34
 
    
35
 
    ## sys.stderr.write('  ~ real_quick_ratio: %.4f\n' % d.real_quick_ratio())
36
 
    
37
 
    for o, m, n, s, t in d.get_opcodes():
38
 
        if o == 'equal': continue
39
 
        # a[m:n] should be replaced by b[s:t]
40
 
        if s == t:
41
 
            yield m, n, ''
42
 
        else:
43
 
            yield m, n, b[s:t]
44
 
 
45
 
 
46
 
def tobinary(ops):
47
 
    b = StringIO()
48
 
    for f in ops:
49
 
        b.write(struct.pack(">III", f[0], f[1], len(f[2])))
50
 
        b.write(f[2])
51
 
    return b.getvalue()
52
 
 
53
 
 
54
 
def bdiff(a, b):
55
 
    return tobinary(diff(a, b))
56
 
 
57
 
 
58
 
def patch(t, ops):
59
 
    last = 0
60
 
    b = StringIO()
61
 
 
62
 
    for m, n, r in ops:
63
 
        b.write(t[last:m])
64
 
        if r:
65
 
            b.write(r)
66
 
        last = n
67
 
        
68
 
    b.write(t[last:])
69
 
    return b.getvalue()
70
 
 
71
 
 
72
 
def frombinary(b):
73
 
    bin = StringIO(b)
74
 
    while True:
75
 
        p = bin.read(12)
76
 
        if not p:
77
 
            break
78
 
 
79
 
        m, n, l = struct.unpack(">III", p)
80
 
        
81
 
        if l == 0:
82
 
            r = ''
83
 
        else:
84
 
            r = bin.read(l)
85
 
            if len(r) != l:
86
 
                raise Exception("truncated patch data")
87
 
            
88
 
        yield m, n, r
89
 
 
90
 
 
91
 
def bpatch(t, b):
92
 
    return patch(t, frombinary(b))
93
 
 
94
 
 
95
 
 
96