Rev 467: Merge support for applying patches/bundles to Bazaar branches. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 467
revision-id: jelmer at samba.org-20080425194806-n13oipwwyk5tg6a0
parent: jelmer at samba.org-20080425194123-pwb3nn0n89sgoio2
parent: jelmer at samba.org-20080402182129-6qf4awfg3j1zr13s
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Fri 2008-04-25 20:48:06 +0100
message:
  Merge support for applying patches/bundles to Bazaar branches.
added:
  bzr-gtk.applications           bzrgtk.applications-20080402175949-05iv16su7ixv3hq8-1
  bzr-handle-patch.desktop       handlepatch.desktop-20080402181555-dnlazy184jst2ww1-1
modified:
  NEWS                           news-20070325173539-3va57o99cz3o57xe-1
  setup.py                       setup.py-20060716162505-h2isrtlg8lmlg2o2-1
    ------------------------------------------------------------
    revno: 450.7.2
    revision-id: jelmer at samba.org-20080402182129-6qf4awfg3j1zr13s
    parent: jelmer at samba.org-20080402180118-1g1hi6fnl13p850b
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: mime
    timestamp: Wed 2008-04-02 20:21:29 +0200
    message:
      Register bzr ghandle-patch as command for opening diffs and patches.
    added:
      bzr-handle-patch.desktop       handlepatch.desktop-20080402181555-dnlazy184jst2ww1-1
    modified:
      setup.py                       setup.py-20060716162505-h2isrtlg8lmlg2o2-1
    ------------------------------------------------------------
    revno: 450.7.1
    revision-id: jelmer at samba.org-20080402180118-1g1hi6fnl13p850b
    parent: jelmer at samba.org-20080402133655-ygtmjz2fh9k0o17s
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: mime
    timestamp: Wed 2008-04-02 20:01:18 +0200
    message:
      Register bzr-gtk as patch handler.
    added:
      bzr-gtk.applications           bzrgtk.applications-20080402175949-05iv16su7ixv3hq8-1
    modified:
      setup.py                       setup.py-20060716162505-h2isrtlg8lmlg2o2-1
=== modified file 'NEWS'
--- a/NEWS	2008-04-25 19:41:23 +0000
+++ b/NEWS	2008-04-25 19:48:06 +0000
@@ -28,6 +28,9 @@
 
   * Add compare with option to revisions menu. (Javier Derderian)
 
+  * Register file handler for applying patches/bundles to Bazaar branches.
+    (Jelmer Vernooij)
+
  BUG FIXES
 
   * Make adding tags from the viz work again. (Daniel Schierbeck)

=== added file 'bzr-gtk.applications'
--- a/bzr-gtk.applications	1970-01-01 00:00:00 +0000
+++ b/bzr-gtk.applications	2008-04-02 18:01:18 +0000
@@ -0,0 +1,7 @@
+bzr-gtk-patch
+	command="bzr handle-patch"
+	name=Bazaar
+	can_open_multiple_files=false
+	expects_uris=false
+	requires_terminal=false
+	mime_types=text/x-diff,text/x-patch,application/x-bazaar-merge-directive

=== added file 'bzr-handle-patch.desktop'
--- a/bzr-handle-patch.desktop	1970-01-01 00:00:00 +0000
+++ b/bzr-handle-patch.desktop	2008-04-02 18:21:29 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Bazaar
+Comment=Apply Bazaar Bundle
+Icon=bazaar
+Exec=bzr ghandle-patch %f
+NoDisplay=true
+Terminal=false
+Type=Application
+Categories=
+MimeType=text/x-diff;text/x-patch;application/x-bazaar-merge-directive;

=== modified file 'setup.py'
--- a/setup.py	2008-04-11 00:25:00 +0000
+++ b/setup.py	2008-04-25 19:48:06 +0000
@@ -136,7 +136,9 @@
                                  'icons/bzr-icon-64.png']),
                 ('share/applications', ['olive-gtk.desktop',
                                         'bazaar-properties.desktop',
+                                        'bzr-handle-patch.desktop',
                                         'bzr-notify.desktop']),
+                ('share/application-registry', ['bzr-gtk.applications']),
                 ('share/pixmaps', ['icons/olive-gtk.png', 'icons/bzr-icon-64.png']),
                 ('share/icons/hicolor/scalable/emblems', 
                     ['icons/emblem-bzr-added.svg',