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

  • Committer: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
checkout.py
33
33
from dialog import error_dialog
34
34
 
35
35
from history import UrlHistory
 
36
from olive import Preferences
36
37
 
37
38
class CheckoutDialog(gtk.Dialog):
38
39
    """ New implementation of the Checkout dialog. """
54
55
        self._combo = gtk.ComboBoxEntry()
55
56
        self._label_location = gtk.Label(_i18n("Branch location:"))
56
57
        self._label_destination = gtk.Label(_i18n("Destination:"))
57
 
        self._label_nick = gtk.Label(_i18n("Branch nick:"))
 
58
        self._label_nick = gtk.Label(_i18n("Branck nick:"))
58
59
        self._label_revision = gtk.Label(_i18n("Revision:"))
59
60
        self._hbox_revision = gtk.HBox()
60
61
        self._entry_revision = gtk.Entry()
116
117
        for item in self._history.get_entries():
117
118
            self._combo_model.append([ item ])
118
119
        
 
120
        pref = Preferences()
 
121
        for item in pref.get_bookmarks():
 
122
            self._combo_model.append([ item ])
 
123
        
119
124
        self._combo.set_model(self._combo_model)
120
125
        self._combo.set_text_column(0)
121
126