/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to lib/stdhome/command/status.py

  • Committer: Tim Marston
  • Date: 2014-03-19 20:02:10 UTC
  • Revision ID: tim@ed.am-20140319200210-b6nm63rpktfmw0l3
changed working of output

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/status.py
93
93
                        # check for conflicts in repo
94
94
                        files = the.repo.vcs.get_conflicts()
95
95
                        if files:
96
 
                                message += 'Conflicts in %s:\n  %s\n' % \
 
96
                                message += 'conflicts in %s:\n  %s\n' % \
97
97
                                                   ( the.repo.name, '\n  '.join( files ) )
98
98
 
99
99
                        # get deployment conflicts
100
100
                        conflicts = deployment.get_conflicts()
101
101
                        if conflicts:
102
 
                                message += 'Deployment conflicts:\n  %s\n' % \
 
102
                                message += 'deployment conflicts:\n  %s\n' % \
103
103
                                                   '\n  '.join( conflicts )
104
104
 
105
105
                else:
108
108
                        walker = StatusWalker()
109
109
                        walker.walk()
110
110
                        if walker.modified:
111
 
                                message += 'Modified:\n  %s\n' % \
 
111
                                message += 'modified:\n  %s\n' % \
112
112
                                                   '\n  '.join( walker.modified )
113
113
                        if walker.missing:
114
 
                                message += 'Missing:\n  %s\n' % \
 
114
                                message += 'missing:\n  %s\n' % \
115
115
                                                   '\n  '.join( walker.missing )
116
116
                        if walker.changed:
117
 
                                message += 'Type changed:\n  %s\n' % \
 
117
                                message += 'kind changed:\n  %s\n' % \
118
118
                                                   '\n  '.join( walker.changed )
119
119
 
120
120
                # show status