← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to command_classes.py

  • Committer: Aaron Bentley
  • Date: 2009-10-20 22:21:59 UTC
  • Revision ID: aaron@aaronbentley.com-20091020222159-x8yo2eog4gy0v8qn
Conflict differ works with no file specified or many files specified.

Show diffs side-by-side

added added

removed removed

Lines of Context:
command_classes.py
523
523
    """Compare a conflicted file against BASE."""
524
524
 
525
525
    encoding_type = 'exact'
526
 
    takes_args = ['file']
 
526
    takes_args = ['file*']
527
527
    takes_options = [
528
528
        RegistryOption.from_kwargs('direction', 'Direction of comparison.',
529
529
            value_switches=True, enum_switch=False,
530
530
            other='Compare OTHER against common base.',
531
531
            this='Compare THIS against common base.')]
532
532
 
533
 
    def run(self, file, direction='other'):
 
533
    def run(self, file_list, direction='other'):
534
534
        from bzrlib.plugins.bzrtools.colordiff import DiffWriter
535
 
        from conflict_diff import conflict_diff
 
535
        from conflict_diff import ConflictDiffer
536
536
        dw = DiffWriter(self.outf, check_style=False, color='auto')
537
 
        conflict_diff(dw, file, direction)
 
537
        ConflictDiffer().run(dw, file_list, direction)
538
538
 
539
539
 
540
540
class cmd_rspush(BzrToolsCommand):