← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-10 03:38:19 UTC
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: john@arbash-meinel.com-20051110033819-a2a0829773b88f80
Added (failing) tests for cdv.recurse_matches with common sections,
moved codeville code into separate directory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
68
68
 
69
69
 
70
70
import sha
71
 
import difflib
72
 
import cdvdifflib
 
71
from bzrlib.cdv.difflib import unified_diff
 
72
from bzrlib.cdv.difflib import SequenceMatcher
73
73
 
74
74
from bzrlib.trace import mutter
75
75
from bzrlib.errors import WeaveError, WeaveFormatError, WeaveParentMismatch, \
177
177
        self._name_map = {}
178
178
        self._weave_name = weave_name
179
179
        if matcher is None:
180
 
            self._matcher = difflib.SequenceMatcher
 
180
            self._matcher = SequenceMatcher
181
181
        else:
182
182
            self._matcher = matcher
183
183
 
1028
1028
        sys.stdout.writelines(w.mash_iter(map(int, argv[3:])))
1029
1029
 
1030
1030
    elif cmd == 'diff':
1031
 
        from difflib import unified_diff
1032
1031
        w = readit()
1033
1032
        fn = argv[2]
1034
1033
        v1, v2 = map(int, argv[3:5])