/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic)
2
#                       <szilveszter.farkas@gmail.com>
227 by Jelmer Vernooij
Add push item in revision menu, clean up push code.
3
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
4
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
5
# This program is free software; you can redistribute it and/or modify
6
# it under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 2 of the License, or
8
# (at your option) any later version.
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
9
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
10
# This program is distributed in the hope that it will be useful,
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
# GNU General Public License for more details.
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
14
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
15
# You should have received a copy of the GNU General Public License
16
# along with this program; if not, write to the Free Software
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
19
from gi.repository import Gtk
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
20
21
from errors import show_bzr_error
22
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
23
from bzrlib import (
24
    errors,
25
    ui,
26
    )
27
from bzrlib.bzrdir import BzrDir
28
from bzrlib.transport import get_transport
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
29
30
from bzrlib.plugins.gtk.dialog import (
31
    question_dialog,
32
    )
724 by Jelmer Vernooij
Fix formatting, imports.
33
from bzrlib.plugins.gtk.history import UrlHistory
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
34
from bzrlib.plugins.gtk.i18n import _i18n
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
35
from bzrlib.plugins.gtk.ui import ProgressPanel
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
36
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
37
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
38
class PushDialog(Gtk.Dialog):
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
39
    """New implementation of the Push dialog."""
724 by Jelmer Vernooij
Fix formatting, imports.
40
783 by Jelmer Vernooij
Support opening push dialog from nautilus.
41
    def __init__(self, repository=None, revid=None, branch=None, parent=None):
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
42
        """Initialize the Push dialog. """
734.1.51 by Curtis Hovey
Fix the initializer for many classes.
43
        super(PushDialog, self).__init__(
776.3.15 by Curtis Hovey
Follow GNOME HIG.
44
            title="Push", parent=parent, flags=0, border_width=6,
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
45
            buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE))
783 by Jelmer Vernooij
Support opening push dialog from nautilus.
46
        if repository is None:
47
            repository = branch.repository
776.3.6 by Curtis Hovey
Added tests for push __init__.
48
        self.branch = branch
724 by Jelmer Vernooij
Fix formatting, imports.
49
776.3.6 by Curtis Hovey
Added tests for push __init__.
50
        # Unused arguments
227 by Jelmer Vernooij
Add push item in revision menu, clean up push code.
51
        self.repository = repository
783 by Jelmer Vernooij
Support opening push dialog from nautilus.
52
        if revid is None:
53
            revid = branch.last_revision()
227 by Jelmer Vernooij
Add push item in revision menu, clean up push code.
54
        self.revid = revid
724 by Jelmer Vernooij
Fix formatting, imports.
55
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
56
        # Create the widgets
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
57
        self._label_location = Gtk.Label(label=_i18n("Location:"))
734.1.14 by Curtis Hovey
Updated gpush to gtk3.
58
        self._combo = Gtk.ComboBox.new_with_entry()
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
59
        self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
776.3.15 by Curtis Hovey
Follow GNOME HIG.
60
        self._hbox_location = Gtk.Box(Gtk.Orientation.HORIZONTAL, 6)
61
        self._push_message = Gtk.Label(xalign=0)
776.3.14 by Curtis Hovey
revise init for clarity.
62
        self._progress_widget = ProgressPanel()
724 by Jelmer Vernooij
Fix formatting, imports.
63
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
64
        # Set callbacks
776.3.14 by Curtis Hovey
revise init for clarity.
65
        ui.ui_factory.set_progress_bar_widget(self._progress_widget)
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
66
        self.connect('close', self._on_close_clicked)
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
67
        self._button_push.connect('clicked', self._on_push_clicked)
724 by Jelmer Vernooij
Fix formatting, imports.
68
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
69
        # Set properties
776.3.15 by Curtis Hovey
Follow GNOME HIG.
70
        content_area = self.get_content_area()
71
        content_area.set_spacing(6)
724 by Jelmer Vernooij
Fix formatting, imports.
72
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
73
        # Pack widgets
776.3.14 by Curtis Hovey
revise init for clarity.
74
        self._hbox_location.pack_start(self._label_location, False, False, 0)
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
75
        self._hbox_location.pack_start(self._combo, False, False, 0)
776.3.15 by Curtis Hovey
Follow GNOME HIG.
76
        content_area.pack_start(self._hbox_location, True, True, 0)
77
        content_area.pack_start(self._progress_widget, True, True, 0)
78
        content_area.pack_start(self._push_message, True, True, 0)
776.3.14 by Curtis Hovey
revise init for clarity.
79
        self.get_action_area().pack_end(self._button_push, True, True, 0)
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
80
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
81
        # Show the dialog
776.3.15 by Curtis Hovey
Follow GNOME HIG.
82
        content_area.show_all()
776.3.6 by Curtis Hovey
Added tests for push __init__.
83
        self._progress_widget.hide()
84
        self._push_message.hide()
724 by Jelmer Vernooij
Fix formatting, imports.
85
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
86
        # Build location history
154 by Jelmer Vernooij
Add trivial generic class for storing URL history.
87
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
88
        self._build_history()
724 by Jelmer Vernooij
Fix formatting, imports.
89
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
90
    def _build_history(self):
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
91
        """Build up the location history. """
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
92
        self._combo_model = Gtk.ListStore(str)
154 by Jelmer Vernooij
Add trivial generic class for storing URL history.
93
        for item in self._history.get_entries():
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
94
            self._combo_model.append([item])
154 by Jelmer Vernooij
Add trivial generic class for storing URL history.
95
        self._combo.set_model(self._combo_model)
734.1.14 by Curtis Hovey
Updated gpush to gtk3.
96
        self._combo.set_entry_text_column(0)
724 by Jelmer Vernooij
Fix formatting, imports.
97
227 by Jelmer Vernooij
Add push item in revision menu, clean up push code.
98
        if self.branch is not None:
99
            location = self.branch.get_push_location()
100
            if location is not None:
101
                self._combo.get_child().set_text(location)
724 by Jelmer Vernooij
Fix formatting, imports.
102
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
103
    def _on_close_clicked(self, widget):
104
        """Close dialog handler."""
105
        ui.ui_factory.set_progress_bar_widget(None)
106
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
107
    @show_bzr_error
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
108
    def _on_push_clicked(self, widget):
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
109
        """Push button clicked handler. """
776.3.6 by Curtis Hovey
Added tests for push __init__.
110
        self._push_message.hide()
111
        self._progress_widget.tick()
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
112
        location = self._combo.get_child().get_text()
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
113
114
        try:
776.3.9 by Curtis Hovey
Added a simple test for _on_push_clicked.
115
            message = do_push(self.branch, location, overwrite=False)
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
116
        except errors.DivergedBranches:
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
117
            response = question_dialog(
118
                _i18n('Branches have been diverged'),
119
                _i18n('You cannot push if branches have diverged.\n'
120
                      'Overwrite?'))
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
121
            if response == Gtk.ResponseType.YES:
776.3.9 by Curtis Hovey
Added a simple test for _on_push_clicked.
122
                message = do_push(self.branch, location, overwrite=True)
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
123
            else:
124
                return
125
        self._history.add_entry(location)
126
        if (self.branch is not None
127
            and self.branch.get_push_location() is None):
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
128
            self.branch.set_push_location(location)
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
129
        if message:
776.3.6 by Curtis Hovey
Added tests for push __init__.
130
            self._progress_widget.finished()
131
            self._push_message.props.label = message
132
            self._push_message.show()
776.3.9 by Curtis Hovey
Added a simple test for _on_push_clicked.
133
134
776.3.14 by Curtis Hovey
revise init for clarity.
135
def do_push(br_from, location, overwrite):
729.1.1 by Jelmer Vernooij
Move i18n support to a separate file, so gettext files aren't loaded unless bzr-gtk is used.
136
    """Update a mirror of a branch.
724 by Jelmer Vernooij
Fix formatting, imports.
137
228 by Jelmer Vernooij
Remove unused code, prefer questions to check boxes.
138
    :param br_from: the source branch
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
139
    :param location: the location of the branch that you'd like to update
140
    :param overwrite: overwrite target location if it diverged
141
    :return: number of revisions pushed
142
    """
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
143
    transport = get_transport(location)
144
    location_url = transport.base
145
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
146
    try:
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
147
        dir_to = BzrDir.open(location_url)
148
        br_to = dir_to.open_branch()
149
    except errors.NotBranchError:
150
        # create a branch.
151
        transport = transport.clone('..')
152
        try:
153
            relurl = transport.relpath(location_url)
154
            transport.mkdir(relurl)
155
        except errors.NoSuchFile:
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
156
            response = question_dialog(
157
                _i18n('Non existing parent directory'),
158
                _i18n("The parent directory (%s)\ndoesn't exist. Create?") %
159
                location)
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
160
            if response == Gtk.ResponseType.OK:
161
                transport.create_prefix()
162
            else:
163
                return
164
        dir_to = br_from.bzrdir.clone(location_url,
165
            revision_id=br_from.last_revision())
166
        br_to = dir_to.open_branch()
167
        count = len(br_to.revision_history())
168
    else:
776.3.2 by Curtis Hovey
Merged previous UI work from progressbar.
169
        br_to.revision_history()
776.2.1 by Curtis Hovey
Merged UI work from progressbar branch.
170
        try:
171
            tree_to = dir_to.open_workingtree()
172
        except errors.NotLocalUrl:
173
            # FIXME - what to do here? how should we warn the user?
174
            count = br_to.pull(br_from, overwrite)
175
        except errors.NoWorkingTree:
176
            count = br_to.pull(br_from, overwrite)
177
        else:
178
            count = tree_to.pull(br_from, overwrite)
179
776.3.13 by Curtis Hovey
Restore the localisable message, but make it clear that code uses deprecated calls.
180
    # The count var is either an int or a PushResult. PushResult is being
776.3.18 by Curtis Hovey
Fixed spelling.
181
    # coerced into an int, but the method is deprecated.
776.3.13 by Curtis Hovey
Restore the localisable message, but make it clear that code uses deprecated calls.
182
    return _i18n("%d revision(s) pushed.") % int(count)