Rev 478: merge bzr-gtk trunk in file:///v/home/vila/.bazaar/plugins/gtk/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Mon May 5 19:18:11 BST 2008
At file:///v/home/vila/.bazaar/plugins/gtk/
------------------------------------------------------------
revno: 478
revision-id: v.ladeuil+lp at free.fr-20080505181808-ilh1cyl2v4crpc5i
parent: v.ladeuil+lp at free.fr-20080505181646-n95l8ltw2u6jtr26
parent: jelmer at samba.org-20080504202356-64wc0mcpsqd708xq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: gtk
timestamp: Mon 2008-05-05 20:18:08 +0200
message:
merge bzr-gtk trunk
modified:
NEWS news-20070325173539-3va57o99cz3o57xe-1
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
annotate/gannotate.py xannotate.py-20051024072750-fe35acd6bb909bd3
branchview/graphcell.py graphcell.py-20051017001313-5b9651e6d3a578bc
branchview/linegraph.py graph.py-20051016214152-ebf565808c860cf7
bzr-handle-patch.desktop handlepatch.desktop-20080402181555-dnlazy184jst2ww1-1
bzr-notify.desktop bzrnotify.desktop-20070713215921-629u4nx1ymhrtl95-1
olive-gtk.desktop olivegtk.desktop-20060815170839-qylqcjkyiwcqysnr-1
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
revisionview.py logview.py-20051024072750-4d5c28cb73611027
seahorse.py crypt.py-20080401000513-m7ksudqlvqbdfejf-1
setup.py setup.py-20060716162505-h2isrtlg8lmlg2o2-1
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 475.1.12
revision-id: jelmer at samba.org-20080504202356-64wc0mcpsqd708xq
parent: jelmer at samba.org-20080504183655-qi2oc5f94b8i3kcn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-05-04 22:23:56 +0200
message:
Start working on 0.95.0.
modified:
NEWS news-20070325173539-3va57o99cz3o57xe-1
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
setup.py setup.py-20060716162505-h2isrtlg8lmlg2o2-1
------------------------------------------------------------
revno: 475.1.11
tags: bzr-gtk-0.94.0
revision-id: jelmer at samba.org-20080504183655-qi2oc5f94b8i3kcn
parent: jelmer at samba.org-20080504182846-z98bsigxxnly8b6n
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-05-04 20:36:55 +0200
message:
Release 0.94.0.
modified:
NEWS news-20070325173539-3va57o99cz3o57xe-1
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
setup.py setup.py-20060716162505-h2isrtlg8lmlg2o2-1
------------------------------------------------------------
revno: 475.1.10
revision-id: jelmer at samba.org-20080504182846-z98bsigxxnly8b6n
parent: jelmer at samba.org-20080504181601-u5gh89q8l2we201l
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-05-04 20:28:46 +0200
message:
Disable signature tab until we actually start verifying the testament.
modified:
NEWS news-20070325173539-3va57o99cz3o57xe-1
revisionview.py logview.py-20051024072750-4d5c28cb73611027
------------------------------------------------------------
revno: 475.1.9
revision-id: jelmer at samba.org-20080504181601-u5gh89q8l2we201l
parent: jelmer at samba.org-20080504131126-82j2fsopc66vrfr1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-05-04 20:16:01 +0200
message:
Fix display of children in branchview.
modified:
NEWS news-20070325173539-3va57o99cz3o57xe-1
branchview/linegraph.py graph.py-20051016214152-ebf565808c860cf7
------------------------------------------------------------
revno: 475.1.8
revision-id: jelmer at samba.org-20080504131126-82j2fsopc66vrfr1
parent: jelmer at samba.org-20080501220713-e23350wearov8smj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-05-04 15:11:26 +0200
message:
Fix diff test.
modified:
tests/test_commit.py test_commit.py-20070928204312-v6ffg8vz27644log-2
------------------------------------------------------------
revno: 475.1.7
revision-id: jelmer at samba.org-20080501220713-e23350wearov8smj
parent: jelmer at samba.org-20080501215910-1la3cz3uyz2cjy1k
parent: jelmer at samba.org-20080501130015-lmn22j03044vqngp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-05-02 00:07:13 +0200
message:
Merge desktop file fixes.
modified:
bzr-handle-patch.desktop handlepatch.desktop-20080402181555-dnlazy184jst2ww1-1
bzr-notify.desktop bzrnotify.desktop-20070713215921-629u4nx1ymhrtl95-1
olive-gtk.desktop olivegtk.desktop-20060815170839-qylqcjkyiwcqysnr-1
------------------------------------------------------------
revno: 475.3.1
revision-id: jelmer at samba.org-20080501130015-lmn22j03044vqngp
parent: jelmer at samba.org-20080430130830-i1y4ytmi5ov6km4f
author: Chris Lamb <chris at chris-lamb.co.uk>
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: desktop-categories
timestamp: Thu 2008-05-01 15:00:15 +0200
message:
Set suitable FDO categories in .desktop files
modified:
bzr-handle-patch.desktop handlepatch.desktop-20080402181555-dnlazy184jst2ww1-1
bzr-notify.desktop bzrnotify.desktop-20070713215921-629u4nx1ymhrtl95-1
olive-gtk.desktop olivegtk.desktop-20060815170839-qylqcjkyiwcqysnr-1
------------------------------------------------------------
revno: 475.1.6
revision-id: jelmer at samba.org-20080501215910-1la3cz3uyz2cjy1k
parent: jelmer at samba.org-20080501214950-zjs5qxi898ol12eb
parent: daniel.schierbeck at gmail.com-20080402232111-a2psy91ng4m9pvnb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-05-01 23:59:10 +0200
message:
Merge white strokes impovements.
modified:
branchview/graphcell.py graphcell.py-20051017001313-5b9651e6d3a578bc
------------------------------------------------------------
revno: 450.9.5
revision-id: daniel.schierbeck at gmail.com-20080402232111-a2psy91ng4m9pvnb
parent: daniel.schierbeck at gmail.com-20080402231138-udfjc1oz5a52kssp
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: graphcell-selected
timestamp: Thu 2008-04-03 01:21:11 +0200
message:
Fixed bug where the broken lines markers were not drawn correctly.
modified:
branchview/graphcell.py graphcell.py-20051017001313-5b9651e6d3a578bc
------------------------------------------------------------
revno: 450.9.4
revision-id: daniel.schierbeck at gmail.com-20080402231138-udfjc1oz5a52kssp
parent: daniel.schierbeck at gmail.com-20080402223913-1elzz7whd76fw08d
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: graphcell-selected
timestamp: Thu 2008-04-03 01:11:38 +0200
message:
Removed white breaks between joining lines.
modified:
branchview/graphcell.py graphcell.py-20051017001313-5b9651e6d3a578bc
------------------------------------------------------------
revno: 450.9.3
revision-id: daniel.schierbeck at gmail.com-20080402223913-1elzz7whd76fw08d
parent: daniel.schierbeck at gmail.com-20080402222453-4dz37ykwfh5pyojn
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: graphcell-selected
timestamp: Thu 2008-04-03 00:39:13 +0200
message:
Made the line graph be stroked with white instead of filled.
modified:
branchview/graphcell.py graphcell.py-20051017001313-5b9651e6d3a578bc
------------------------------------------------------------
revno: 450.9.2
revision-id: daniel.schierbeck at gmail.com-20080402222453-4dz37ykwfh5pyojn
parent: daniel.schierbeck at gmail.com-20080401212548-wdo2rhv9z0nvcwjc
parent: daniel.schierbeck at gmail.com-20080402203042-sygle06ro6v9pu2l
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: graphcell-selected
timestamp: Thu 2008-04-03 00:24:53 +0200
message:
Merged with trunk.
added:
icons/tag-16.png tag16.png-20080402002128-woq3y8g35is6jrv6-1
modified:
AUTHORS AUTHORS-20051017005451-498ad64fcc9771a0
preferences/plugins.py plugins.py-20080328193019-jhdtj2h9foskjijv-1
viz/branchwin.py branchwin.py-20051016222514-15fd120652fcf25c
------------------------------------------------------------
revno: 450.9.1
revision-id: daniel.schierbeck at gmail.com-20080401212548-wdo2rhv9z0nvcwjc
parent: jelmer at samba.org-20080401102012-yinvbwqulfci6x6h
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: graphcell-selected
timestamp: Tue 2008-04-01 23:25:48 +0200
message:
Made the graph cell renderer draw in white when the row is selected.
modified:
branchview/graphcell.py graphcell.py-20051017001313-5b9651e6d3a578bc
------------------------------------------------------------
revno: 475.1.5
revision-id: jelmer at samba.org-20080501214950-zjs5qxi898ol12eb
parent: jelmer at samba.org-20080501212233-ekkpkb7poy5j4xt8
parent: daniel.schierbeck at gmail.com-20080430112601-yul8svagkmpeqxwo
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-05-01 23:49:50 +0200
message:
Merge DBus fix from Daniel, fix comment.
modified:
seahorse.py crypt.py-20080401000513-m7ksudqlvqbdfejf-1
------------------------------------------------------------
revno: 473.2.1
revision-id: daniel.schierbeck at gmail.com-20080430112601-yul8svagkmpeqxwo
parent: aaron at aaronbentley.com-20080428222406-sd3i9mjfwjzap5gr
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: fix-missing-dbus
timestamp: Wed 2008-04-30 13:26:01 +0200
message:
Made the seahorse module fail correctly when a proper version of DBus isn't found.
modified:
seahorse.py crypt.py-20080401000513-m7ksudqlvqbdfejf-1
------------------------------------------------------------
revno: 475.1.4
revision-id: jelmer at samba.org-20080501212233-ekkpkb7poy5j4xt8
parent: jelmer at samba.org-20080501131258-kf7xsk1znq5zk1je
parent: jelmer at samba.org-20080425203554-jis69rrvj0l3q6mb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-05-01 23:22:33 +0200
message:
Merge gannotate fix.
------------------------------------------------------------
revno: 471.2.1
revision-id: jelmer at samba.org-20080425203554-jis69rrvj0l3q6mb
parent: jelmer at samba.org-20080425202721-3tyieulz174qbyth
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-04-25 21:35:54 +0100
message:
Fix gannotate.
modified:
revisionview.py logview.py-20051024072750-4d5c28cb73611027
------------------------------------------------------------
revno: 475.1.3
revision-id: jelmer at samba.org-20080501131258-kf7xsk1znq5zk1je
parent: jelmer at samba.org-20080501131123-d6z8r9uujyn2ahv2
parent: jelmer at samba.org-20080501130354-jmdltge9a07tydwl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-05-01 15:12:58 +0200
message:
Merge Chris' preferences installation fix.
modified:
setup.py setup.py-20060716162505-h2isrtlg8lmlg2o2-1
------------------------------------------------------------
revno: 475.2.1
revision-id: jelmer at samba.org-20080501130354-jmdltge9a07tydwl
parent: jelmer at samba.org-20080430130830-i1y4ytmi5ov6km4f
author: Chris Lamb <chris at chris-lamb.co.uk>
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: fix-preferences-install
timestamp: Thu 2008-05-01 15:03:54 +0200
message:
Build and install the bzrlib.plugins.gtk.preferences package
modified:
setup.py setup.py-20060716162505-h2isrtlg8lmlg2o2-1
------------------------------------------------------------
revno: 475.1.2
revision-id: jelmer at samba.org-20080501131123-d6z8r9uujyn2ahv2
parent: jelmer at samba.org-20080430130830-i1y4ytmi5ov6km4f
author: Chris Lamb <chris at chris-lamb.co.uk>
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-05-01 15:11:23 +0200
message:
Fix right-clicking in file list
modified:
olive/menu.py menu.py-20060803101046-9idg5lu81o53za8y-1
------------------------------------------------------------
revno: 475.1.1
revision-id: jelmer at samba.org-20080430130830-i1y4ytmi5ov6km4f
parent: jelmer at samba.org-20080425213841-4569rcvea3yx09q5
parent: andrew at puzzling.org-20080429081701-2pu9uteic8o88nre
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2008-04-30 14:08:30 +0100
message:
Merge Andrews' fix for gannotate.
modified:
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
annotate/gannotate.py xannotate.py-20051024072750-fe35acd6bb909bd3
------------------------------------------------------------
revno: 473.1.1
revision-id: andrew at puzzling.org-20080429081701-2pu9uteic8o88nre
parent: aaron at aaronbentley.com-20080428222406-sd3i9mjfwjzap5gr
committer: Andrew Bennetts <andrew at puzzling.org>
branch nick: bzr-gtk
timestamp: Tue 2008-04-29 18:17:01 +1000
message:
Simple hack to fix gannotate.
modified:
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
annotate/gannotate.py xannotate.py-20051024072750-fe35acd6bb909bd3
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-04-25 21:38:41 +0000
+++ b/NEWS 2008-05-04 20:23:56 +0000
@@ -1,3 +1,17 @@
+0.95.0 UNRELEASED
+
+
+0.94.0 2008-05-04
+
+ CHANGES
+
+ * Disabled signature tab until we start verifying testaments.
+ (Jelmer Vernooij)
+
+ BUG FIXES
+
+ * Fix display of children in branchview. (Jelmer Vernooij, #224914)
+
0.94.0rc1 2008-04-25
CHANGES
@@ -6,8 +20,6 @@
* Use new D-Bus revision signal. (James Henstridge, #206443)
- * Switched to using Seahorse to verify signatures. (Daniel Schierbeck)
-
UI
* Made the tags associated with a revision render next to the revision
@@ -51,11 +63,13 @@
* Only check for old Bazaar versions that are known to be incompatible and
no longer warn about newer (unknown) versions of Bazaar, on the assumption
- the API is sufficiently stable now. (Jelmer Vernooij)
+ the API is sufficiently stable now. (Jelmer Vernooij)
* Support child_submit_to setting in gsend. (Jelmer Vernooij)
- * Add tab if revision view showing the signature status. (Daniel Schierbeck, Jelmer Vernooij)
+ * Add tab to revision view showing the signature status. (Daniel Schierbeck, Jelmer Vernooij)
+
+ * Use seahorse to verify signatures. (Daniel Schierbeck)
INTERNALS
@@ -87,7 +101,7 @@
* Fixed logview bug in gannotate. (Daniel Schierbeck)
-0.92.0 2007-11-07
+0.92.0 2007-11-07
UI
@@ -140,7 +154,7 @@
* Avoid deprecation warning for all_plugins() in gpreferences. (Jelmer)
-0.91.0 2007-09-24
+0.91.0 2007-09-24
UI
@@ -179,7 +193,7 @@
* Added default_branch_path to MergeDialog and use it from olive-gtk.
(Mateusz Korniak)
-0.90.0 2007-08-27
+0.90.0 2007-08-27
FEATURES
@@ -280,7 +294,7 @@
* Fixed 'bzr gcommit' if command not issued in a branch (#113394, Szilveszter)
-0.16.0 2007-05-05
+0.16.0 2007-05-05
FEATURES
@@ -308,7 +322,7 @@
* Recommend installation as 'gtk' not 'bzr-gtk'. (#104110, Szilveszter)
-0.15.2 2007-04-03
+0.15.2 2007-04-03
BUG FIXES
@@ -325,7 +339,7 @@
* Display remote locations in commit-notify (Robert)
-0.15.1 2007-03-25
+0.15.1 2007-03-25
BUG FIXES
@@ -363,7 +377,7 @@
* Strict commits are now a dialog, not a check box (Jelmer)
-0.15.0 2007-03-09
+0.15.0 2007-03-09
BUG FIXES
@@ -407,14 +421,14 @@
* Add initial testsuite (Jelmer)
-0.14.0 2007-01-30
+0.14.0 2007-01-30
* Add revert functionality (Szilvester)
* Rewritten CommitDialog without glade (Szilvester)
* Allow to commit single files from the context menu (Fixes #54983,
- Szilvester)
+ Szilvester)
* Warn about incompatible Bazaar versions (Jelmer)
@@ -427,7 +441,7 @@
* Set default drive letter (#67924, Szilvester)
* Show error if no diff available for the selected file (#76536,
- Szilvester)
+ Szilvester)
* Handle current revision in annotate better (Aaron)
@@ -455,7 +469,7 @@
* Several other small regression fixes (Szilvester)
-0.13.0 2006-12-13
+0.13.0 2006-12-13
* Don't show pending merge list when there are no pending merges
(Alexander Belchenko)
@@ -478,7 +492,7 @@
* Use dotted revnos in gannotate (Aaron Bentley)
-0.12.0 2006-11-04
+0.12.0 2006-11-04
* #68127: gcommit is broken
=== modified file '__init__.py'
--- a/__init__.py 2008-05-05 18:16:46 +0000
+++ b/__init__.py 2008-05-05 18:18:08 +0000
@@ -37,7 +37,7 @@
import bzrlib
-version_info = (0, 94, 0, 'rc', 1)
+version_info = (0, 95, 0, 'dev', 1)
if version_info[3] == 'final':
version_string = '%d.%d.%d' % version_info[:3]
@@ -317,7 +317,7 @@
else:
revision_id = getattr(tree, 'get_revision_id', lambda: None)()
- window = GAnnotateWindow(all, plain)
+ window = GAnnotateWindow(all, plain, branch=br)
window.connect("destroy", lambda w: gtk.main_quit())
config = GAnnotateConfig(window)
window.show()
=== modified file 'annotate/gannotate.py'
--- a/annotate/gannotate.py 2008-04-24 15:26:14 +0000
+++ b/annotate/gannotate.py 2008-04-29 08:17:01 +0000
@@ -45,9 +45,10 @@
class GAnnotateWindow(Window):
"""Annotate window."""
- def __init__(self, all=False, plain=False, parent=None):
+ def __init__(self, all=False, plain=False, parent=None, branch=None):
self.all = all
self.plain = plain
+ self._branch = branch
Window.__init__(self, parent)
@@ -320,7 +321,7 @@
return tv
def _create_log_view(self):
- lv = RevisionView()
+ lv = RevisionView(self._branch)
lv.show()
return lv
=== modified file 'branchview/graphcell.py'
--- a/branchview/graphcell.py 2008-01-22 22:58:29 +0000
+++ b/branchview/graphcell.py 2008-04-02 23:21:11 +0000
@@ -149,19 +149,18 @@
box_size = self.box_size(widget)
ctx.set_line_width(box_size / 8)
- ctx.set_line_cap(cairo.LINE_CAP_ROUND)
# Draw lines into the cell
for start, end, colour in self.in_lines:
self.render_line (ctx, cell_area, box_size,
bg_area.y, bg_area.height,
- start, end, colour)
+ start, end, colour, flags)
# Draw lines out of the cell
for start, end, colour in self.out_lines:
self.render_line (ctx, cell_area, box_size,
bg_area.y + bg_area.height, bg_area.height,
- start, end, colour)
+ start, end, colour, flags)
# Draw the revision node in the right column
(column, colour) = self.node
@@ -169,6 +168,12 @@
cell_area.y + cell_area.height / 2,
box_size / 4, 0, 2 * math.pi)
+ if flags & gtk.CELL_RENDERER_SELECTED:
+ ctx.set_source_rgb(1.0, 1.0, 1.0)
+ ctx.set_line_width(box_size / 4)
+ ctx.stroke_preserve()
+ ctx.set_line_width(box_size / 8)
+
self.set_colour(ctx, colour, 0.0, 0.5)
ctx.stroke_preserve()
@@ -177,8 +182,9 @@
self.render_tags(ctx, widget.create_pango_context(), cell_area, box_size)
- def render_line(self, ctx, cell_area, box_size, mid, height, start, end, colour):
+ def render_line(self, ctx, cell_area, box_size, mid, height, start, end, colour, flags):
if start is None:
+ ctx.set_line_cap(cairo.LINE_CAP_ROUND)
x = cell_area.x + box_size * end + box_size / 2
ctx.move_to(x, mid + height / 3)
ctx.line_to(x, mid + height / 3)
@@ -186,29 +192,39 @@
ctx.line_to(x, mid + height / 6)
elif end is None:
+ ctx.set_line_cap(cairo.LINE_CAP_ROUND)
x = cell_area.x + box_size * start + box_size / 2
ctx.move_to(x, mid - height / 3)
ctx.line_to(x, mid - height / 3)
ctx.move_to(x, mid - height / 6)
ctx.line_to(x, mid - height / 6)
+
else:
+ ctx.set_line_cap(cairo.LINE_CAP_BUTT)
startx = cell_area.x + box_size * start + box_size / 2
endx = cell_area.x + box_size * end + box_size / 2
ctx.move_to(startx, mid - height / 2)
if start - end == 0 :
- ctx.line_to(endx, mid + height / 2)
+ ctx.line_to(endx, mid + height / 2 + 1)
else:
ctx.curve_to(startx, mid - height / 5,
startx, mid - height / 5,
startx + (endx - startx) / 2, mid)
-
+
ctx.curve_to(endx, mid + height / 5,
endx, mid + height / 5 ,
- endx, mid + height / 2)
-
+ endx, mid + height / 2 + 1)
+
+ if flags & gtk.CELL_RENDERER_SELECTED:
+ ctx.set_source_rgb(1.0, 1.0, 1.0)
+ ctx.set_line_width(box_size / 5)
+ ctx.stroke_preserve()
+ ctx.set_line_width(box_size / 8)
+
self.set_colour(ctx, colour, 0.0, 0.65)
+
ctx.stroke()
def render_tags(self, ctx, pango_ctx, cell_area, box_size):
=== modified file 'branchview/linegraph.py'
--- a/branchview/linegraph.py 2008-04-28 22:24:06 +0000
+++ b/branchview/linegraph.py 2008-05-04 18:16:01 +0000
@@ -57,7 +57,7 @@
graph_parents[revid] = parent_revids
for parent in parent_revids:
graph_children.setdefault(parent, []).append(revid)
- graph_children[revid] = []
+ graph_children.setdefault(revid, [])
for ghost in ghosts:
for ghost_child in graph_children[ghost]:
graph_parents[ghost_child] = [p for p in graph_parents[ghost_child]
=== modified file 'bzr-handle-patch.desktop'
--- a/bzr-handle-patch.desktop 2008-04-02 18:21:29 +0000
+++ b/bzr-handle-patch.desktop 2008-05-01 13:00:15 +0000
@@ -6,5 +6,5 @@
NoDisplay=true
Terminal=false
Type=Application
-Categories=
+Categories=Application;Development;RevisionControl;
MimeType=text/x-diff;text/x-patch;application/x-bazaar-merge-directive;
=== modified file 'bzr-notify.desktop'
--- a/bzr-notify.desktop 2007-07-15 15:13:34 +0000
+++ b/bzr-notify.desktop 2008-05-01 13:00:15 +0000
@@ -7,5 +7,5 @@
Comment=Notification Area Icon for Bazaar
Icon=bzr-icon-64.png
Exec=bzr commit-notify
-Categories=Application;Development;
+Categories=Application;Development;RevisionControl;
Terminal=false
=== modified file 'olive-gtk.desktop'
--- a/olive-gtk.desktop 2007-09-02 15:26:42 +0000
+++ b/olive-gtk.desktop 2008-05-01 13:00:15 +0000
@@ -9,4 +9,4 @@
Comment[pl]=Graficzny interfejs dla systemu kontroli wersji Bazaar
Icon=olive-gtk.png
Exec=olive-gtk
-Categories=Application;Development;Qt;KDE;RevisionControl;
+Categories=Application;Development;RevisionControl;
=== modified file 'olive/menu.py'
--- a/olive/menu.py 2008-05-05 18:16:46 +0000
+++ b/olive/menu.py 2008-05-05 18:18:08 +0000
@@ -37,7 +37,7 @@
from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
from bzrlib.plugins.gtk.diff import DiffWindow
from launch import launch
-from olive import Preferences
+from bzrlib.plugins.gtk.olive import Preferences
class OliveMenu:
""" This class is responsible for building the context menus. """
=== modified file 'revisionview.py'
--- a/revisionview.py 2008-04-25 20:35:54 +0000
+++ b/revisionview.py 2008-05-04 18:28:46 +0000
@@ -317,8 +317,9 @@
self._create_general()
self._create_relations()
- if has_seahorse:
- self._create_signature()
+ # Disabled because testaments aren't verified yet:
+ # if has_seahorse:
+ # self._create_signature()
self._create_file_info_view()
self._create_bugs()
=== modified file 'seahorse.py'
--- a/seahorse.py 2008-04-03 20:30:15 +0000
+++ b/seahorse.py 2008-05-01 21:49:50 +0000
@@ -31,6 +31,10 @@
try:
dbus.validate_bus_name(BUS_NAME)
except ValueError:
+ # Seahorse isn't installed
+ raise ImportError
+except AttributeError:
+ # Outdated version of DBus that doesn't have validate_bus_name
raise ImportError
bus = dbus.SessionBus()
=== modified file 'setup.py'
--- a/setup.py 2008-04-25 21:38:41 +0000
+++ b/setup.py 2008-05-04 20:23:56 +0000
@@ -91,11 +91,11 @@
setup(
name = "bzr-gtk",
- version = "0.94.0rc1",
+ version = "0.95.0",
maintainer = "Jelmer Vernooij",
maintainer_email = "jelmer at samba.org",
description = "GTK+ Frontends for various Bazaar commands",
- license = "GNU GPL v2",
+ license = "GNU GPL v2 or later",
scripts=['olive-gtk'],
package_dir = {
"bzrlib.plugins.gtk": ".",
@@ -104,6 +104,7 @@
"bzrlib.plugins.gtk.olive": "olive",
"bzrlib.plugins.gtk.tests": "tests",
"bzrlib.plugins.gtk.branchview": "branchview",
+ "bzrlib.plugins.gtk.preferences": "preferences",
},
packages = [
"bzrlib.plugins.gtk",
@@ -112,6 +113,7 @@
"bzrlib.plugins.gtk.olive",
"bzrlib.plugins.gtk.tests",
"bzrlib.plugins.gtk.branchview",
+ "bzrlib.plugins.gtk.preferences",
],
data_files=[('share/olive', ['olive.glade',
'cmenu.ui',
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2007-11-02 22:08:54 +0000
+++ b/tests/test_commit.py 2008-05-04 13:11:26 +0000
@@ -411,22 +411,22 @@
text = diff_buffer.get_text(diff_buffer.get_start_iter(),
diff_buffer.get_end_iter()).splitlines(True)
- self.assertEqual("=== removed file 'b'\n", text[0])
+ self.assertEqual("=== modified file 'a'\n", text[0])
self.assertContainsRe(text[1],
- r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
- self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[2])
- self.assertEqual('@@ -1,1 +0,0 @@\n', text[3])
- self.assertEqual('-contents of tree/b\n', text[4])
- self.assertEqual('\n', text[5])
-
- self.assertEqual("=== modified file 'a'\n", text[6])
- self.assertContainsRe(text[7],
r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
+ self.assertContainsRe(text[2],
+ r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
+ self.assertEqual('@@ -1,1 +1,1 @@\n', text[3])
+ self.assertEqual('-contents of tree/a\n', text[4])
+ self.assertEqual('+new contents for a\n', text[5])
+ self.assertEqual('\n', text[6])
+
+ self.assertEqual("=== removed file 'b'\n", text[7])
self.assertContainsRe(text[8],
- r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
- self.assertEqual('@@ -1,1 +1,1 @@\n', text[9])
- self.assertEqual('-contents of tree/a\n', text[10])
- self.assertEqual('+new contents for a\n', text[11])
+ r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
+ self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[9])
+ self.assertEqual('@@ -1,1 +0,0 @@\n', text[10])
+ self.assertEqual('-contents of tree/b\n', text[11])
self.assertEqual('\n', text[12])
self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
More information about the bazaar-commits
mailing list