/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
227 by Jelmer Vernooij
Add push item in revision menu, clean up push code.
2
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
3
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
8
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
0.8.46 by Szilveszter Farkas (Phanatic)
Modified OliveDialog class interface; huge cleanups.
13
#
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
734.1.4 by Curtis Hovey
Updated commit to gtk3.
18
from gi.repository import GObject
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
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
0.11.1 by Jelmer Vernooij
Eliminate olive.backend.errors.
23
import bzrlib.errors as errors
0.8.19 by Szilveszter Farkas (Phanatic)
2006-07-21 Szilveszter Farkas <Szilveszter.Farkas@gmail.com>
24
724 by Jelmer Vernooij
Fix formatting, imports.
25
from bzrlib.plugins.gtk.dialog import (
26
    info_dialog,
27
    question_dialog,
28
    )
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
29
724 by Jelmer Vernooij
Fix formatting, imports.
30
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.
31
from bzrlib.plugins.gtk.i18n import _i18n
32
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
33
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
34
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.
35
    """New implementation of the Push dialog."""
724 by Jelmer Vernooij
Fix formatting, imports.
36
227 by Jelmer Vernooij
Add push item in revision menu, clean up push code.
37
    def __init__(self, repository, revid, 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.
38
        """Initialize the Push dialog. """
734.1.14 by Curtis Hovey
Updated gpush to gtk3.
39
        Gtk.Dialog.__init__(self, title="Push",
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
40
                                  parent=parent,
41
                                  flags=0,
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
42
                                  buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
724 by Jelmer Vernooij
Fix formatting, imports.
43
734.1.14 by Curtis Hovey
Updated gpush to gtk3.
44
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
45
        # Get arguments
227 by Jelmer Vernooij
Add push item in revision menu, clean up push code.
46
        self.repository = repository
47
        self.revid = revid
0.13.13 by Jelmer Vernooij
Update TODO
48
        self.branch = branch
724 by Jelmer Vernooij
Fix formatting, imports.
49
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
50
        # Create the widgets
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
51
        self._label_location = Gtk.Label(label=_i18n("Location:"))
734.1.14 by Curtis Hovey
Updated gpush to gtk3.
52
        self._combo = Gtk.ComboBox.new_with_entry()
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
53
        self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
54
        self._hbox_location = Gtk.HBox()
724 by Jelmer Vernooij
Fix formatting, imports.
55
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
56
        # Set callbacks
57
        self._button_push.connect('clicked', self._on_push_clicked)
724 by Jelmer Vernooij
Fix formatting, imports.
58
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
59
        # Set properties
60
        self._label_location.set_alignment(0, 0.5)
61
        self._hbox_location.set_spacing(3)
734.1.14 by Curtis Hovey
Updated gpush to gtk3.
62
        self.get_content_area().set_spacing(3)
724 by Jelmer Vernooij
Fix formatting, imports.
63
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
64
        # Pack widgets
734.1.14 by Curtis Hovey
Updated gpush to gtk3.
65
        self._hbox_location.pack_start(
66
            self._label_location, False, False, 0)
67
        self._hbox_location.pack_start(self._combo, True, True, 0)
68
        self.get_content_area().pack_start(self._hbox_location, True, True, 0)
69
        # XXX sinzui 2011-08-12: maybe False, False, 0
70
        self.get_action_area().pack_end(self._button_push, True, True, 0)
724 by Jelmer Vernooij
Fix formatting, imports.
71
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
72
        # Show the dialog
734.1.14 by Curtis Hovey
Updated gpush to gtk3.
73
        self.get_content_area().show_all()
724 by Jelmer Vernooij
Fix formatting, imports.
74
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
75
        # Build location history
154 by Jelmer Vernooij
Add trivial generic class for storing URL history.
76
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
77
        self._build_history()
724 by Jelmer Vernooij
Fix formatting, imports.
78
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
79
    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.
80
        """Build up the location history. """
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
81
        self._combo_model = Gtk.ListStore(str)
154 by Jelmer Vernooij
Add trivial generic class for storing URL history.
82
        for item in self._history.get_entries():
83
            self._combo_model.append([ item ])
84
        self._combo.set_model(self._combo_model)
734.1.14 by Curtis Hovey
Updated gpush to gtk3.
85
        self._combo.set_entry_text_column(0)
724 by Jelmer Vernooij
Fix formatting, imports.
86
227 by Jelmer Vernooij
Add push item in revision menu, clean up push code.
87
        if self.branch is not None:
88
            location = self.branch.get_push_location()
89
            if location is not None:
90
                self._combo.get_child().set_text(location)
724 by Jelmer Vernooij
Fix formatting, imports.
91
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
92
    @show_bzr_error
93
    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.
94
        """Push button clicked handler. """
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
95
        location = self._combo.get_child().get_text()
96
        revs = 0
724 by Jelmer Vernooij
Fix formatting, imports.
97
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
98
        try:
228 by Jelmer Vernooij
Remove unused code, prefer questions to check boxes.
99
            revs = do_push(self.branch, location=location, overwrite=False)
126.1.19 by Szilveszter Farkas (Phanatic)
Refactored the Push dialog. Add 'gpush' command.
100
        except errors.DivergedBranches:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
101
            response = question_dialog(_i18n('Branches have been diverged'),
102
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
103
            if response == Gtk.ResponseType.YES:
228 by Jelmer Vernooij
Remove unused code, prefer questions to check boxes.
104
                revs = do_push(self.branch, location=location, overwrite=True)
724 by Jelmer Vernooij
Fix formatting, imports.
105
562 by Jasper Groenewegen
Merge removal of question to set default push location
106
        if self.branch is not None and self.branch.get_push_location() is None:
107
            self.branch.set_push_location(location)
724 by Jelmer Vernooij
Fix formatting, imports.
108
154 by Jelmer Vernooij
Add trivial generic class for storing URL history.
109
        self._history.add_entry(location)
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
110
        info_dialog(_i18n('Push successful'),
111
                    _i18n("%d revision(s) pushed.") % revs)
724 by Jelmer Vernooij
Fix formatting, imports.
112
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
113
        self.response(Gtk.ResponseType.OK)
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
114
724 by Jelmer Vernooij
Fix formatting, imports.
115
228 by Jelmer Vernooij
Remove unused code, prefer questions to check boxes.
116
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.
117
    """Update a mirror of a branch.
724 by Jelmer Vernooij
Fix formatting, imports.
118
228 by Jelmer Vernooij
Remove unused code, prefer questions to check boxes.
119
    :param br_from: the source branch
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
120
    :param location: the location of the branch that you'd like to update
121
    :param overwrite: overwrite target location if it diverged
122
    :return: number of revisions pushed
123
    """
0.8.85 by Szilveszter Farkas (Phanatic)
Fix Push functionality.
124
    from bzrlib.bzrdir import BzrDir
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
125
    from bzrlib.transport import get_transport
724 by Jelmer Vernooij
Fix formatting, imports.
126
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
127
    transport = get_transport(location)
128
    location_url = transport.base
129
130
    old_rh = []
131
132
    try:
0.8.85 by Szilveszter Farkas (Phanatic)
Fix Push functionality.
133
        dir_to = BzrDir.open(location_url)
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
134
        br_to = dir_to.open_branch()
0.8.85 by Szilveszter Farkas (Phanatic)
Fix Push functionality.
135
    except errors.NotBranchError:
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
136
        # create a branch.
137
        transport = transport.clone('..')
228 by Jelmer Vernooij
Remove unused code, prefer questions to check boxes.
138
        try:
139
            relurl = transport.relpath(location_url)
140
            transport.mkdir(relurl)
141
        except errors.NoSuchFile:
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
142
            response = question_dialog(_i18n('Non existing parent directory'),
143
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
734.1.1 by Curtis Hovey
Mechanical changes made by pygi.convert.sh.
144
            if response == Gtk.ResponseType.OK:
629 by Jelmer Vernooij
Use new transport.create_prefix.
145
                transport.create_prefix()
228 by Jelmer Vernooij
Remove unused code, prefer questions to check boxes.
146
            else:
0.8.85 by Szilveszter Farkas (Phanatic)
Fix Push functionality.
147
                return
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
148
        dir_to = br_from.bzrdir.clone(location_url,
149
            revision_id=br_from.last_revision())
150
        br_to = dir_to.open_branch()
151
        count = len(br_to.revision_history())
152
    else:
153
        old_rh = br_to.revision_history()
154
        try:
0.13.13 by Jelmer Vernooij
Update TODO
155
            tree_to = dir_to.open_workingtree()
156
        except errors.NotLocalUrl:
157
            # FIXME - what to do here? how should we warn the user?
158
            count = br_to.pull(br_from, overwrite)
159
        except errors.NoWorkingTree:
160
            count = br_to.pull(br_from, overwrite)
161
        else:
162
            count = tree_to.pull(br_from, overwrite)
163
0.11.9 by Jelmer Vernooij
Remove last few bits from backend and integrate them where necessary.
164
    return count