/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 breezy/bzr/knit.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:28:14 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7305.
  • Revision ID: jelmer@jelmer.uk-20190529032814-fzqbrgf9647u9ptq
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/knit.py
58
58
 
59
59
from ..lazy_import import lazy_import
60
60
lazy_import(globals(), """
 
61
import patiencediff
61
62
import gzip
62
63
 
63
64
from breezy import (
64
65
    debug,
65
66
    diff,
66
 
    patiencediff,
67
67
    static_tuple,
68
68
    trace,
69
69
    tsort,
680
680
        lines = (tuple(line.split(b' ', 1)) for line in content)
681
681
        return AnnotatedKnitContent(lines)
682
682
 
683
 
    def parse_line_delta_iter(self, lines):
684
 
        return iter(self.parse_line_delta(lines))
685
 
 
686
683
    def parse_line_delta(self, lines, version_id, plain=False):
687
684
        """Convert a line based delta into internal representation.
688
685