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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-01 21:57:00 UTC
  • mfrom: (7490.39.3 move-launchpad)
  • Revision ID: breezy.the.bot@gmail.com-20200601215700-joxuzo6w172gq74v
Move launchpad hoster support to the launchpad plugin.

Merged from https://code.launchpad.net/~jelmer/brz/move-launchpad/+merge/384931

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/patches.py
417
417
 
418
418
    for line in iter_lines:
419
419
        if line.startswith(b'=== '):
420
 
            if allow_dirty and beginning:
421
 
                # Patches can have "junk" at the beginning
422
 
                # Stripping junk from the end of patches is handled when we
423
 
                # parse the patch
424
 
                pass
425
 
            elif len(saved_lines) > 0:
 
420
            if len(saved_lines) > 0:
426
421
                if keep_dirty and len(dirty_head) > 0:
427
422
                    yield {'saved_lines': saved_lines,
428
423
                           'dirty_head': dirty_head}
615
610
        self.prefix = prefix
616
611
 
617
612
    def __enter__(self):
618
 
        self._tt = self.tree.preview_transform()
 
613
        from .transform import TransformPreview
 
614
        self._tt = TransformPreview(self.tree)
619
615
        apply_patches(self._tt, self.patches, prefix=self.prefix)
620
616
        return self._tt.get_preview_tree()
621
617