Merge lp:~sinzui/ubuntu/precise/gedit-developer-plugins/0.5.14 into lp:ubuntu/precise/gedit-developer-plugins

[Curtis Hovey]

This branch fixes bug #960380 in Ubuntu and has a premptive fix for bug #960380 (upstream bzr-gtk 0.104.0 change how ui events are handled).

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2012-03-12 13:04:13 +0000
+++ ChangeLog	2012-03-30 14:36:23 +0000
@@ -1,5 +1,17 @@
 <Generated by bzr log --log-format=gnu>
 
[phone]  Curtis Hovey <[e-mail]>
+
+	[570] Do not look for missing in a branch without a parent.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[569] Increment version for release.
+
[phone]  Curtis Hovey <[e-mail]>
+
+	[568] Always setup to bzr-gtk ui factory.
+
 2012-03-10  Curtis Hovey <[e-mail]>
 
 	[567] Inc version.
 
=== modified file 'configure'
--- configure	2012-03-12 13:04:13 +0000
+++ configure	2012-03-30 14:36:23 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.13.
+# Generated by GNU Autoconf 2.68 for gedit-developer-plugins 0.5.14.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -560,8 +560,8 @@
 # Identity of this package.
 PACKAGE_NAME='gedit-developer-plugins'
 PACKAGE_TARNAME='gedit-developer-plugins'
-PACKAGE_VERSION='0.5.13'
-PACKAGE_STRING='gedit-developer-plugins 0.5.13'
+PACKAGE_VERSION='0.5.14'
+PACKAGE_STRING='gedit-developer-plugins 0.5.14'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1319,7 +1319,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gedit-developer-plugins 0.5.13 to adapt to many kinds of systems.
+\`configure' configures gedit-developer-plugins 0.5.14 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1386,7 +1386,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.13:";;
+     short | recursive ) echo "Configuration of gedit-developer-plugins 0.5.14:";;
    esac
   cat <<\_ACEOF
 
@@ -1491,7 +1491,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gedit-developer-plugins configure 0.5.13
+gedit-developer-plugins configure 0.5.14
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1860,7 +1860,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gedit-developer-plugins $as_me 0.5.13, which was
+It was created by gedit-developer-plugins $as_me 0.5.14, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2675,7 +2675,7 @@
 
 # Define the identity of the package.
  PACKAGE='gedit-developer-plugins'
- VERSION='0.5.13'
+ VERSION='0.5.14'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6525,7 +6525,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gedit-developer-plugins $as_me 0.5.13, which was
+This file was extended by gedit-developer-plugins $as_me 0.5.14, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6582,7 +6582,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gedit-developer-plugins config.status 0.5.13
+gedit-developer-plugins config.status 0.5.14
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2012-03-12 13:04:13 +0000
+++ configure.ac	2012-03-30 14:36:23 +0000
@@ -4,7 +4,7 @@
 
 m4_define(gdp_major_version, 0)
 m4_define(gdp_minor_version, 5)
-m4_define(gdp_micro_version, 13)
+m4_define(gdp_micro_version, 14)
 m4_define(gdp_version, gdp_major_version.gdp_minor_version.gdp_micro_version)
 
 AC_INIT(gedit-developer-plugins, gdp_version, [e-mail])
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-12 13:15:11 +0000
+++ debian/changelog	2012-03-30 14:36:23 +0000
@@ -1,3 +1,11 @@
+gedit-developer-plugins (0.5.14-0ubuntu1) precise; urgency=low
+
+  * New upstream bug-fix release.
+    - bzrgdp error calling show_missing without a parent branch (LP: #968193)
+    - some bzr commands fail because the ui factory is not setup (LP: #960380)
+
+ -- Curtis C. Hovey <[e-mail]>  Fri, 30 Mar 2012 10:25:00 -0400
+
 gedit-developer-plugins (0.5.13-0ubuntu1) precise; urgency=low
 
   * New upstream bug-fix release
 
=== modified file 'plugins/gdp/bzr.py'
--- plugins/gdp/bzr.py	2012-03-12 13:06:06 +0000
+++ plugins/gdp/bzr.py	2012-03-30 14:36:23 +0000
@@ -35,6 +35,8 @@
     from bzrlib.plugins.gtk.merge import MergeDialog
     from bzrlib.plugins.gtk.push import PushDialog
     from bzrlib.plugins.gtk.status import StatusWindow
+    from bzrlib.plugins.gtk import set_ui_factory
+    set_ui_factory()
     HAS_BZR_GTK = True
 except ImportError:
     HAS_BZR_GTK = False
@@ -209,7 +211,11 @@
         if not HAS_BZR_GTK:
             return
         from bzrlib.plugins.gtk.missing import MissingWindow
-        parent_location = self.working_tree.branch.get_parent()
+        try:
+            parent_location = self.working_tree.branch.get_parent()
+            parent_branch = Branch.open_containing(parent_location)[0]
+        except NotBranchError:
+            parent_location = None
         if parent_location is None:
             message = _("Nothing to do; this branch does not have a parent.")
             dialog = Gtk.MessageDialog(
@@ -218,7 +224,6 @@
             dialog.run()
             dialog.destroy()
             return
-        parent_branch = Branch.open_containing(parent_location)[0]
         self.working_tree.branch.lock_read()
         try:
             parent_branch.lock_read()
 
=== modified file 'plugins/gdp/tests/test_bzr.py'
--- plugins/gdp/tests/test_bzr.py	2012-03-12 13:04:13 +0000
+++ plugins/gdp/tests/test_bzr.py	2012-03-30 14:36:23 +0000
@@ -3,6 +3,8 @@
 
 __metaclass__ = type
 
+from gi.repository import Gtk
+
 from bzrlib.errors import (
     NotBranchError,
     )
@@ -10,7 +12,10 @@
 from gdp.bzr import (
     BzrProject,
     )
-from testing import GeditTestCase
+from testing import (
+    GeditTestCase,
+    MockMethod,
+    )
 
 
 class FakeBranch:
@@ -49,3 +54,12 @@
         self.assertEqual(
             'This branch does not have a push location.',
             bzr_project._message)
+
+    def test_missing_no_parent(self):
+        text_file = self.make_file('hello')
+        window, view, document = self.make_gedit(text_file.name)
+        bzr_project = BzrProject(window)
+        bzr_project.working_tree = FakeTree()
+        MockMethod.bind(self, Gtk.MessageDialog, 'run')
+        bzr_project.show_missing(None)
+        self.assertEqual(1, Gtk.MessageDialog.run.called)