← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/conflicts.py

  • Committer: Robert Collins
  • Date: 2005-10-07 01:01:07 UTC
  • mfrom: (1185.13.2)
  • Revision ID: robertc@robertcollins.net-20051007010107-fe48434051a15b92
merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/conflicts.py
66
66
                    print "%s is not conflicted" % filename
67
67
                        
68
68
register_command(cmd_resolve)
69
 
 
70
 
# monkey-patch the standard 'status' to give us conflicts, too.
71
 
def _show_status(branch, **kwargs):
72
 
    old_show_status(branch, **kwargs)
73
 
    conflicted = list(branch.working_tree().iter_conflicts())
74
 
    if len(conflicted) > 0:
75
 
        print "conflicts:"
76
 
        for f in conflicted:
77
 
            print " ", f
78
 
 
79
 
old_show_status = bzrlib.status.show_status
80
 
bzrlib.status.show_status = _show_status