/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to commit.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-01 18:26:38 UTC
  • mto: (322.1.1 trunk) (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071001182638-k6us5j33j06n3ppy
Delay computing the delta, and clean up some of the diff view names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
113
113
    def setup_params(self):
114
114
        """Setup the member variables for state."""
115
115
        self._basis_tree = self._wt.basis_tree()
116
 
        self._delta = self._wt.changes_from(self._basis_tree)
117
 
 
 
116
        self._delta = None
118
117
        self._pending = pending_revisions(self._wt)
119
118
 
120
119
        self._is_checkout = (self._wt.branch.get_bound_location() is not None)
121
120
 
 
121
    def _compute_delta(self):
 
122
        self._delta = self._wt.changes_from(self._basis_tree)
 
123
 
122
124
    def construct(self):
123
125
        """Build up the dialog widgets."""
124
126
        # The primary pane which splits it into left and right (adjustable)
225
227
        self._left_pane_box.pack_start(self._pending_box)
226
228
 
227
229
    def _construct_diff_view(self):
228
 
        from diff import DiffDisplay
 
230
        from diff import DiffView
229
231
 
230
232
        self._diff_label = gtk.Label(_('Diff for whole tree'))
231
233
        self._diff_label.set_alignment(0, 0)
233
235
        self._add_to_right_table(self._diff_label, 1, False)
234
236
        self._diff_label.show()
235
237
 
236
 
        self._diff_view = DiffDisplay()
 
238
        self._diff_view = DiffView()
237
239
        self._add_to_right_table(self._diff_view, 4, True)
238
240
        self._diff_view.show()
239
241
 
663
665
#     
664
666
# 
665
667
#     def _create_diff_view(self):
666
 
#         from diff import DiffDisplay
 
668
#         from diff import DiffView
667
669
# 
668
 
#         self._diff_display = DiffDisplay()
 
670
#         self._diff_display = DiffView()
669
671
#         self._diff_display.set_trees(self.wt, self.wt.basis_tree())
670
672
#         self._diff_display.show_diff(None)
671
673
#         self._diff_display.show()