# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: lp:bzr-gtk # testament_sha1: d435ec359cbab8841cd6d077144694549f288263 # timestamp: 2009-08-24 03:28:44 -0300 # base_revision_id: [email protected]\ # yqfy1dx582zomboa # # Begin patch === modified file 'NEWS' --- NEWS 2009-08-12 17:53:03 +0000 +++ NEWS 2009-08-24 05:45:14 +0000 @@ -5,6 +5,12 @@ * 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) 0.96.2 2009-07-08
=== added file 'icons/emblem-bzr-ignored.svg' --- icons/emblem-bzr-ignored.svg 1970-01-01 00:00:00 +0000 +++ 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 'nautilus-bzr.py' --- nautilus-bzr.py 2009-06-24 20:13:34 +0000 +++ 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' --- setup.py 2009-07-09 20:43:27 +0000 +++ setup.py 2009-08-24 05:45:14 +0000 @@ -137,7 +137,7 @@ setup( name = "bzr-gtk", - version = "0.97.0", + version = "0.96.2", maintainer = "Jelmer Vernooij", maintainer_email = "[email protected]", description = "GTK+ Frontends for various Bazaar commands", @@ -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, # Begin bundle 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 OFCQL98CAw==
signature.asc
Description: This is a digitally signed message part
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
