← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Martin Pool
  • Date: 2005-05-11 05:55:27 UTC
  • Revision ID: mbp@sourcefrog.net-20050511055527-d960f4d6989fc47c
- Move show_status() out of Branch into a new function in 
  bzrlib.status
- New option --show-ids for status command
- Refactor TreeDelta.show()
  and add optional support for showing unmodified files
- Changed output format for status command

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
276
276
        self.modified = []
277
277
        self.unchanged = []
278
278
 
279
 
    def show(self, to_file, show_ids):
 
279
    def show(self, to_file, show_ids=False, show_unchanged=False):
 
280
        def show_list(files):
 
281
            for path, fid in files:
 
282
                if show_ids:
 
283
                    print >>to_file, '  %-30s %s' % (path, fid)
 
284
                else:
 
285
                    print >>to_file, ' ', path
 
286
            
280
287
        if self.removed:
281
288
            print >>to_file, 'removed files:'
282
 
            for path, fid in self.removed:
283
 
                if show_ids:
284
 
                    print >>to_file, '  %-30s %s' % (path, fid)
285
 
                else:
286
 
                    print >>to_file, ' ', path
 
289
            show_list(self.removed)
 
290
                
287
291
        if self.added:
288
292
            print >>to_file, 'added files:'
289
 
            for path, fid in self.added:
290
 
                if show_ids:
291
 
                    print >>to_file, '  %-30s %s' % (path, fid)
292
 
                else:
293
 
                    print >>to_file, '  ' + path
 
293
            show_list(self.added)
 
294
 
294
295
        if self.renamed:
295
296
            print >>to_file, 'renamed files:'
296
297
            for oldpath, newpath, fid, text_modified in self.renamed:
298
299
                    print >>to_file, '  %s => %s %s' % (oldpath, newpath, fid)
299
300
                else:
300
301
                    print >>to_file, '  %s => %s' % (oldpath, newpath)
 
302
                    
301
303
        if self.modified:
302
304
            print >>to_file, 'modified files:'
303
 
            for path, fid in self.modified:
304
 
                if show_ids:
305
 
                    print >>to_file, '  %-30s %s' % (path, fid)
306
 
                else:
307
 
                    print >>to_file, '  ' + path
 
305
            show_list(self.modified)
 
306
            
 
307
        if show_unchanged and self.unchanged:
 
308
            print >>to_file, 'unchanged files:'
 
309
            show_list(self.unchanged)
308
310
 
309
311
 
310
312