[Pkg-bazaar-commits] ./bzr-gtk/unstable r645: * New upstream snapshot.
Jelmer Vernooij
jelmer at samba.org
Tue Jul 28 14:35:45 UTC 2009
------------------------------------------------------------
revno: 645
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Tue 2009-07-28 16:35:45 +0200
message:
* New upstream snapshot.
+ Fixes import in nautilus-bzr. Closes: #532149
modified:
__init__.py
commands.py
debian/changelog
diff.py
nautilus-bzr.py
setup.py
------------------------------------------------------------
revno: 621.18.1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2009-07-09 08:25:30 +0200
message:
Open 0.97.0 for development.
modified:
__init__.py
setup.py
------------------------------------------------------------
revno: 621.18.2
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2009-07-09 21:31:02 +0200
message:
Merge back 0.96 branch after releasing 0.96.1
modified:
NEWS
------------------------------------------------------------
revno: 621.18.3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Thu 2009-07-09 22:43:27 +0200
message:
Merge back 0.96 branch after releasing 0.96.2
added:
credits.pickle
modified:
.bzrignore
NEWS
------------------------------------------------------------
revno: 621.18.4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2009-07-18 23:25:11 +0200
message:
Merge import fix.
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 621.19.1
committer: Alexandre Défossez <alexandre.defossez at gmail.com>
branch nick: gtk
timestamp: Wed 2009-06-24 22:13:34 +0200
message:
import error fixed
modified:
nautilus-bzr.py
------------------------------------------------------------
revno: 621.18.5
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2009-07-18 23:31:49 +0200
message:
Merge removal of unnecessary import from Mario and rmeove some more unnecessary imports.
modified:
commands.py
------------------------------------------------------------
revno: 621.20.1
committer: Mario Danic <mario.danic at gmail.com>
branch nick: bzr-gtk
timestamp: Fri 2009-05-29 10:28:10 +0200
message:
Fix wrongly placed import os
modified:
commands.py
------------------------------------------------------------
revno: 621.18.6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2009-07-18 23:38:27 +0200
message:
Merge replacement for guess_language with small tweak: use the canonical implementation if we can.
modified:
diff.py
------------------------------------------------------------
revno: 621.21.1
committer: Rene Huber <rhuber at ubuntu>
branch nick: bzr-gtk-rene
timestamp: Fri 2009-07-03 17:46:25 -0400
message:
Workaround of gtksourceview2 guess_language() for Hardy
modified:
diff.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py 2009-07-09 19:58:59 +0000
+++ b/__init__.py 2009-07-09 20:43:27 +0000
@@ -45,7 +45,7 @@
import os.path
-version_info = (0, 96, 2, 'final')
+version_info = (0, 97, 0, 'dev', 1)
if version_info[3] == 'final':
version_string = '%d.%d.%d' % version_info[:3]
=== modified file 'commands.py'
--- a/commands.py 2009-06-09 14:15:11 +0000
+++ b/commands.py 2009-07-18 21:31:49 +0000
@@ -17,7 +17,6 @@
from bzrlib import (
branch,
builtins,
- merge_directive,
workingtree,
)
from bzrlib.commands import (
@@ -26,12 +25,14 @@
)
from bzrlib.errors import (
BzrCommandError,
+ NoWorkingTree,
NotVersionedError,
NoSuchFile,
)
from bzrlib.option import Option
from bzrlib.plugins.gtk import (
+ _i18n,
open_display,
import_pygtk,
set_ui_factory,
@@ -269,12 +270,8 @@
takes_options = []
def run(self, filename=None):
- import os
open_display()
from commit import CommitDialog
- from bzrlib.errors import (BzrCommandError,
- NotBranchError,
- NoWorkingTree)
wt = None
br = None
@@ -310,7 +307,6 @@
takes_options = ['revision']
def run(self, path='.', revision=None):
- import os
gtk = open_display()
from bzrlib.plugins.gtk.status import StatusWindow
(wt, wt_path) = workingtree.WorkingTree.open_containing(path)
@@ -432,7 +428,7 @@
other_branch = local_branch.get_parent()
if other_branch is None:
- raise errors.BzrCommandError("No peer location known or specified.")
+ raise BzrCommandError("No peer location known or specified.")
remote_branch = Branch.open_containing(other_branch)[0]
set_ui_factory()
local_branch.lock_read()
=== modified file 'debian/changelog'
--- a/debian/changelog 2009-07-17 11:27:16 +0000
+++ b/debian/changelog 2009-07-28 14:35:45 +0000
@@ -1,6 +1,8 @@
-bzr-gtk (0.96.2-2) UNRELEASED; urgency=low
+bzr-gtk (0.96.2+bzr657-1) UNRELEASED; urgency=low
* Change section to vcs.
+ * New upstream snapshot.
+ + Fixes import in nautilus-bzr. Closes: #532149
-- Jelmer Vernooij <jelmer at debian.org> Fri, 17 Jul 2009 13:27:07 +0200
=== modified file 'diff.py'
--- a/diff.py 2009-06-12 14:22:05 +0000
+++ b/diff.py 2009-07-18 21:38:27 +0000
@@ -46,6 +46,14 @@
from dialog import error_dialog, info_dialog, warning_dialog
+def fallback_guess_language(slm, content_type):
+ for lang_id in slm.get_language_ids():
+ lang = slm.get_language(lang_id)
+ if "text/x-patch" in lang.get_mime_types():
+ return lang
+ return None
+
+
class SelectCancelled(Exception):
pass
@@ -66,7 +74,9 @@
if have_gtksourceview:
self.buffer = gtksourceview2.Buffer()
slm = gtksourceview2.LanguageManager()
- gsl = slm.guess_language(content_type="text/x-patch")
+ guess_language = getattr(gtksourceview2.LanguageManager,
+ "guess_language", fallback_guess_language)
+ gsl = guess_language(slm, content_type="text/x-patch")
if have_gconf:
self.apply_gedit_colors(self.buffer)
self.apply_colordiff_colors(self.buffer)
=== modified file 'nautilus-bzr.py'
--- a/nautilus-bzr.py 2009-05-04 20:06:58 +0000
+++ b/nautilus-bzr.py 2009-06-24 20:13:34 +0000
@@ -19,7 +19,8 @@
from bzrlib.plugin import load_plugins
load_plugins()
-from bzrlib.plugins.gtk import _i18n, cmd_gannotate, start_viz_window
+from bzrlib.plugins.gtk import _i18n
+from bzrlib.plugins.gtk.commands import cmd_gannotate, start_viz_window
print "Bazaar nautilus module initialized"
=== modified file 'setup.py'
--- a/setup.py 2009-07-09 19:58:59 +0000
+++ b/setup.py 2009-07-09 20:43:27 +0000
@@ -137,7 +137,7 @@
setup(
name = "bzr-gtk",
- version = "0.96.2",
+ version = "0.97.0",
maintainer = "Jelmer Vernooij",
maintainer_email = "jelmer at samba.org",
description = "GTK+ Frontends for various Bazaar commands",
More information about the Pkg-bazaar-commits
mailing list