← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to hunk_selector.py

  • Committer: Max Bowsher
  • Date: 2009-11-13 00:43:08 UTC
  • mto: This revision was merged to the branch mainline in revision 739.
  • Revision ID: maxb@f2s.com-20091113004308-4dcwu1kwt3lhf1kp
Having discovered that bzr-builddeb import_dsc.py is a horrid copy-paste job of bzrtools upstream_import.py, restructure the change to minimize divergence from it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hunk_selector.py
13
13
                from colordiff import DiffWriter
14
14
                from terminal import has_ansi_colors
15
15
                if has_ansi_colors():
16
 
                    self.diff_stream = DiffWriter(sys.stdout)
 
16
                    self.diff_stream = DiffWriter(sys.stdout,
 
17
                                                  check_style=False)
17
18
                else:
18
19
                    if color is True:
19
20
                        raise NoColor()
24
25
                self.diff_stream = sys.stdout
25
26
        else:
26
27
            self.diff_stream = sys.stdout
27
 
            
 
28
 
28
29
        self.standard_options = [
29
30
            UserOption('y', self._selected, self.strings['select_desc'],
30
31
                default=True),