[Pkg-bazaar-commits] ./bzr-gtk/unstable r646: New upstream release
James Westby
james.westby at canonical.com
Wed Aug 26 12:44:59 UTC 2009
------------------------------------------------------------
revno: 646 [merge]
committer: James Westby <james.westby at canonical.com>
branch nick: bzr-gtk
timestamp: Wed 2009-08-26 13:44:59 +0100
message:
New upstream release
removed:
credits.pickle
added:
icons/emblem-bzr-ignored.svg
modified:
.bzrignore
MANIFEST.in
NEWS
__init__.py
debian/changelog
keyring.py
nautilus-bzr.py
setup.py
tests/test_commit.py
-------------- next part --------------
=== modified file '.bzrignore'
--- a/.bzrignore 2009-07-09 19:58:59 +0000
+++ b/.bzrignore 2009-07-11 18:39:14 +0000
@@ -10,3 +10,4 @@
bzr-gtk.trunk-matkor.e3p
bzr-gtk.trunk-matkor.e3s
bzr-gtk.trunk-matkor.e3t
+credits.pickle
=== modified file 'MANIFEST.in'
--- a/MANIFEST.in 2005-10-17 01:07:49 +0000
+++ b/MANIFEST.in 2009-07-11 19:00:11 +0000
@@ -1,2 +1,14 @@
include AUTHORS
include COPYING
+include HACKING
+include NEWS
+include TODO
+include bzr-gtk.applications
+include bzr-gtk.cfg
+include credits.pickle
+include olive-gtk.1
+include preferences/TODO
+include *.desktop
+include *.ui
+recursive-include icons *.png *.svg
+recursive-include po *.po *.pot
=== modified file 'NEWS'
--- a/NEWS 2009-07-09 19:58:59 +0000
+++ b/NEWS 2009-08-25 14:11:55 +0000
@@ -1,3 +1,20 @@
+0.97.0 2009-08-25
+
+BUG FIXES
+
+ * Avoid GnomeKeyringCredentialStore traceback on Ubuntu Hardy
+ by being more tolerant about gobject methods availability.
+ (Vincent Ladeuil, #403430)
+
+ * Fixed emblem and nautilus bzr-status column for ignored files.
+ (Lucas Shrewsbury, #294632)
+
+ * Fixed emblem and nautilus bzr-status column for unversioned files.
+ (Lucas Shrewsbury, #417966)
+
+ * Switch to using disutils sdist instead of bzr export.
+ (Mark Lee, #398242)
+
0.96.2 2009-07-08
BUG FIXES
=== modified file '__init__.py'
--- a/__init__.py 2009-07-09 20:43:27 +0000
+++ b/__init__.py 2009-08-25 14:11:55 +0000
@@ -45,7 +45,7 @@
import os.path
-version_info = (0, 97, 0, 'dev', 1)
+version_info = (0, 97, 0, 'final')
if version_info[3] == 'final':
version_string = '%d.%d.%d' % version_info[:3]
@@ -56,7 +56,8 @@
COMPATIBLE_BZR_VERSIONS = [(1, 6, 0), (1, 7, 0), (1, 8, 0), (1, 9, 0),
(1, 10, 0), (1, 11, 0), (1, 12, 0), (1, 13, 0),
(1, 15, 0),
- (1, 17, 0),]
+ (1, 17, 0),
+ ]
bzrlib.api.require_any_api(bzrlib, COMPATIBLE_BZR_VERSIONS)
=== removed file 'credits.pickle'
--- a/credits.pickle 2009-07-09 19:58:59 +0000
+++ b/credits.pickle 1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-((lp0
-S'Jelmer Vernooij <jelmer at samba.org>'
-p1
-aS'Daniel Schierbeck <daniel.schierbeck at gmail.com>'
-p2
-aS'Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>'
-p3
-aS'Gary van der Merwe <garyvdm at gmail.com>'
-p4
-aS'Jasper Groenewegen <colbrac at xs4all.nl>'
-p5
-aS'John Arbash Meinel <john at arbash-meinel.com>'
-p6
-aS'Aaron Bentley <abentley at panoramicfeedback.com>'
-p7
-aS'Vincent Ladeuil <v.ladeuil+lp at free.fr>'
-p8
-aS'Aaron Bentley <aaron at aaronbentley.com>'
-p9
-aS'Alexander Belchenko <bialix at ukr.net>'
-p10
-aS'David Allouche <david.allouche at canonical.com>'
-p11
-aS'Dan Loda <danloda at gmail.com>'
-p12
-aS'Aaron Bentley <aaron.bentley at utoronto.ca>'
-p13
-aS'Scott James Remnant <scott at netsplit.com>'
-p14
-aS'Scott Scriven <ubuntu at toykeeper.net>'
-p15
-aS'Mateusz Korniak <matkor at laptop-hp>'
-p16
-aS'Robert Collins <robertc at robertcollins.net>'
-p17
-aS'Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>'
-p18
-aS'Martin Albisetti <argentina at gmail.com>'
-p19
-aS'Sabin Iacob (m0n5t3r) <iacobs at m0n5t3r.info>'
-p20
-aS'Javier Derderian <javierder at gmail.com>'
-p21
-aS'jbailey at ubuntu.com'
-p22
-aS'Gary van der Merwe <garyvdm at garyvdm-desktop>'
-p23
-aS'Richard Ferguson <ubuntu at fergusnet.com>'
-p24
-aS'Elliot Murphy <elliot at elliotmurphy.com>'
-p25
-aVAdeodato Sim? <dato at net.com.org.es>
-p26
-aS'v.ladeuil+lp at free.fr'
-p27
-aS'Szilveszter Farkas <szilveszter.farkas at gmail.com>'
-p28
-aS'Wouter van Heyst <larstiq at larstiq.dyndns.org>'
-p29
-aS'Torsten Landschoff <torsten at debian.org>'
-p30
-aS'Jamie Wilkinson <jaq at spacepants.org>'
-p31
-aS'Gediminas Paulauskas <menesis at pov.lt>'
-p32
-aS'Ali Sabil <ali.sabil at gmail.com>'
-p33
-aS'Adrian Wilkins <adrian.wilkins at gmail.com>'
-p34
-aS'Michael Ellerman <michael at ellerman.id.au>'
-p35
-aS'Mateusz Korniak (matkor at laptop-hp)'
-p36
-aS'Jelmer Vernooij <Jelmer Vernooij at LENOVO-C29B82CD>'
-p37
-aS'Farkas Szilveszter <szilveszter at szilveszter-desktop>'
-p38
-aVDaniel Sch?mer <daniel.schoemer at gmx.net>
-p39
-aS'Chris Lamb <chris at chris-lamb.co.uk>'
-p40
-aS'Chad MILLER <chad at mysql.com>'
-p41
-aS'rodney.dawes at canonical.com'
-p42
-aS'matkor <matkor at laptop-hp>'
-p43
-aS'klight at walkertechnical.com'
-p44
-aS'klight <klight at X111>'
-p45
-aS'Vincent Geddes <vincent.geddes at gmail.com>'
-p46
-aS'Tom Badran <tom at badrunner.net>'
-p47
-aS'Szilveszter Farkas <szilveszter at MacBookPro.local>'
-p48
-aVSt?phane Raimbault <stephane.raimbault at gmail.com>
-p49
-aS'Scott James Remnant <scott at ubuntu.com>'
-p50
-aS'Russ Brown <pickscrape at gmail.com>'
-p51
-aS'Richard Ferguson <fergus at fergusnet.com>'
-p52
-aS'Michael Vogt <michael.vogt at ubuntu.com>'
-p53
-aS'Markus Korn <thekorn at gmx.de>'
-p54
-aS'Kevin Light <klight at walkertechnical.com>'
-p55
-aVJean-Fran?ois Fortin Tam <jeff at ecchi.ca>
-p56
-aS'Jasper Groenewegen <colbrac at xs4al.nl>'
-p57
-aS'James Westby <jw+debian at jameswestby.net>'
-p58
-aS'James Henstridge <james at jamesh.id.au>'
-p59
-aS'Erik Bagfors <erik at bagfors.nu>'
-p60
-aS'Dennis Miller <millerdl at telusplanet.net>'
-p61
-aS'Andrew Bennetts <andrew at puzzling.org>'
-p62
-a(lp63
-S'Jelmer Vernooij <jelmer at samba.org>'
-p64
-aS'Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>'
-p65
-aS'Daniel Schierbeck <daniel.schierbeck at gmail.com>'
-p66
-ag12
-aS'Gary van der Merwe <garyvdm at gmail.com>'
-p67
-aS'Vincent Ladeuil <v.ladeuil+lp at free.fr>'
-p68
-aVAdeodato Sim? <dato at net.com.org.es>
-p69
-aS'Szilveszter Farkas <szilveszter at MacBookPro.local>'
-p70
-aS'Szilveszter Farkas <szilveszter.farkas at gmail.com>'
-p71
-aS'Scott Scriven <ubuntu at toykeeper.net>'
-p72
-ag14
-ag58
-ag43
-aS'jbailey at ubuntu.com'
-p73
-aS'Tom Badran <tom at badrunner.net>'
-p74
-ag50
-aS'Russ Brown <pickscrape at gmail.com>'
-p75
-aS'Robert Collins <robertc at robertcollins.net>'
-p76
-aS'Mateusz Korniak <matkor at laptop-hp>'
-p77
-aS'Martin Albisetti <argentina at gmail.com>'
-p78
-aS'Kiddo <nekohayo at gmail.com>'
-p79
-ag55
-aS'Jelmer Vernooij <Jelmer Vernooij at LENOVO-C29B82CD>'
-p80
-aS'Jasper Groenewegen <colbrac at xs4all.nl>'
-p81
-ag23
-aS'David Allouche <david.allouche at canonical.com>'
-p82
-aS'Aaron Bentley <abentley at panoramicfeedback.com>'
-p83
-a(lp84
-S'Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>'
-p85
-aS'Daniel Schierbeck <daniel.schierbeck at gmail.com>'
-p86
-aS'Martin Albisetti <argentina at gmail.com>'
-p87
-aS'Jelmer Vernooij <jelmer at samba.org>'
-p88
-a(lp89
-S'Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>'
-p90
-aS'Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>'
-p91
-ag49
-atp92
-.
\ No newline at end of file
=== modified file 'debian/changelog'
--- a/debian/changelog 2009-07-28 14:35:45 +0000
+++ b/debian/changelog 2009-08-26 12:44:59 +0000
@@ -1,4 +1,4 @@
-bzr-gtk (0.96.2+bzr657-1) UNRELEASED; urgency=low
+bzr-gtk (0.97.0-1) UNRELEASED; urgency=low
* Change section to vcs.
* New upstream snapshot.
=== added file 'icons/emblem-bzr-ignored.svg'
--- a/icons/emblem-bzr-ignored.svg 1970-01-01 00:00:00 +0000
+++ b/icons/emblem-bzr-ignored.svg 2009-08-24 05:45:14 +0000
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="47.999989"
+ height="48.000156"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="emblem-bzr-ignored.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.0">
+ <defs
+ id="defs4"><inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+<inkscape:perspective
+ id="perspective2810"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 24 : 1"
+ sodipodi:type="inkscape:persp3d" />
+
+
+
+
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#path2394_1_"
+ id="linearGradient2854"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.3933,0,0,-3.4122,218.9189,318.1022)"
+ x1="-61.669102"
+ y1="89.502403"
+ x2="-66.316704"
+ y2="102.8654" />
+
+
+
+
+
+
+
+
+
+
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.2"
+ inkscape:cx="26.312796"
+ inkscape:cy="20.859372"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1440"
+ inkscape:window-height="815"
+ inkscape:window-x="0"
+ inkscape:window-y="33" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-402.78946,-590.46098)">
+ <g
+ id="g3730">
+ <path
+ d="M 450.78945,614.57487 C 450.78945,627.76661 440.04465,638.46113 426.78945,638.46113 C 413.53426,638.46113 402.78946,627.76661 402.78946,614.57487 C 402.78946,601.38313 413.53426,590.68861 426.78945,590.68861 C 440.04465,590.68861 450.78945,601.38313 450.78945,614.57487 L 450.78945,614.57487 z"
+ id="path1880"
+ style="fill:#cecece;fill-opacity:1" />
+ <path
+ d="M 410.65906,604.57402 L 442.70145,604.38984 L 426.84705,631.00774 L 410.65906,604.57402 z"
+ randomized="0"
+ rounded="-5.8980598e-17"
+ flatsided="true"
+ arg2="2.3170736"
+ arg1="1.2698761"
+ r2="1.1936886"
+ r1="2.387377"
+ cy="4.4422603"
+ cx="5.0319409"
+ sides="3"
+ type="star"
+ id="path1876"
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.62367463;stroke-linecap:round;stroke-linejoin:round" />
+ <a
+ transform="matrix(0.8635686,0,0,-0.8635686,58.384145,1148.9732)"
+ id="a3656">
+ <rect
+ style="fill:#cecece;fill-opacity:1;stroke:#cecece;stroke-width:0.81032175;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+ id="rect1878"
+ x="424.77585"
+ y="605.72937"
+ width="3.9887989"
+ height="11.656094" />
+ </a>
+ <rect
+ transform="scale(1,-1)"
+ height="2.9972355"
+ width="4.0166292"
+ y="-612.50317"
+ x="424.97717"
+ id="rect1880"
+ style="fill:#cecece;fill-opacity:1;stroke:#cecece;stroke-width:0.41237092;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+ <polygon
+ transform="matrix(2.3999994,0,0,2.3919749,400.38946,588.22966)"
+ points="5.148,9.137 12.528,7.054 13.806,11.666 6.427,13.749 5.148,9.137 "
+ id="rect2942"
+ style="fill:none" />
+ <g
+ label="Layer 1"
+ transform="matrix(3.3932944,0,0,3.4122168,400.02647,587.51282)"
+ id="g1972">
+
+ <linearGradient
+ gradientTransform="matrix(3.3933,0,0,-3.4122,218.9189,318.1022)"
+ y2="102.8654"
+ x2="-66.316704"
+ y1="89.502403"
+ x1="-61.669102"
+ gradientUnits="userSpaceOnUse"
+ id="path2394_1_">
+ <stop
+ id="stop2800"
+ style="stop-color:#EEEEEC"
+ offset="0" />
+
+ <stop
+ id="stop2802"
+ style="stop-color:#EEEEEC"
+ offset="1" />
+
+ </linearGradient>
+
+ <path
+ d="M 7.943,0.864 C 4.039,0.864 0.849,4 0.849,7.864 C 0.849,8.086 0.863,8.408 0.884,8.624 C 1.34,8.366 1.738,8.039 2.268,7.809 C 3.793,7.148 5.583,6.483 7.599,6.114 C 9.614,5.745 11.805,5.551 14.13,5.551 C 14.274,5.551 14.393,5.581 14.536,5.582 C 13.571,2.854 11.028,0.864 7.943,0.864 z"
+ nodetypes="cscssscc"
+ id="path2394"
+ style="fill:url(#linearGradient2854)" />
+
+ </g>
+ </g>
+ </g>
+</svg>
=== modified file 'keyring.py'
--- a/keyring.py 2009-06-04 21:10:21 +0000
+++ b/keyring.py 2009-08-12 17:53:03 +0000
@@ -29,9 +29,13 @@
def __init__(self):
CredentialStore.__init__(self)
- # External apps that load bzrlib may also set this, so
- # don't override:
- if gobject.get_application_name() is None:
+ # Older versions of gobject don't provide get_application_name so we
+ # can't always check.
+ get_app_name = getattr(gobject, 'get_application_name', None)
+ if get_app_name is None or get_app_name() is None:
+ # External applications that load bzrlib may already have set the
+ # application name so we don't contradict them (when we can
+ # determine it that is).
gobject.set_application_name("bzr")
def decode_password(self, credentials):
=== modified file 'nautilus-bzr.py'
--- a/nautilus-bzr.py 2009-06-24 20:13:34 +0000
+++ b/nautilus-bzr.py 2009-08-24 05:45:14 +0000
@@ -401,10 +401,17 @@
emblem = None
status = None
- if tree.has_filename(path):
+ id = tree.path2id(path)
+ if id == None:
+ if tree.is_ignored(path):
+ status = 'ignored'
+ emblem = 'bzr-ignored'
+ else:
+ status = 'unversioned'
+
+ elif tree.has_filename(path):
emblem = 'bzr-controlled'
status = 'unchanged'
- id = tree.path2id(path)
delta = tree.changes_from(tree.branch.basis_tree())
if delta.touches_file_id(id):
=== modified file 'setup.py'
--- a/setup.py 2009-07-09 20:43:27 +0000
+++ b/setup.py 2009-08-25 13:48:26 +0000
@@ -196,7 +196,8 @@
'icons/emblem-bzr-conflict.svg',
'icons/emblem-bzr-controlled.svg',
'icons/emblem-bzr-modified.svg',
- 'icons/emblem-bzr-removed.svg'])
+ 'icons/emblem-bzr-removed.svg',
+ 'icons/emblem-bzr-ignored.svg'])
],
cmdclass={'install_data': InstallData,
'build_credits': CreateCredits,
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2009-06-10 18:07:35 +0000
+++ b/tests/test_commit.py 2009-08-25 13:33:32 +0000
@@ -988,13 +988,14 @@
rev = tree.branch.repository.get_revision(rev_id2)
self.assertEqual('Commit just "a"', rev.message)
file_info = rev.properties['file-info']
- self.assertEqual('ld7:file_id4:a-id'
- '7:message14:Message for A\n'
- '4:path1:a'
- 'ee', file_info)
+ self.assertEqual(u'ld7:file_id4:a-id'
+ '7:message14:Message for A\n'
+ '4:path1:a'
+ 'ee',
+ file_info)
self.assertEqual([{'path':'a', 'file_id':'a-id',
- 'message':'Message for A\n'},
- ], bencode.bdecode(file_info))
+ 'message':'Message for A\n'},],
+ bencode.bdecode(file_info.encode('UTF-8')))
def test_commit_messages_after_merge(self):
tree = self.make_branch_and_tree('tree')
@@ -1021,13 +1022,14 @@
self.assertEqual('Merging from "tree2"\n', rev.message)
self.assertEqual([rev_id1, rev_id2], rev.parent_ids)
file_info = rev.properties['file-info']
- self.assertEqual('ld7:file_id4:a-id'
- '7:message14:Message for A\n'
- '4:path1:a'
- 'ee', file_info)
+ self.assertEqual(u'ld7:file_id4:a-id'
+ '7:message14:Message for A\n'
+ '4:path1:a'
+ 'ee',
+ file_info)
self.assertEqual([{'path':'a', 'file_id':'a-id',
- 'message':'Message for A\n'},
- ], bencode.bdecode(file_info))
+ 'message':'Message for A\n'},],
+ bencode.bdecode(file_info.encode('UTF-8')))
def test_commit_unicode_messages(self):
self.requireFeature(tests.UnicodeFilenameFeature)
More information about the Pkg-bazaar-commits
mailing list