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

  • Committer: Tim Marston
  • Date: 2016-04-10 20:17:32 UTC
  • Revision ID: tim@ed.am-20160410201732-w6358gtt2df1y5e9
added 'ci' as an alias of add; fixed issue with lack of output from vcs when
there are merge conflicts

Show diffs side-by-side

added added

removed removed

lib/stdhome/program.py
117
117
                        'rm': 'remove',
118
118
                        'st': 'status',
119
119
                        'co': 'init',
 
120
                        'ci': 'add',
120
121
                }.get( command, False )
121
122
                if alias: return alias
122
123
 
207
208
                try:
208
209
                        instance.run()
209
210
                except Vcs.VcsError as e:
210
 
                        message = e.msg.rstrip()
211
 
                        if the.verbose >= 1:
212
 
                                message += '\n\nVCS OUTPUT:\n' + e.output.rstrip()
 
211
                        message = e.msg.rstrip() + '\n\nVCS OUTPUT:\n' + e.output.rstrip()
213
212
                        self.die( message )
214
213
                except self.FatalError as e:
215
214
                        self.die( e.msg )