[Pkg-bazaar-commits] ./bzr-gtk/unstable r562: Merge removal of question to set default push location

[Jasper Groenewegen]

------------------------------------------------------------
revno: 562
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Tue 2008-07-22 21:46:47 +0200
message:
  Merge removal of question to set default push location
modified:
  NEWS
  push.py
    ------------------------------------------------------------
    revno: 560.2.1
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: LP151818-no-push-Q
    timestamp: Tue 2008-07-22 11:39:15 +0200
    message:
      Remove question to set default pushlocation when None set yet. Users would expect this to be set anyway. Fixes LP:151818
    modified:
      push.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-07-22 19:40:04 +0000
+++ b/NEWS	2008-07-22 19:46:47 +0000
@@ -52,6 +52,8 @@
 
   * Fix plugin description in gpreferences. (Jasper Groenewegen, #232191)
 
+  * Remove question for setting default push location. (Jasper Groenewegen, #151818)
+
  CHANGES
 
   * Moved notify icon code to separate script. (Jelmer Vernooij)

=== modified file 'push.py'
--- a/push.py	2008-05-05 18:16:46 +0000
+++ b/push.py	2008-07-22 19:46:47 +0000
@@ -94,12 +94,7 @@
         """ Push button clicked handler. """
         location = self._combo.get_child().get_text()
         revs = 0
-        if self.branch is not None and self.branch.get_push_location() is None:
-            response = question_dialog(_i18n('Set default push location'),
-                                       _i18n('There is no default push location set.\nSet %r as default now?') % location)
-            if response == gtk.RESPONSE_OK:
-                self.branch.set_push_location(location)
-
+        
         try:
             revs = do_push(self.branch, location=location, overwrite=False)
         except errors.DivergedBranches:
@@ -108,6 +103,9 @@
             if response == gtk.RESPONSE_YES:
                 revs = do_push(self.branch, location=location, overwrite=True)
         
+        if self.branch is not None and self.branch.get_push_location() is None:
+            self.branch.set_push_location(location)
+        
         self._history.add_entry(location)
         info_dialog(_i18n('Push successful'),
                     _i18n("%d revision(s) pushed.") % revs)