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

  • Committer: Curtis Hovey
  • Date: 2012-03-20 12:31:44 UTC
  • Revision ID: sinzui.is@verizon.net-20120320123144-1fzwkjsnrk3cpaut
Update tests to reflect the changes to setup the the dialog for nautilus.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
24
24
    errors,
25
25
    ui,
26
26
    )
27
 
from bzrlib.controldir import ControlDir
28
 
from bzrlib.push import PushResult
 
27
from bzrlib.bzrdir import BzrDir
29
28
from bzrlib.transport import get_transport
30
29
 
31
30
from bzrlib.plugins.gtk.dialog import (
141
140
    :param overwrite: overwrite target location if it diverged
142
141
    :return: number of revisions pushed
143
142
    """
144
 
    revision_id = None
145
 
    to_transport = get_transport(location)
 
143
    transport = get_transport(location)
 
144
    location_url = transport.base
 
145
 
146
146
    try:
147
 
        dir_to = ControlDir.open_from_transport(to_transport)
 
147
        dir_to = BzrDir.open(location_url)
 
148
        br_to = dir_to.open_branch()
148
149
    except errors.NotBranchError:
149
 
        dir_to = None
150
 
 
151
 
    if dir_to is None:
 
150
        # create a branch.
 
151
        transport = transport.clone('..')
152
152
        try:
153
 
            br_to = br_from.create_clone_on_transport(
154
 
                to_transport, revision_id=revision_id)
 
153
            relurl = transport.relpath(location_url)
 
154
            transport.mkdir(relurl)
155
155
        except errors.NoSuchFile:
156
156
            response = question_dialog(
157
157
                _i18n('Non existing parent directory'),
158
158
                _i18n("The parent directory (%s)\ndoesn't exist. Create?") %
159
 
                    location)
 
159
                location)
160
160
            if response == Gtk.ResponseType.OK:
161
 
                br_to = br_from.create_clone_on_transport(
162
 
                    to_transport, revision_id=revision_id, create_prefix=True)
 
161
                transport.create_prefix()
163
162
            else:
164
 
                return _i18n("Push aborted.")
165
 
        push_result = create_push_result(br_from, br_to)
 
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())
166
168
    else:
167
 
        push_result = dir_to.push_branch(br_from, revision_id, overwrite)
168
 
    message = create_push_message(br_from, push_result)
169
 
    return message
170
 
 
171
 
 
172
 
def create_push_message(br_from, push_result):
173
 
    """Return a mesage explaining what happened during the push."""
174
 
    messages = []
175
 
    rev_count = br_from.revno() - push_result.old_revno
176
 
    messages.append(_i18n("%d revision(s) pushed.") % rev_count)
177
 
    if push_result.stacked_on is not None:
178
 
        messages.append(_i18n("Stacked on %s.") % push_result.stacked_on)
179
 
    if push_result.workingtree_updated is False:
180
 
        messages.append(_i18n(
181
 
            "\nThe working tree was not updated:"
182
 
            "\nSee 'bzr help working-trees' for more information."))
183
 
    return '\n'.join(messages)
184
 
 
185
 
 
186
 
def create_push_result(br_from, br_to):
187
 
    """Return a PushResult like one created by ControlDir.push_branch()."""
188
 
    push_result = PushResult()
189
 
    push_result.source_branch = br_from
190
 
    push_result.target_branch = br_to
191
 
    push_result.branch_push_result = None
192
 
    push_result.master_branch = None
193
 
    push_result.old_revno = 0
194
 
    push_result.old_revid = br_to.last_revision()
195
 
    push_result.workingtree_updated = None  # Not applicable to this case.
196
 
    try:
197
 
        push_result.stacked_on = br_to.get_stacked_on_url()
198
 
    except (errors.UnstackableBranchFormat,
199
 
            errors.UnstackableRepositoryFormat,
200
 
            errors.NotStacked):
201
 
        push_result.stacked_on = None
202
 
    return push_result
 
169
        br_to.revision_history()
 
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
 
 
180
    # The count var is either an int or a PushResult. PushResult is being
 
181
    # coerced into an int, but the method is deprecated.
 
182
    return _i18n("%d revision(s) pushed.") % int(count)