/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: Vincent Ladeuil
  • Date: 2008-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
25
25
 
26
26
from errors import show_bzr_error
27
27
 
 
28
# FIXME: This needs to be public JRV 20070714
 
29
from bzrlib.builtins import _create_prefix
28
30
from bzrlib.config import LocationConfig
29
31
import bzrlib.errors as errors
30
32
 
92
94
        """ Push button clicked handler. """
93
95
        location = self._combo.get_child().get_text()
94
96
        revs = 0
95
 
        
 
97
        if self.branch is not None and self.branch.get_push_location() is None:
 
98
            response = question_dialog(_i18n('Set default push location'),
 
99
                                       _i18n('There is no default push location set.\nSet %r as default now?') % location)
 
100
            if response == gtk.RESPONSE_OK:
 
101
                self.branch.set_push_location(location)
 
102
 
96
103
        try:
97
104
            revs = do_push(self.branch, location=location, overwrite=False)
98
105
        except errors.DivergedBranches:
101
108
            if response == gtk.RESPONSE_YES:
102
109
                revs = do_push(self.branch, location=location, overwrite=True)
103
110
        
104
 
        if self.branch is not None and self.branch.get_push_location() is None:
105
 
            self.branch.set_push_location(location)
106
 
        
107
111
        self._history.add_entry(location)
108
112
        info_dialog(_i18n('Push successful'),
109
113
                    _i18n("%d revision(s) pushed.") % revs)
142
146
            response = question_dialog(_i18n('Non existing parent directory'),
143
147
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
144
148
            if response == gtk.RESPONSE_OK:
145
 
                transport.create_prefix()
 
149
                _create_prefix(transport)
146
150
            else:
147
151
                return
148
152
        dir_to = br_from.bzrdir.clone(location_url,