← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf.py

  • Committer: Michael Ellerman
  • Date: 2005-10-24 15:30:48 UTC
  • mto: (0.3.1 shelf-dev) (325.1.2 bzrtools)
  • mto: This revision was merged to the branch mainline in revision 246.
  • Revision ID: michael@ellerman.id.au-20051024153048-1214d3d40ad25fbb
Use DiffStat rather than calling out to /bin/diffstat

Show diffs side-by-side

added added

removed removed

Lines of Context:
shelf.py
10
10
from bzrlib.branch import Branch
11
11
from bzrlib import DEFAULT_IGNORE
12
12
from hunk_selector import HunkSelector
 
13
from diffstat import DiffStat
13
14
 
14
15
DEFAULT_IGNORE.append('./.bzr-shelf*')
15
16
 
82
83
            raise Exception("Failed running patch!")
83
84
 
84
85
        os.remove(shelf)
85
 
        print 'Diff status is now:'
86
 
        os.system('bzr diff | diffstat')
 
86
 
 
87
        diff_stat = DiffStat(self.get_patches(None, None))
 
88
        print 'Diff status is now:\n', diff_stat
87
89
 
88
90
        return True
89
91
 
131
133
        if pipe.close() is not None:
132
134
            raise Exception("Failed running patch!")
133
135
 
134
 
        print 'Diff status is now:'
135
 
        os.system('bzr diff | diffstat')
 
136
        diff_stat = DiffStat(self.get_patches(None, None))
 
137
        print 'Diff status is now:\n', diff_stat
136
138
 
137
139
        return True
138
140