Merge lp:~jelmer/bzr-gtk/split-out-olive into lp:bzr-gtk/gtk2

[Jelmer Vernooij]

This splits olive out into a separate project again, per my email to the mailing list.

This makes olive a project with a relation to bzr-gtk that is similar to the relation between qbzr and bzr-explorer.

[Jasper Groenewegen (colbrac)]

I think the visibility of Olive is improved when split out. As my focus was on Olive related development (you know, back in the day before I worked a fulltime job) I wouldn't mind receiving Olive related bugreports. Will the new olive project be maintained by the bzr-gtk maintainers group? I would hope so.

review: Approve

[Jelmer Vernooij (jelmer)]

Hey Jasper,

On Mon, 2010-05-31 at 21:10 +0000, Jasper Groenewegen wrote:
> Review: Approve I think the visibility of Olive is improved when split
> out. As my focus was on Olive related development (you know, back in
> the day before I worked a fulltime job) I wouldn't mind receiving
> Olive related bugreports. Will the new olive project be maintained by
> the bzr-gtk maintainers group? I would hope so.
Ah, I was wondering what had happened to you. :-) The same thing
happened to me, which is one of the reasons why I haven't had as much
time to spend on bzr-gtk as I used to.

I hope there will be some overlap between developers like there is
overlap between the qbzr and bzr-explorer developers, but it doesn't
necessarily have to be the same group of people.

Cheers,

Jelmer

[Jasper Groenewegen (colbrac)]

Losing the ability to help out properly is something most volunteers
encounter I think (at least the ones not moving on to a career in OS
development). I'm happy as it is that I'm able to use my python + numpy
dataprocessing abilities to sort through the more massive datasets I
have to work with now.
All the issues with bzr-gtk trying to stay near the bullseye with a fast
moving target like bzr or integration with other components such as
seahorse are harder to work on for people with less time. Adding polish
to Olive is more for me :) I really should get around to removing that
non-functioning and confusing history mode in Olive :/ Or figure out how
to call up old versions of documents as shown in the history file list.
:P (Who am I kidding, figuring out how LP works nowadays would be the
first hurdle :D).

Regards,
Jasper

On 31/05/10 23:45, Jelmer Vernooij wrote:
> Hey Jasper,
>
> On Mon, 2010-05-31 at 21:10 +0000, Jasper Groenewegen wrote:
>> Review: Approve I think the visibility of Olive is improved when split
>> out. As my focus was on Olive related development (you know, back in
>> the day before I worked a fulltime job) I wouldn't mind receiving
>> Olive related bugreports. Will the new olive project be maintained by
>> the bzr-gtk maintainers group? I would hope so.
> Ah, I was wondering what had happened to you. :-) The same thing
> happened to me, which is one of the reasons why I haven't had as much
> time to spend on bzr-gtk as I used to.
>
> I hope there will be some overlap between developers like there is
> overlap between the qbzr and bzr-explorer developers, but it doesn't
> necessarily have to be the same group of people.
>
> Cheers,
>
> Jelmer

[Vincent Ladeuil (vila)]

GO :)

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2008-07-22 22:40:17 +0000
+++ AUTHORS	2010-05-29 23:49:22 +0000
@@ -13,8 +13,6 @@
 
 nautilus-bzr was written by Jelmer Vernooij and Jeff Bailey.
 
-Olive was written by Szilveszter Farkas <[e-mail]>.
-
 The tag icon was created by Jakub Steiner.
 The bug icon was created by Josef Vybíral.
 

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2009-07-11 19:00:11 +0000
+++ MANIFEST.in	2010-05-29 23:49:22 +0000
@@ -6,7 +6,6 @@
 include bzr-gtk.applications
 include bzr-gtk.cfg
 include credits.pickle
-include olive-gtk.1
 include preferences/TODO
 include *.desktop
 include *.ui

=== modified file '__init__.py'
--- __init__.py	2010-03-25 06:33:53 +0000
+++ __init__.py	2010-05-29 23:49:22 +0000
@@ -22,7 +22,6 @@
 gconflicts        GTK+ conflicts. 
 gdiff             Show differences in working tree in a GTK+ Window. 
 ginit             Initialise a new branch.
-ginfo             GTK+ branch info dialog
 gloom             GTK+ loom browse dialog
 gmerge            GTK+ merge dialog
 gmissing          GTK+ missing revisions dialog. 
@@ -135,7 +134,6 @@
     "gconflicts": [],
     "gdiff": [],
     "ginit": [],
-    "ginfo": [],
     "gmerge": [],
     "gmissing": [],
     "gpreferences": [],
@@ -166,13 +164,6 @@
                                        save_commit_messages,
                                        "Saving commit messages for gcommit")
 
-import gettext
-gettext.install('olive-gtk')
-
-# Let's create a specialized alias to protect '_' from being erased by other
-# uses of '_' as an anonymous variable (think pdb for one).
-_i18n = gettext.gettext
-
 class NoDisplayError(errors.BzrCommandError):
     """gtk could not find a proper display"""
 
@@ -212,3 +203,8 @@
             reload(sys)
             sys.setdefaultencoding(default_encoding)
     return basic_tests
+
+
+def _i18n(text):
+    # Stub until we support proper i18n
+    return text

=== modified file 'branchbox.py'
--- branchbox.py	2009-03-05 16:50:39 +0000
+++ branchbox.py	2010-05-29 23:49:22 +0000
@@ -24,7 +24,6 @@
 from bzrlib.config import GlobalConfig
 import gtk
 from history import UrlHistory
-from olive import Preferences
 import gobject
 
 class BranchSelectionBox(gtk.HBox):
@@ -58,10 +57,6 @@
         for item in self._history.get_entries():
             self._combo_model.append([ item ])
         
-        pref = Preferences()
-        for item in pref.get_bookmarks():
-            self._combo_model.append([ item ])
-        
         self._combo.set_model(self._combo_model)
         self._combo.set_text_column(0)
 

=== modified file 'checkout.py'
--- checkout.py	2009-12-22 22:35:52 +0000
+++ checkout.py	2010-05-29 23:49:22 +0000
@@ -33,7 +33,6 @@
 from dialog import error_dialog
 
 from history import UrlHistory
-from olive import Preferences
 
 class CheckoutDialog(gtk.Dialog):
     """ New implementation of the Checkout dialog. """
@@ -117,10 +116,6 @@
         for item in self._history.get_entries():
             self._combo_model.append([ item ])
         
-        pref = Preferences()
-        for item in pref.get_bookmarks():
-            self._combo_model.append([ item ])
-        
         self._combo.set_model(self._combo_model)
         self._combo.set_text_column(0)
     

=== removed file 'cmenu.ui'
--- cmenu.ui	2007-07-21 13:16:33 +0000
+++ cmenu.ui	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-<ui>
-    <popup name="context_right">
-        <menuitem name="add" action="add" />
-        <menuitem name="remove" action="remove" />
-        <menuitem name="remove_and_delete" action="remove_and_delete" />
-        <menuitem name="rename" action="rename" />
-        <menuitem name="open" action="open" />
-        <separator />
-        <menuitem name="revert" action="revert" />
-        <menuitem name="commit" action="commit" />
-        <separator />
-        <menuitem name="annotate" action="annotate" />
-        <menuitem name="diff" action="diff" />
-        <separator />
-        <menuitem name="bookmark" action="bookmark" />
-    </popup>
-    <popup name="context_left">
-        <menuitem name="edit_bookmark" action="edit_bookmark" />
-        <menuitem name="remove_bookmark" action="remove_bookmark" />
-        <separator />
-        <menuitem name="open_folder" action="open_folder" />
-    </popup>
-    <popup name="toolbar_diff">
-        <menuitem name="diff_selected" action="diff_selected" />
-        <menuitem name="diff_all" action="diff_all" />
-    </popup>
-    <popup name="context_remote">
-        <menuitem name="view_remote" action="view_remote" />
-        <menuitem name="diff_remote" action="diff_remote" />
-        <menuitem name="revert_remote" action="revert_remote" />
-    </popup>
-</ui>

=== modified file 'commands.py'
--- commands.py	2010-05-27 01:10:15 +0000
+++ commands.py	2010-05-29 23:49:22 +0000
@@ -375,19 +375,6 @@
         dialog.run()
 
 
-class cmd_ginfo(Command):
-    """ GTK+ info dialog
-    
-    """
-    def run(self):
-        from bzrlib import workingtree
-        from bzrlib.plugins.gtk.olive.info import InfoDialog
-        wt = workingtree.WorkingTree.open_containing('.')[0]
-        info = InfoDialog(wt.branch)
-        info.display()
-        info.window.run()
-
-
 class cmd_gmerge(Command):
     """ GTK+ merge dialog
     

=== removed file 'genpot.sh'
--- genpot.sh	2008-05-05 18:16:46 +0000
+++ genpot.sh	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# Generate translation template
-
-if [ "$1" = "" ]; then
-    POT=po/olive-gtk.pot
-else
-    # Used for debugging
-    POT=$1 
-fi
-
-XGETTEXT="xgettext -o $POT"
-PY_XGETTEXT="$XGETTEXT -L python --from-code=ASCII --keyword=_i18n"
-
-if [ -x $POT ]; then
-    rm $POT
-    touch $POT
-else
-    touch $POT
-fi
-$PY_XGETTEXT olive-gtk
-$XGETTEXT -j olive.glade
-
-for d in . annotate branchview olive preferences viz ;
-do
-   $PY_XGETTEXT -j $d/*.py
-done

=== removed directory 'olive'
=== removed file 'olive-gtk'
--- olive-gtk	2008-08-04 18:51:44 +0000
+++ olive-gtk	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-import sys
-import re
-
-try:
-    version_info = sys.version_info
-except AttributeError:
-    version_info = 1, 5 # 1.5 or older
-
-REINVOKE = "__BZR_REINVOKE"
-NEED_VERS = (2, 4)
-KNOWN_PYTHONS = ('python2.4',)
-
-if version_info < NEED_VERS:
-    if not os.environ.has_key(REINVOKE):
-        # mutating os.environ doesn't work in old Pythons
-        os.putenv(REINVOKE, "1")
-        for python in KNOWN_PYTHONS:
-            try:
-                os.execvp(python, [python] + sys.argv)
-            except OSError:
-                pass
-    print >>sys.stderr, ('bzr: error: cannot find a suitable python interpreter'
-                         ' (need %d.%d or later)'
-                        ) % NEED_VERS
-    sys.exit(1)
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-try:
-    import gtk
-except:
-    print >>sys.stderr, ('You need to install pygtk2 (gtk2)'
-                         ' or set your PYTHONPATH correctly.\n'
-                         'try: export PYTHONPATH=/usr/local/lib/python2.4/site-packages/'
-                        )
-    sys.exit(1)
-
-# gettext support
-import gettext
-gettext.install('olive-gtk')
-
-
-# make sure we could import bzrlib
-try:
-    import bzrlib
-except ImportError:
-    # try to find bzr if it exist in $PATH
-    p = os.popen('bzr version')
-    s = p.read()
-    r = p.close()
-    if r not in (None, 0):
-        print >>sys.stderr, "bzr not found"
-        sys.exit(1)
-    else:
-        bzrlib_match = re.compile(r"bzrlib: (.*)[/\\]bzrlib").search(s)
-        if bzrlib_match:
-            sys.path.append(bzrlib_match.group(1))
-        else:
-            print >>sys.stderr, "Can't find bzrlib location"
-            sys.exit(1)
-
-from bzrlib.plugin import load_plugins
-load_plugins()
-
-import bzrlib.ui
-import bzrlib.plugins.gtk.ui as ui
-bzrlib.ui.ui_factory = ui.GtkUIFactory()
-
-from bzrlib.plugins.gtk.olive import OliveGtk
-app = OliveGtk()
-gtk.main()

=== removed file 'olive-gtk.1'
--- olive-gtk.1	2008-05-01 12:55:33 +0000
+++ olive-gtk.1	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-.TH OLIVE-GTK 1 "April 24, 2007"
-.SH NAME
-olive-gtk \- GTK+ frontend for Bazaar
-.SH SYNOPSIS
-.B olive-gtk
-.SH DESCRIPTION
-Olive aims to be a full-featured graphical frontend for the Bazaar (bzr)
-source code management tool.
-.SH SEE ALSO
-.BR bzr (1).
-.SH AUTHOR
-\fBolive-gtk\fP was written by Szilveszter Farkas <[e-mail]>
-.PP
-This manual page was written by Chris Lamb <[e-mail]>,
-for the Debian project (but may be used by others).

=== removed file 'olive-gtk.desktop'
--- olive-gtk.desktop	2008-08-06 14:25:18 +0000
+++ olive-gtk.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Olive Bazaar Branch Manager
-Name[fr]=Gestionnaire de branche Bazaar Olive
-GenericName=Version Control GUI
-GenericName[pl]=Klient graficzny Bazaar
-GenericName[fr]=Client graphique Bazaar
-Comment=Graphical User Interface for the Bazaar Version Control System
-Comment[pl]=Graficzny interfejs dla systemu kontroli wersji Bazaar
-Comment[fr]=Interface graphique pour le gestionnaire de version Bazaar
-Icon=olive-gtk
-Exec=olive-gtk
-Categories=Development;RevisionControl;

=== removed file 'olive/__init__.py'
--- olive/__init__.py	2009-05-27 09:19:42 +0000
+++ olive/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1407 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-import sys
-import time
-import errno
-
-# gettext support
-import gettext
-gettext.install('olive-gtk')
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gobject
-import gtk
-import gtk.gdk
-
-from bzrlib.branch import Branch
-import bzrlib.errors as bzrerrors
-from bzrlib.lazy_import import lazy_import
-from bzrlib.ui import ui_factory
-from bzrlib.workingtree import WorkingTree
-
-from bzrlib.plugins.gtk import _i18n
-from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, warning_dialog
-from bzrlib.plugins.gtk.errors import show_bzr_error
-from bzrlib.plugins.gtk.olive.window import OliveGui
-
-from bzrlib.plugins.gtk.diff import DiffWindow
-lazy_import(globals(), """
-from bzrlib.plugins.gtk.viz import branchwin
-""")
-from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
-from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
-from bzrlib.plugins.gtk.commit import CommitDialog
-from bzrlib.plugins.gtk.conflicts import ConflictsDialog
-from bzrlib.plugins.gtk.initialize import InitDialog
-from bzrlib.plugins.gtk.push import PushDialog
-from bzrlib.plugins.gtk.revbrowser import RevisionBrowser
-
-def about():
-    """ Display the AboutDialog. """
-    from bzrlib.plugins.gtk import __version__, icon_path
-    
-    dialog = gtk.AboutDialog()
-    dialog.set_name("Olive")
-    dialog.set_version(__version__)
-    dialog.set_copyright("Copyright (C) 2006-2008 Szilveszter Farkas (Phanatic)")
-    dialog.set_website("https://launchpad.net/bzr-gtk")
-    dialog.set_website_label("https://launchpad.net/bzr-gtk")
-    dialog.set_icon_from_file(icon_path("oliveicon2.png"))
-    dialog.set_logo(gtk.gdk.pixbuf_new_from_file(icon_path("oliveicon2.png")))
-    dialog.set_authors([ _i18n("Lead Developer:"),
-			 "Szilveszter Farkas <[e-mail]>",
-			 _i18n("Contributors:"),
-			 "Jelmer Vernooij <[e-mail]>",
-			 "Mateusz Korniak <[e-mail]>",
-			 "Gary van der Merwe <[e-mail]>" ])
-    dialog.set_artists([ "Simon Pascal Klein <[e-mail]>",
-			 "Jakub Steiner <[e-mail]>" ])
-
-    dialog.run()
-    # Destroy the dialog
-    dialog.destroy()
-
-
-class OliveGtk:
-    """ The main Olive GTK frontend class. This is called when launching the
-    program. """
-    
-    def __init__(self):
-        self.window = OliveGui(calling_app = self)
-        
-        self.pref = Preferences()
-        self.path = None
-
-        # Initialize the statusbar
-        self.context_id = self.window.statusbar.get_context_id('olive')
-        
-        # Get the drive selector
-        self.combobox_drive = gtk.combo_box_new_text()
-        self.combobox_drive.connect("changed", self._refresh_drives)
-        
-        # Get the navigation widgets
-        self.hbox_location = self.window.locationbar
-        self.button_location_up = self.window.button_location_up
-        self.button_location_jump = self.window.button_location_jump
-        self.entry_location = self.window.entry_location
-        
-        # Get the History widgets
-        self.check_history = self.window.checkbutton_history
-        self.entry_history = self.window.entry_history_revno
-        self.button_history = self.window.button_history_browse
-        
-        self._just_started = True
-        
-        # Apply window size and position
-        width = self.pref.get_preference('window_width', 'int')
-        height = self.pref.get_preference('window_height', 'int')
-        self.window.resize(width, height)
-        x = self.pref.get_preference('window_x', 'int')
-        y = self.pref.get_preference('window_y', 'int')
-        self.window.move(x, y)
-        # Apply paned position
-        pos = self.pref.get_preference('paned_position', 'int')
-        self.window.hpaned_main.set_position(pos)
-        
-        # Now we can show the window
-        self.window.show()
-        
-        # Show drive selector if under Win32
-        if sys.platform == 'win32':
-            self.hbox_location.pack_start(self.combobox_drive, False, False, 0)
-            self.hbox_location.reorder_child(self.combobox_drive, 1)
-            self.combobox_drive.show()
-            self.gen_hard_selector()
-        
-        self.refresh_left()
-
-        # Apply menu state
-        self.window.mb_view_showhidden.set_active(self.pref.get_preference('dotted_files', 'bool'))
-        self.window.mb_view_showignored.set_active(self.pref.get_preference('ignored_files', 'bool'))
-
-        # We're starting local
-        self.remote = False
-        self.remote_branch = None
-        self.remote_path = None
-        self.remote_revision = None
-        
-        self.set_path(os.getcwd())
-        self.refresh_right()
-        
-        self._just_started = False
-
-    def set_path(self, path, force_remote=False):
-        self.window.location_status.destroy()
-        self.notbranch = False
-        
-        if force_remote:
-            # Forcing remote mode (reading data from inventory)
-            self.window.set_location_status(gtk.STOCK_DISCONNECT)
-            try:
-                br = Branch.open_containing(path)[0]
-            except bzrerrors.NotBranchError:
-                self.window.set_location_status(gtk.STOCK_DIALOG_ERROR)
-                self.check_history.set_active(False)
-                self.check_history.set_sensitive(False)
-                return False
-            except bzrerrors.UnsupportedProtocol:
-                self.window.set_location_status(gtk.STOCK_DIALOG_ERROR)
-                self.check_history.set_active(False)
-                self.check_history.set_sensitive(False)
-                return False
-            
-            self.window.set_location_status(gtk.STOCK_CONNECT)
-            
-            self.remote = True
-           
-            # We're remote
-            self.remote_branch, self.remote_path = Branch.open_containing(path)
-            
-            if self.remote_revision is None:
-                self.remote_revision = self.remote_branch.last_revision()
-            
-            self.remote_entries = self.remote_branch.repository.get_inventory(self.remote_revision).entries()
-            
-            if len(self.remote_path) == 0:
-                self.remote_parent = self.remote_branch.repository.get_inventory(self.remote_branch.last_revision()).iter_entries_by_dir().next()[1].file_id
-            else:
-                for (name, type) in self.remote_entries:
-                    if name == self.remote_path:
-                        self.remote_parent = type.file_id
-                        break
-            
-            if not path.endswith('/'):
-                path += '/'
-            
-            if self.remote_branch.base == path:
-                self.button_location_up.set_sensitive(False)
-            else:
-                self.button_location_up.set_sensitive(True)
-        else:
-            if os.path.isdir(path):
-                self.remote = False
-                
-                # We're local
-                try:
-                    self.wt, self.wtpath = WorkingTree.open_containing(os.path.realpath(path))
-                except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):
-                    self.notbranch = True
-                except bzrerrors.PermissionDenied:
-                    self.window.set_location_status(gtk.STOCK_DIALOG_WARNING, allowPopup=True)
-                    self.window.location_status.connect_object('clicked', warning_dialog, 
-                                       *(_i18n('Branch information unreadable'),
-                                		_i18n('The current folder is a branch but the .bzr folder is not readable')))
-                    self.notbranch = True
-                
-                # If we're in the root, we cannot go up anymore
-                if sys.platform == 'win32':
-                    drive, tail = os.path.splitdrive(path)
-                    if tail in ('', '/', '\\'):
-                        self.button_location_up.set_sensitive(False)
-                    else:
-                        self.button_location_up.set_sensitive(True)
-                else:
-                    if self.path == '/':
-                        self.button_location_up.set_sensitive(False)
-                    else:
-                        self.button_location_up.set_sensitive(True)
-            elif not os.path.isfile(path):
-                # Doesn't seem to be a file nor a directory, trying to open a
-                # remote location
-                self.window.set_location_status(gtk.STOCK_DISCONNECT)
-                try:
-                    br = Branch.open_containing(path)[0]
-                except bzrerrors.NotBranchError:
-                    self.window.set_location_status(gtk.STOCK_DIALOG_ERROR)
-                    self.check_history.set_active(False)
-                    self.check_history.set_sensitive(False)
-                    return False
-                except bzrerrors.UnsupportedProtocol:
-                    self.window.set_location_status(gtk.STOCK_DIALOG_ERROR)
-                    self.check_history.set_active(False)
-                    self.check_history.set_sensitive(False)
-                    return False
-                
-                self.window.set_location_status(gtk.STOCK_CONNECT)
-                
-                self.remote = True
-               
-                # We're remote
-                self.remote_branch, self.remote_path = Branch.open_containing(path)
-                
-                if self.remote_revision is None:
-                    self.remote_revision = self.remote_branch.last_revision()
-                
-                self.remote_entries = self.remote_branch.repository.get_inventory(self.remote_revision).entries()
-                
-                if len(self.remote_path) == 0:
-                    self.remote_parent = self.remote_branch.repository.get_inventory(self.remote_branch.last_revision()).iter_entries_by_dir().next()[1].file_id
-                else:
-                    for (name, type) in self.remote_entries:
-                        if name == self.remote_path:
-                            self.remote_parent = type.file_id
-                            break
-                
-                if not path.endswith('/'):
-                    path += '/'
-                
-                if self.remote_branch.base == path:
-                    self.button_location_up.set_sensitive(False)
-                else:
-                    self.button_location_up.set_sensitive(True)
-        
-        if self.notbranch:
-            self.check_history.set_active(False)
-            self.check_history.set_sensitive(False)
-        else:
-            self.check_history.set_sensitive(True)
-        
-        self.window.statusbar.push(self.context_id, path)
-        self.entry_location.set_text(path)
-        self.path = path
-        return True
-
-    def get_path(self):
-        if not self.remote:
-            return self.path
-        else:
-            # Remote mode
-            if len(self.remote_path) > 0:
-                return self.remote_branch.base + self.remote_path + '/'
-            else:
-                return self.remote_branch.base
-   
-    def on_about_activate(self, widget):
-        about()
-    
-    def on_button_history_browse_clicked(self, widget):
-        """ Browse for revision button handler. """
-        if self.remote:
-            br = self.remote_branch
-        else:
-            br = self.wt.branch
-            
-        revb = RevisionBrowser(br, self.window)
-        response = revb.run()
-        if response != gtk.RESPONSE_NONE:
-            revb.hide()
-        
-            if response == gtk.RESPONSE_OK:
-                if revb.selected_revno is not None:
-                    self.entry_history.set_text(revb.selected_revno)
-                    self.on_entry_history_revno_activate()
-            
-            revb.destroy()
-    
-    def on_button_location_jump_clicked(self, widget):
-        """ Location Jump button handler. """
-        location = self.entry_location.get_text()
-        
-        if self.set_path(location):
-            self.refresh_right()
-    
-    def on_button_location_up_clicked(self, widget):
-        """ Location Up button handler. """
-        if not self.remote:
-            # Local mode
-            self.set_path(os.path.split(self.get_path())[0])
-        else:
-            # Remote mode
-            delim = '/'
-            newpath = delim.join(self.get_path().split(delim)[:-2])
-            newpath += '/'
-            self.set_path(newpath)
-
-        self.refresh_right()
-    
-    def on_checkbutton_history_toggled(self, widget):
-        """ History Mode toggle handler. """
-        if self.check_history.get_active():
-            # History Mode activated
-            self.entry_history.set_sensitive(True)
-            self.button_history.set_sensitive(True)
-            if self.entry_history.get_text() != "":
-                self.on_entry_history_revno_activate()
-        else:
-            # History Mode deactivated
-            self.entry_history.set_sensitive(False)
-            self.button_history.set_sensitive(False)
-            
-            # Return right window to normal view by acting like we jump to it
-            self.on_button_location_jump_clicked(widget)
-    
-    @show_bzr_error
-    def on_entry_history_revno_activate(self, widget=None):
-        """ Key pressed handler for the history entry. """
-        path = self.get_path()
-        if not self.remote:
-            self.remote = True
-            self.remote_branch = self.wt.branch
-        
-        revno = int(self.entry_history.get_text())
-        self.remote_revision = self.remote_branch.get_rev_id(revno)
-        if self.set_path(path, True):
-            self.refresh_right()
-
-    def on_menuitem_add_files_activate(self, widget):
-        """ Add file(s)... menu handler. """
-        from bzrlib.plugins.gtk.olive.add import AddDialog
-        add = AddDialog(self.wt, self.wtpath, self.get_selected_right(), self.window)
-        response = add.run()
-        add.destroy()
-        if response == gtk.RESPONSE_OK:
-            self.refresh_right()
-
-    def on_menuitem_branch_get_activate(self, widget):
-        """ Branch/Get... menu handler. """
-        from bzrlib.plugins.gtk.branch import BranchDialog
-        
-        if self.remote:
-            branch = BranchDialog(os.getcwd(), self.window, self.remote_branch.base)
-        else:
-            branch = BranchDialog(self.get_path(), self.window)
-        response = branch.run()
-        if response != gtk.RESPONSE_NONE:
-            branch.hide()
-            
-            if response == gtk.RESPONSE_OK:
-                self.refresh_right()
-            
-            branch.destroy()
-    
-    def on_menuitem_branch_checkout_activate(self, widget):
-        """ Branch/Checkout... menu handler. """
-        from bzrlib.plugins.gtk.checkout import CheckoutDialog
-        
-        if self.remote:
-            checkout = CheckoutDialog(os.getcwd(), self.window, self.remote_branch.base)
-        else:
-            checkout = CheckoutDialog(self.get_path(), self.window)
-        response = checkout.run()
-        if response != gtk.RESPONSE_NONE:
-            checkout.hide()
-        
-            if response == gtk.RESPONSE_OK:
-                self.refresh_right()
-            
-            checkout.destroy()
-    
-    @show_bzr_error
-    def on_menuitem_branch_commit_activate(self, widget):
-        """ Branch/Commit... menu handler. """
-        selected = self.get_selected_right()
-        if selected:
-            selected = os.path.join(self.wtpath, selected)
-        commit = CommitDialog(wt=self.wt,
-                              parent=self.window,
-                              selected=selected,
-                             )
-        response = commit.run()
-        if response != gtk.RESPONSE_NONE:
-            commit.hide()
-        
-            if response == gtk.RESPONSE_OK:
-                self.refresh_right()
-            
-            commit.destroy()
-    
-    def on_menuitem_branch_conflicts_activate(self, widget):
-        """ Branch/Conflicts... menu handler. """
-        conflicts = ConflictsDialog(self.wt, self.window)
-        response = conflicts.run()
-        if response != gtk.RESPONSE_NONE:
-            conflicts.destroy()
-    
-    def on_menuitem_branch_merge_activate(self, widget):
-        """ Branch/Merge... menu handler. """
-        from bzrlib.plugins.gtk.merge import MergeDialog
-        
-        if self.check_for_changes():
-            error_dialog(_i18n('There are local changes in the branch'),
-                         _i18n('Please commit or revert the changes before merging.'))
-        else:
-            parent_branch_path = self.wt.branch.get_parent()
-            merge = MergeDialog(self.wt, self.wtpath, parent_branch_path, self.window)
-            response = merge.run()
-            merge.destroy()
-            if response == gtk.RESPONSE_OK:
-                self.refresh_right()
-
-    @show_bzr_error
-    def on_menuitem_branch_missing_revisions_activate(self, widget):
-        """ Branch/Missing revisions menu handler. """
-        
-        from bzrlib.missing import find_unmerged, iter_log_revisions
-        
-        local_branch = self.wt.branch
-        parent_branch_path = local_branch.get_parent()
-        if parent_branch_path is None:
-            error_dialog(_i18n('Parent location is unknown'),
-                         _i18n('Cannot determine missing revisions if no parent location is known.'))
-            return
-        
-        parent_branch = Branch.open(parent_branch_path)
-        
-        if parent_branch.base == local_branch.base:
-            parent_branch = local_branch
-        
-        local_extra, remote_extra = find_unmerged(local_branch,parent_branch)
-
-        if local_extra or remote_extra:
-            
-            ## def log_revision_one_line_text(log_revision):
-            ##    """ Generates one line description of log_revison ended with end of line."""
-            ##    revision = log_revision.rev
-            ##    txt =  "- %s (%s)\n" % (revision.get_summary(), revision.committer, )
-            ##    txt = txt.replace("<"," ") # Seems < > chars are expected to be xml tags ...
-            ##    txt = txt.replace(">"," ")
-            ##    return txt
-            
-            dlg_txt = ""
-            if local_extra:
-                dlg_txt += _i18n('%d local extra revision(s). \n') % (len(local_extra),) 
-                ## NOTE: We do not want such ugly info about missing revisions
-                ##       Revision Browser should be used there
-                ## max_revisions = 10
-                ## for log_revision in iter_log_revisions(local_extra, local_branch.repository, verbose=1):
-                ##    dlg_txt += log_revision_one_line_text(log_revision)
-                ##    if max_revisions <= 0:
-                ##        dlg_txt += _i18n("more ... \n")
-                ##        break
-                ## max_revisions -= 1
-            ## dlg_txt += "\n"
-            if remote_extra:
-                dlg_txt += _i18n('%d local missing revision(s).\n') % (len(remote_extra),) 
-                ## max_revisions = 10
-                ## for log_revision in iter_log_revisions(remote_extra, parent_branch.repository, verbose=1):
-                ##    dlg_txt += log_revision_one_line_text(log_revision)
-                ##    if max_revisions <= 0:
-                ##        dlg_txt += _i18n("more ... \n")
-                ##        break
-                ##    max_revisions -= 1
-                
-            info_dialog(_i18n('There are missing revisions'),
-                        dlg_txt)
-        else:
-            info_dialog(_i18n('Local branch up to date'),
-                        _i18n('There are no missing revisions.'))
-
-    @show_bzr_error
-    def on_menuitem_branch_pull_activate(self, widget):
-        """ Branch/Pull menu handler. """
-        branch_to = self.wt.branch
-
-        location = branch_to.get_parent()
-        if location is None:
-            error_dialog(_i18n('Parent location is unknown'),
-                                     _i18n('Pulling is not possible until there is a parent location.'))
-            return
-
-        branch_from = Branch.open(location)
-
-        if branch_to.get_parent() is None:
-            branch_to.set_parent(branch_from.base)
-
-        ret = branch_to.pull(branch_from)
-        
-        info_dialog(_i18n('Pull successful'), _i18n('%d revision(s) pulled.') % ret)
-        
-    @show_bzr_error
-    def on_menuitem_branch_update_activate(self, widget):
-        """ Branch/checkout update menu handler. """
-        
-        ret = self.wt.update()
-        conflicts = self.wt.conflicts()
-        if conflicts:
-            info_dialog(_i18n('Update successful but conflicts generated'), _i18n('Number of conflicts generated: %d.') % (len(conflicts),) )
-        else:
-            info_dialog(_i18n('Update successful'), _i18n('No conflicts generated.') )
-        self.refresh_right()
-    
-    def on_menuitem_branch_push_activate(self, widget):
-        """ Branch/Push... menu handler. """
-        push = PushDialog(repository=None,revid=None,branch=self.wt.branch, parent=self.window)
-        response = push.run()
-        if response != gtk.RESPONSE_NONE:
-            push.destroy()
-    
-    @show_bzr_error
-    def on_menuitem_branch_revert_activate(self, widget):
-        """ Branch/Revert all changes menu handler. """
-        ret = self.wt.revert(None)
-        if ret:
-            warning_dialog(_i18n('Conflicts detected'),
-                           _i18n('Please have a look at the working tree before continuing.'))
-        else:
-            info_dialog(_i18n('Revert successful'),
-                        _i18n('All files reverted to last revision.'))
-        self.refresh_right()
-    
-    def on_menuitem_branch_status_activate(self, widget):
-        """ Branch/Status... menu handler. """
-        from bzrlib.plugins.gtk.status import StatusWindow
-        status = StatusWindow(self.wt, self.wtpath)
-        status.show()
-    
-    def on_menuitem_branch_initialize_activate(self, widget):
-        """ Initialize current directory. """
-        init = InitDialog(self.path, self.window)
-        response = init.run()
-        if response != gtk.RESPONSE_NONE:
-            init.hide()
-        
-            if response == gtk.RESPONSE_OK:
-                self.refresh_right()
-            
-            init.destroy()
-        
-    def on_menuitem_branch_tags_activate(self, widget):
-        """ Branch/Tags... menu handler. """
-        from bzrlib.plugins.gtk.tags import TagsWindow
-        if not self.remote:
-            window = TagsWindow(self.wt.branch, self.window)
-        else:
-            window = TagsWindow(self.remote_branch, self.window)
-        window.show()
-    
-    def on_menuitem_file_annotate_activate(self, widget):
-        """ File/Annotate... menu handler. """
-        if self.get_selected_right() is None:
-            error_dialog(_i18n('No file was selected'),
-                         _i18n('Please select a file from the list.'))
-            return
-        
-        branch = self.wt.branch
-        file_id = self.wt.path2id(self.wt.relpath(os.path.join(self.path, self.get_selected_right())))
-        
-        window = GAnnotateWindow(all=False, plain=False, parent=self.window)
-        window.set_title(os.path.join(self.path, self.get_selected_right()) + " - Annotate")
-        config = GAnnotateConfig(window)
-        window.show()
-        branch.lock_read()
-        try:
-            window.annotate(self.wt, branch, file_id)
-        finally:
-            branch.unlock()
-    
-    def on_menuitem_file_bookmark_activate(self, widget):
-        """ File/Bookmark current directory menu handler. """
-        if self.pref.add_bookmark(self.path):
-            info_dialog(_i18n('Bookmark successfully added'),
-                        _i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
-            self.pref.write()
-        else:
-            warning_dialog(_i18n('Location already bookmarked'),
-                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
-        
-        self.refresh_left()
-    
-    def on_menuitem_file_make_directory_activate(self, widget):
-        """ File/Make directory... menu handler. """
-        from bzrlib.plugins.gtk.olive.mkdir import MkdirDialog
-        mkdir = MkdirDialog(self.wt, self.wtpath, self.window)
-        response = mkdir.run()
-        mkdir.destroy()
-        if response == gtk.RESPONSE_OK:
-            self.refresh_right()
-    
-    def on_menuitem_file_move_activate(self, widget):
-        """ File/Move... menu handler. """
-        from bzrlib.plugins.gtk.olive.move import MoveDialog
-        move = MoveDialog(self.wt, self.wtpath, self.get_selected_right(), self.window)
-        response = move.run()
-        move.destroy()
-        if response == gtk.RESPONSE_OK:
-            self.refresh_right()
-    
-    def on_menuitem_file_rename_activate(self, widget):
-        """ File/Rename... menu handler. """
-        from bzrlib.plugins.gtk.olive.rename import RenameDialog
-        rename = RenameDialog(self.wt, self.wtpath, self.get_selected_right(), self.window)
-        response = rename.run()
-        rename.destroy()
-        if response == gtk.RESPONSE_OK:
-            self.refresh_right()
-
-    def on_menuitem_remove_file_activate(self, widget):
-        """ Remove (unversion) selected file. """
-        from bzrlib.plugins.gtk.olive.remove import RemoveDialog
-        remove = RemoveDialog(self.wt, self.wtpath,
-                                   selected=self.get_selected_right(),
-                                   parent=self.window)
-        response = remove.run()
-        
-        if response != gtk.RESPONSE_NONE:
-            remove.hide()
-        
-            if response == gtk.RESPONSE_OK:
-                self.refresh_right()
-            
-            remove.destroy()
-    
-    def on_menuitem_stats_diff_activate(self, widget):
-        """ Statistics/Differences... menu handler. """
-        window = DiffWindow(parent=self.window)
-        parent_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
-        window.set_diff(self.wt.branch._get_nick(local=True), self.wt, 
-                        parent_tree)
-        window.show()
-    
-    def on_menuitem_stats_infos_activate(self, widget):
-        """ Statistics/Informations... menu handler. """
-        from bzrlib.plugins.gtk.olive.info import InfoDialog
-        if self.remote:
-            info = InfoDialog(self.remote_branch)
-        else:
-            info = InfoDialog(self.wt.branch)
-        info.display()
-    
-    def on_menuitem_stats_log_activate(self, widget):
-        """ Statistics/Log... menu handler. """
-
-        if not self.remote:
-            branch = self.wt.branch
-        else:
-            branch = self.remote_branch
-
-        window = branchwin.BranchWindow(branch, [branch.last_revision()], None, 
-                                        parent=self.window)
-        window.show()
-    
-    def on_menuitem_view_refresh_activate(self, widget):
-        """ View/Refresh menu handler. """
-        # Refresh the left pane
-        self.refresh_left()
-        # Refresh the right pane
-        self.refresh_right()
-   
-    def on_menuitem_view_show_hidden_files_activate(self, widget):
-        """ View/Show hidden files menu handler. """
-        self.pref.set_preference('dotted_files', widget.get_active())
-        self.pref.write()
-        if self.path is not None:
-            self.refresh_right()
-
-    def on_menuitem_view_show_ignored_files_activate(self, widget):
-        """ Hide/Show ignored files menu handler. """
-        self.pref.set_preference('ignored_files', widget.get_active())
-        self.pref.write()
-        if self.path is not None:
-            self.refresh_right()
-            
-    def on_treeview_left_button_press_event(self, widget, event):
-        """ Occurs when somebody clicks in the bookmark list. """
-        treepathpos = widget.get_path_at_pos(int(event.x), int(event.y))
-        treeselection = widget.get_selection()
-        if treepathpos is not None:
-            treeselection.select_path(treepathpos[0])
-            if event.button == 1:
-                newdir = self.get_selected_left()
-                if newdir == None:
-                    return
-
-                if self.set_path(newdir):
-                    self.refresh_right()
-            elif event.button == 3:
-                # Don't show context with nothing selected
-                if self.get_selected_left() == None:
-                    return
-
-                # Create a menu
-                from menu import OliveMenu
-                menu = OliveMenu(path=self.get_path(),
-                                 selected=self.get_selected_left(),
-                                 app=self)
-                
-                menu.left_context_menu().popup(None, None, None, 0,
-                                               event.time)
-        else:
-            if treeselection is not None:
-                treeselection.unselect_all()
-
-    def on_treeview_left_row_activated(self, treeview, path, view_column):
-        """ Occurs when somebody double-clicks or enters an item in the
-        bookmark list. """
-
-        newdir = self.get_selected_left()
-        if newdir == None:
-            return
-
-        if self.set_path(newdir):
-            self.refresh_right()
-
-    def on_treeview_right_button_press_event(self, widget, event):
-        """ Occurs when somebody clicks in the file list. """
-        treepathpos = widget.get_path_at_pos(int(event.x), int(event.y))
-        if event.button == 1:
-            if treepathpos is None and widget.get_selection is not None:
-                treeselection = widget.get_selection()
-                treeselection.unselect_all()
-        elif event.button == 3:
-            treeselection = widget.get_selection()
-            if treepathpos is not None:
-                treeselection.select_path(treepathpos[0])
-            else:
-                if treeselection is not None:
-                    treeselection.unselect_all()
-            # Create a menu
-            from menu import OliveMenu
-            menu = OliveMenu(path=self.get_path(),
-                             selected=self.get_selected_right(),
-                             app=self)
-            # get the menu items
-            m_open = menu.ui.get_widget('/context_right/open')
-            m_add = menu.ui.get_widget('/context_right/add')
-            m_remove = menu.ui.get_widget('/context_right/remove')
-            m_remove_and_delete = menu.ui.get_widget('/context_right/remove_and_delete')
-            m_rename = menu.ui.get_widget('/context_right/rename')
-            m_revert = menu.ui.get_widget('/context_right/revert')
-            m_commit = menu.ui.get_widget('/context_right/commit')
-            m_annotate = menu.ui.get_widget('/context_right/annotate')
-            m_diff = menu.ui.get_widget('/context_right/diff')
-            # check if we're in a branch
-            try:
-                from bzrlib.branch import Branch
-                Branch.open_containing(self.get_path())
-                if self.remote:
-                    m_open.set_sensitive(False)
-                    m_add.set_sensitive(False)
-                    m_remove.set_sensitive(False)
-                    m_remove_and_delete.set_sensitive(False)
-                    m_rename.set_sensitive(False)
-                    m_revert.set_sensitive(False)
-                    m_commit.set_sensitive(False)
-                    m_annotate.set_sensitive(False)
-                    m_diff.set_sensitive(False)
-                else:
-                    if treepathpos is None:
-                        m_open.set_sensitive(False)
-                        m_add.set_sensitive(False)
-                        m_remove.set_sensitive(False)
-                        m_remove_and_delete.set_sensitive(False)
-                        m_rename.set_sensitive(False)
-                        m_annotate.set_sensitive(False)
-                        m_diff.set_sensitive(False)
-                        m_revert.set_sensitive(False)
-                    else:
-                        m_open.set_sensitive(True)
-                        m_add.set_sensitive(True)
-                        m_remove.set_sensitive(True)
-                        m_remove_and_delete.set_sensitive(True)
-                        m_rename.set_sensitive(True)
-                        m_annotate.set_sensitive(True)
-                        m_diff.set_sensitive(True)
-                        m_revert.set_sensitive(True)
-                    m_commit.set_sensitive(True)
-            except bzrerrors.NotBranchError:
-                if treepathpos is None:
-                    m_open.set_sensitive(False)
-                else:
-                    m_open.set_sensitive(True)
-                m_add.set_sensitive(False)
-                m_remove.set_sensitive(False)
-                m_remove_and_delete.set_sensitive(False)
-                m_rename.set_sensitive(False)
-                m_revert.set_sensitive(False)
-                m_commit.set_sensitive(False)
-                m_annotate.set_sensitive(False)
-                m_diff.set_sensitive(False)
-
-            if not self.remote:
-                menu.right_context_menu().popup(None, None, None, 0,
-                                                event.time)
-            else:
-                menu.remote_context_menu().popup(None, None, None, 0,
-                                                 event.time)
-        
-    def on_treeview_right_row_activated(self, treeview, path, view_column):
-        """ Occurs when somebody double-clicks or enters an item in the
-        file list. """
-        from launch import launch
-        
-        newdir = self.get_selected_right()
-        
-        if not self.remote:
-            # We're local
-            if newdir == '..':
-                self.set_path(os.path.split(self.get_path())[0])
-            else:
-                fullpath = os.path.join(self.get_path(), newdir)
-                if os.path.isdir(fullpath):
-                    # selected item is an existant directory
-                    self.set_path(fullpath)
-                else:
-                    launch(fullpath)
-        else:
-            # We're remote
-            if self._is_remote_dir(self.get_path() + newdir):
-                self.set_path(self.get_path() + newdir)
-        
-        self.refresh_right()
-    
-    def on_window_main_delete_event(self, widget, event=None):
-        """ Do some stuff before exiting. """
-        width, height = self.window.get_size()
-        self.pref.set_preference('window_width', width)
-        self.pref.set_preference('window_height', height)
-        x, y = self.window.get_position()
-        self.pref.set_preference('window_x', x)
-        self.pref.set_preference('window_y', y)
-        self.pref.set_preference('paned_position',
-                                 self.window.hpaned_main.get_position())
-        
-        self.pref.write()
-        self.window.destroy()
-
-    def get_selected_fileid(self):
-        """ Get the file_id of the selected file. """
-        treeselection = self.window.treeview_right.get_selection()
-        (model, iter) = treeselection.get_selected()
-        
-        if iter is None:
-            return None
-        else:
-            return model.get_value(iter, 9)
-    
-    def get_selected_right(self):
-        """ Get the selected filename. """
-        treeselection = self.window.treeview_right.get_selection()
-        (model, iter) = treeselection.get_selected()
-        
-        if iter is None:
-            return None
-        else:
-            return model.get_value(iter, 2)
-    
-    def get_selected_left(self):
-        """ Get the selected bookmark. """
-        treeselection = self.window.treeview_left.get_selection()
-        (model, iter) = treeselection.get_selected()
-        
-        if iter is None:
-            return None
-        else:
-            return model.get_value(iter, 1)
-
-    def set_statusbar(self, message):
-        """ Set the statusbar message. """
-        self.window.statusbar.push(self.context_id, message)
-    
-    def clear_statusbar(self):
-        """ Clean the last message from the statusbar. """
-        self.window.statusbar.pop(self.context_id)
-    
-    def set_sensitivity(self):
-        """ Set menu and toolbar sensitivity. """
-        if not self.remote:
-            self.window.set_view_to_localbranch(self.notbranch)
-        else:
-            self.window.set_view_to_remotebranch()
-    
-    def refresh_left(self):
-        """ Refresh the bookmark list. """
-        
-        # Get ListStore and clear it
-        liststore = self.window.bookmarklist
-        liststore.clear()
-
-        # Re-read preferences
-        self.pref.read()
-        
-        # Get bookmarks
-        bookmarks = self.pref.get_bookmarks()
-
-        # Get titles and sort by title
-        bookmarks = [[self.pref.get_bookmark_title(item), item, gtk.STOCK_DIRECTORY] for item in bookmarks]
-        bookmarks.sort()
-        for title_item in bookmarks:
-            liststore.append(title_item)
-        
-        # Add the ListStore to the TreeView and refresh column width
-        self.window.treeview_left.set_model(liststore)
-        self.window.treeview_left.columns_autosize()
-
-    def refresh_right(self):
-        """ Refresh the file list. """
-        if not self.remote:
-            # We're local
-            from bzrlib.workingtree import WorkingTree
-            
-            path = self.get_path()
-            
-            # Get ListStore and clear it
-            liststore = self.window.filelist
-            liststore.clear()
-            
-            dirs = []
-            files = []
-            
-            # Fill the appropriate lists
-            dotted_files = self.pref.get_preference('dotted_files', 'bool')
-            ignored_files = self.pref.get_preference('ignored_files', 'bool')
-            
-            for item in os.listdir(path):
-                if not dotted_files and item[0] == '.':
-                    continue
-                if os.path.isdir(os.path.join(path, item)):
-                    dirs.append(item)
-                else:
-                    files.append(item)
-            
-            self.window.col_status.set_visible(False)
-            if not self.notbranch:
-                try:
-                    tree1 = WorkingTree.open_containing(os.path.realpath(path))[0]
-                    branch = tree1.branch
-                    tree2 = tree1.branch.repository.revision_tree(branch.last_revision())
-                    
-                    delta = tree1.changes_from(tree2, want_unchanged=True)
-                    
-                    # Show Status column
-                    self.window.col_status.set_visible(True)
-                except bzrerrors.LockContention:
-                    self.window.set_location_status(gtk.STOCK_DIALOG_ERROR, allowPopup=True)
-                    self.window.location_status.connect_object('clicked', error_dialog, 
-                                       *(_i18n('Branch is locked'),
-                                		_i18n('The branch in the current folder is locked by another Bazaar program')))
-                    self.notbranch = True
-                    self.window.set_view_to_localbranch(False) 
-            
-            # Add'em to the ListStore
-            for item in dirs:
-                status = ''
-                st = ''
-                fileid = ''
-                if not self.notbranch:
-                    filename = tree1.relpath(os.path.join(os.path.realpath(path), item))
-                    
-                    st, status = self.statusmapper(filename, delta)
-                    if not ignored_files and status == 'ignored':
-                        continue
-                
-                statinfo = os.lstat(os.path.join(self.path, item))
-                liststore.append([ gtk.STOCK_DIRECTORY,
-                                   True,
-                                   item,
-                                   st,
-                                   status,
-                                   "<DIR>",
-                                   "<DIR>",
-                                   statinfo.st_mtime,
-                                   self._format_date(statinfo.st_mtime),
-                                   ''])
-            for item in files:
-                status = ''
-                st = ''
-                fileid = ''
-                if not self.notbranch:
-                    filename = tree1.relpath(os.path.join(os.path.realpath(path), item))
-                    
-                    st, status = self.statusmapper(filename, delta)
-                    if not ignored_files and status == 'ignored':
-                        continue
-                
-                statinfo = os.lstat(os.path.join(self.path, item))
-                liststore.append([gtk.STOCK_FILE,
-                                  False,
-                                  item,
-                                  st,
-                                  status,
-                                  str(statinfo.st_size),
-                                  self._format_size(statinfo.st_size),
-                                  statinfo.st_mtime,
-                                  self._format_date(statinfo.st_mtime),
-                                  fileid])
-        else:
-            # We're remote
-            
-            # Get ListStore and clear it
-            liststore = self.window.filelist
-            liststore.clear()
-            
-            # Hide Status column
-            self.window.col_status.set_visible(False)
-            
-            dirs = []
-            files = []
-            
-            self.window.set_location_status(gtk.STOCK_REFRESH)
-            
-            for (name, type) in self.remote_entries:
-                if type.kind == 'directory':
-                    dirs.append(type)
-                elif type.kind == 'file':
-                    files.append(type)
-            
-            class HistoryCache:
-                """ Cache based on revision history. """
-                def __init__(self, history):
-                    self._history = history
-                
-                def _lookup_revision(self, revid):
-                    for r in self._history:
-                        if r.revision_id == revid:
-                            return r
-                    rev = repo.get_revision(revid)
-                    self._history.append(rev)
-                    return rev
-            
-            repo = self.remote_branch.repository
-            
-            revhistory = self.remote_branch.revision_history()
-            try:
-                revs = repo.get_revisions(revhistory)
-                cache = HistoryCache(revs)
-            except bzrerrors.InvalidHttpResponse:
-                # Fallback to dummy algorithm, because of LP: #115209
-                cache = HistoryCache([])
-            
-            for item in dirs:
-                if item.parent_id == self.remote_parent:
-                    rev = cache._lookup_revision(item.revision)
-                    liststore.append([ gtk.STOCK_DIRECTORY,
-                                       True,
-                                       item.name,
-                                       '',
-                                       '',
-                                       "<DIR>",
-                                       "<DIR>",
-                                       rev.timestamp,
-                                       self._format_date(rev.timestamp),
-                                       ''
-                                   ])
-                while gtk.events_pending():
-                    gtk.main_iteration()
-            
-            for item in files:
-                if item.parent_id == self.remote_parent:
-                    rev = cache._lookup_revision(item.revision)
-                    liststore.append([ gtk.STOCK_FILE,
-                                       False,
-                                       item.name,
-                                       '',
-                                       '',
-                                       str(item.text_size),
-                                       self._format_size(item.text_size),
-                                       rev.timestamp,
-                                       self._format_date(rev.timestamp),
-                                       item.file_id
-                                   ])
-                while gtk.events_pending():
-                    gtk.main_iteration()
-            
-            self.window.location_status.destroy()
-
-        # Columns should auto-size
-        self.window.treeview_right.columns_autosize()
-        
-        # Set sensitivity
-        self.set_sensitivity()
-    
-    def statusmapper(self, filename, delta):
-        status = 'unknown'
-        try:
-            self.wt.lock_read()
-            
-            for rpath, rpathnew, id, kind, text_modified, meta_modified in delta.renamed:
-                if rpathnew == filename:
-                    status = 'renamed'
-                    fileid = id
-            for rpath, id, kind in delta.added:
-                if rpath == filename:
-                    status = 'added'
-                    fileid = id
-            for rpath, id, kind in delta.removed:
-                if rpath == filename:
-                    status = 'removed'
-                    fileid = id
-            for rpath, id, kind, text_modified, meta_modified in delta.modified:
-                if rpath == filename:
-                    status = 'modified'
-                    fileid = id
-            for rpath, id, kind in delta.unchanged:
-                if rpath == filename:
-                    status = 'unchanged'
-                    fileid = id
-            for rpath, file_class, kind, id, entry in self.wt.list_files():
-                if rpath == filename and file_class == 'I':
-                    status = 'ignored'
-        finally:
-            self.wt.unlock()
-    
-        if status == 'renamed':
-            st = _i18n('renamed')
-        elif status == 'removed':
-            st = _i18n('removed')
-        elif status == 'added':
-            st = _i18n('added')
-        elif status == 'modified':
-            st = _i18n('modified')
-        elif status == 'unchanged':
-            st = _i18n('unchanged')
-        elif status == 'ignored':
-            st = _i18n('ignored')
-        else:
-            st = _i18n('unknown')
-        return st, status
-
-    def _harddisks(self):
-        """ Returns hard drive letters under Win32. """
-        try:
-            import win32file
-            import string
-        except ImportError:
-            if sys.platform == 'win32':
-                print "pyWin32 modules needed to run Olive on Win32."
-                sys.exit(1)
-        
-        driveletters = []
-        for drive in string.ascii_uppercase:
-            if win32file.GetDriveType(drive+':') == win32file.DRIVE_FIXED or\
-                win32file.GetDriveType(drive+':') == win32file.DRIVE_REMOTE or\
-                win32file.GetDriveType(drive+':') == win32file.DRIVE_REMOVABLE:
-                driveletters.append(drive+':')
-        return driveletters
-    
-    def gen_hard_selector(self):
-        """ Generate the hard drive selector under Win32. """
-        drives = self._harddisks()
-        for drive in drives:
-            self.combobox_drive.append_text(drive)
-        self.combobox_drive.set_active(drives.index(os.getcwd()[0:2]))
-    
-    def _refresh_drives(self, combobox):
-        if self._just_started:
-            return
-        model = combobox.get_model()
-        active = combobox.get_active()
-        if active >= 0:
-            drive = model[active][0]
-            self.set_path(drive + '\\')
-            self.refresh_right()
-    
-    def check_for_changes(self):
-        """ Check whether there were changes in the current working tree. """
-        old_tree = self.wt.branch.repository.revision_tree(self.wt.branch.last_revision())
-        delta = self.wt.changes_from(old_tree)
-
-        changes = False
-        
-        if len(delta.added) or len(delta.removed) or len(delta.renamed) or len(delta.modified):
-            changes = True
-        
-        return changes
-    
-    def _sort_filelist_callback(self, model, iter1, iter2, data):
-        """ The sort callback for the file list, return values:
-        -1: iter1 < iter2
-        0: iter1 = iter2
-        1: iter1 > iter2
-        """
-        name1 = model.get_value(iter1, 2)
-        name2 = model.get_value(iter2, 2)
-        
-        if model.get_value(iter1, 1):
-            # item1 is a directory
-            if not model.get_value(iter2, 1):
-                # item2 isn't
-                return -1
-            else:
-                # both of them are directories, we compare their names
-                if name1 < name2:
-                    return -1
-                elif name1 == name2:
-                    return 0
-                else:
-                    return 1
-        else:
-            # item1 is not a directory
-            if model.get_value(iter2, 1):
-                # item2 is
-                return 1
-            else:
-                # both of them are files, compare them
-                if name1 < name2:
-                    return -1
-                elif name1 == name2:
-                    return 0
-                else:
-                    return 1
-    
-    def _format_size(self, size):
-        """ Format size to a human readable format. """
-        if size < 1000:
-            return "%d[B]" % (size,)
-        size = size / 1000.0
-        
-        for metric in ["kB","MB","GB","TB"]:
-            if size < 1000:
-                break
-            size = size / 1000.0
-        return "%.1f[%s]" % (size,metric) 
-    
-    def _format_date(self, timestamp):
-        """ Format the time (given in secs) to a human readable format. """
-        return time.ctime(timestamp)
-    
-    def _is_remote_dir(self, location):
-        """ Determine whether the given location is a directory or not. """
-        if not self.remote:
-            # We're in local mode
-            return False
-        else:
-            branch, path = Branch.open_containing(location)
-            for (name, type) in self.remote_entries:
-                if name == path and type.kind == 'directory':
-                    # We got it
-                    return True
-            # Either it's not a directory or not in the inventory
-            return False
-
-import ConfigParser
-
-class Preferences:
-    """ A class which handles Olive's preferences. """
-    def __init__(self, path=None):
-        """ Initialize the Preferences class. """
-        # Some default options
-        self.defaults = { 'strict_commit' : False,
-                          'dotted_files'  : False,
-                          'ignored_files' : True,
-                          'window_width'  : 700,
-                          'window_height' : 400,
-                          'window_x'      : 40,
-                          'window_y'      : 40,
-                          'paned_position': 200 }
-
-        # Create a config parser object
-        self.config = ConfigParser.RawConfigParser()
-
-        # Set filename
-        if path is None:
-            if sys.platform == 'win32':
-                # Windows - no dotted files
-                self._filename = os.path.expanduser('~/olive.conf')
-            else:
-                self._filename = os.path.expanduser('~/.olive.conf')
-        else:
-            self._filename = path
-        
-        # Load the configuration
-        self.read()
-        
-    def _get_default(self, option):
-        """ Get the default option for a preference. """
-        try:
-            ret = self.defaults[option]
-        except KeyError:
-            return None
-        else:
-            return ret
-
-    def refresh(self):
-        """ Refresh the configuration. """
-        # First write out the changes
-        self.write()
-        # Then load the configuration again
-        self.read()
-
-    def read(self):
-        """ Just read the configuration. """
-        # Re-initialize the config parser object to avoid some bugs
-        self.config = ConfigParser.RawConfigParser()
-        self.config.read([self._filename])
-    
-    def write(self):
-        """ Write the configuration to the appropriate files. """
-        fp = open(self._filename, 'w')
-        self.config.write(fp)
-        fp.close()
-
-    def get_bookmarks(self):
-        """ Return the list of bookmarks. """
-        bookmarks = self.config.sections()
-        if self.config.has_section('preferences'):
-            bookmarks.remove('preferences')
-        return bookmarks
-
-    def add_bookmark(self, path):
-        """ Add bookmark. """
-        try:
-            self.config.add_section(path)
-        except ConfigParser.DuplicateSectionError:
-            return False
-        else:
-            return True
-
-    def get_bookmark_title(self, path):
-        """ Get bookmark title. """
-        try:
-            ret = self.config.get(path, 'title')
-        except ConfigParser.NoOptionError:
-            ret = path
-        
-        return ret
-    
-    def set_bookmark_title(self, path, title):
-        """ Set bookmark title. """
-        # FIXME: What if path isn't listed yet?
-        # FIXME: Canonicalize paths first?
-        self.config.set(path, 'title', title)
-    
-    def remove_bookmark(self, path):
-        """ Remove bookmark. """
-        return self.config.remove_section(path)
-
-    def set_preference(self, option, value):
-        """ Set the value of the given option. """
-        if value is True:
-            value = 'yes'
-        elif value is False:
-            value = 'no'
-        
-        if self.config.has_section('preferences'):
-            self.config.set('preferences', option, value)
-        else:
-            self.config.add_section('preferences')
-            self.config.set('preferences', option, value)
-
-    def get_preference(self, option, kind='str'):
-        """ Get the value of the given option.
-        
-        :param kind: str/bool/int/float. default: str
-        """
-        if self.config.has_option('preferences', option):
-            if kind == 'bool':
-                return self.config.getboolean('preferences', option)
-            elif kind == 'int':
-                return self.config.getint('preferences', option)
-            elif kind == 'float':
-                return self.config.getfloat('preferences', option)
-            else:
-                return self.config.get('preferences', option)
-        else:
-            try:
-                return self._get_default(option)
-            except KeyError:
-                return None

=== removed file 'olive/add.py'
--- olive/add.py	2008-07-17 20:41:24 +0000
+++ olive/add.py	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-import bzrlib.add
-import bzrlib.errors as errors
-
-from bzrlib.plugins.gtk import _i18n
-from bzrlib.plugins.gtk.dialog import error_dialog
-from bzrlib.plugins.gtk.errors import show_bzr_error
-
-
-class AddDialog(gtk.Dialog):
-    """ Dialog for adding selected file or recursively all unknown files/folders in branch """
-    
-    def __init__(self, wt, wtpath, selected, parent=None):
-        """ Initialize the Add dialog. """
-        gtk.Dialog.__init__(self, title="Olive - Add file(s)",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
-        
-        # Get arguments
-        self.wt = wt
-        self.wtpath = wtpath
-        self.selected = selected
-        
-        # Create widgets
-        self._label_add_question = gtk.Label(_i18n("Which file(s) do you want to add?"))
-        self._radiobutton_add_selected = gtk.RadioButton(None,_i18n("Selected: %s"%self.selected))
-        self._radiobutton_add_unknown = gtk.RadioButton(self._radiobutton_add_selected, 
-                                                        _i18n("All unknowns recursively"))
-        self._button_add = gtk.Button(stock=gtk.STOCK_ADD)        
-        
-        self._button_add.connect('clicked', self._on_add_clicked)
-        
-        # Add widgets to dialog window and decorate
-        self.vbox.add(self._label_add_question)
-        self.vbox.add(self._radiobutton_add_selected)
-        self.vbox.add(self._radiobutton_add_unknown)
-        self.vbox.set_spacing(3)
-        self.action_area.pack_end(self._button_add)
-        
-        self.vbox.show_all()
-        
-    @show_bzr_error
-    def _on_add_clicked(self, button):
-        """ """
-        if self._radiobutton_add_selected.get_active():
-            # Add only the selected file
-            filename = self.selected
-            
-            if filename is None:
-                error_dialog(_i18n('No file was selected'),
-                             _i18n('Please select a file from the list,\nor choose the other option.'))
-                return
-            
-            try:
-                self.wt.add([filename])
-            except errors.NotBranchError:
-                error_dialog(_i18n('Directory is not a branch'),
-                             _i18n('You can perform this action only in a branch.'))
-                return
-        elif self._radiobutton_add_unknown.get_active():
-            # Add unknown files recursively
-            try:
-                self.wt.add(self.wt.unknowns())
-            except errors.NotBranchError:
-                error_dialog(_i18n('Directory is not a branch'),
-                             _i18n('You can perform this action only in a branch.'))
-                return
-        
-        self.response(gtk.RESPONSE_OK)

=== removed file 'olive/bookmark.py'
--- olive/bookmark.py	2008-07-20 22:36:42 +0000
+++ olive/bookmark.py	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-from bzrlib.plugins.gtk.olive import Preferences
-from bzrlib.plugins.gtk import _i18n
-from bzrlib.plugins.gtk.dialog import error_dialog
-
-
-class BookmarkDialog(gtk.Dialog):
-    """ This class wraps the old Bookmark window into a gtk.Dialog. """
-    
-    def __init__(self, selected, parent=None):
-        """ Initialize the Bookmark dialog. """
-        gtk.Dialog.__init__(self, title="Bookmarks - Olive",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
-        
-        self.pref = Preferences()
-        
-        # Get arguments
-        self.selected = selected
-        
-        # Create widgets
-        self._label_location = gtk.Label(_i18n("Location:"))
-        self._label_title = gtk.Label(_i18n("Title:"))
-        self._entry_location = gtk.Entry()
-        self._entry_title = gtk.Entry()
-        self._button_save = gtk.Button(stock=gtk.STOCK_SAVE)
-        
-        self._button_save.connect('clicked', self._on_save_clicked)
-        
-        # Set default values
-        self._entry_location.set_text(self.selected)
-        self._entry_location.set_sensitive(False)
-        self._entry_title.set_text(self.pref.get_bookmark_title(self.selected))
-        self._entry_title.set_flags(gtk.CAN_FOCUS | gtk.HAS_FOCUS)
-        
-        self._entry_title.connect('activate', self._on_save_clicked)
-        
-        # Create a table and put widgets into it
-        self._table = gtk.Table(rows=2, columns=2)
-        self._table.attach(self._label_location, 0, 1, 0, 1)
-        self._table.attach(self._label_title, 0, 1, 1, 2)
-        self._table.attach(self._entry_location, 1, 2, 0, 1)
-        self._table.attach(self._entry_title, 1, 2, 1, 2)
-        
-        self._label_location.set_alignment(0, 0.5)
-        self._label_title.set_alignment(0, 0.5)
-        self._table.set_row_spacings(3)
-        self._table.set_col_spacings(3)
-        self.vbox.set_spacing(3)
-        
-        self.vbox.add(self._table)
-        
-        self.action_area.pack_end(self._button_save)
-        
-        self.vbox.show_all()
-        
-    def _on_save_clicked(self, button):
-        """ Save button clicked handler. """
-        if self._entry_title.get_text() == '':
-            error_dialog(_i18n('No title given'),
-                         _i18n('Please specify a title to continue.'))
-            return
-        
-        self.pref.set_bookmark_title(self._entry_location.get_text(),
-                                     self._entry_title.get_text())
-        self.pref.write()
-        
-        self.response(gtk.RESPONSE_OK)

=== removed file 'olive/guifiles.py'
--- olive/guifiles.py	2008-07-22 08:01:14 +0000
+++ olive/guifiles.py	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-"""cmenu.ui path"""
-
-import os
-import sys
-
-from bzrlib.plugins.gtk import _i18n
-
-UIFILENAMES = ["/usr/share/olive/cmenu.ui",
-                  "/usr/local/share/olive/cmenu.ui",
-                  "/opt/share/olive/cmenu.ui",
-                  "/opt/local/share/olive/cmenu.ui",
-                  "~/share/olive/cmenu.ui",
-                 ]
-
-# Get the glade file name
-if sys.platform == 'win32':
-    UIFILENAMES = [os.path.join(os.path.dirname(sys.executable),
-                                   "share/olive/cmenu.ui")]
-
-dir_ = os.path.split(os.path.dirname(__file__))[0]
-# Check first if we are running from source
-UIFILENAMES.insert(0, os.path.join(dir_, "cmenu.ui"))
-
-UIFILENAME = None
-
-for path in UIFILENAMES:
-    path = os.path.expanduser(path)
-    if os.path.isfile(path):
-        UIFILENAME = path
-        break
-
-if UIFILENAME is None:
-    # Fail
-    print _i18n('Context menu file (cmenu.ui) cannot be found.')
-    sys.exit(1)

=== removed file 'olive/info.py'
--- olive/info.py	2008-08-04 21:39:55 +0000
+++ olive/info.py	1970-01-01 00:00:00 +0000
@@ -1,287 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-import bzrlib.errors as errors
-
-from bzrlib.plugins.gtk import _i18n, icon_path
-from bzrlib.plugins.gtk.dialog import error_dialog
-
-
-def info(location):
-    """ Get info about branch, working tree, and repository
-    
-    :param location: the location of the branch/working tree/repository
-    
-    :return: the information in dictionary format
-    
-    The following informations are delivered (if available):
-    ret['location']['lightcoroot']: Light checkout root
-    ret['location']['sharedrepo']: Shared repository
-    ret['location']['repobranch']: Repository branch
-    ret['location']['cobranch']: Checkout of branch
-    ret['location']['repoco']: Repository checkout
-    ret['location']['coroot']: Checkout root
-    ret['location']['branchroot']: Branch root
-    ret['related']['parentbranch']: Parent branch
-    ret['related']['publishbranch']: Publish to branch
-    ret['format']['control']: Control format
-    ret['format']['workingtree']: Working tree format
-    ret['format']['branch']: Branch format
-    ret['format']['repository']: Repository format
-    ret['locking']['workingtree']: Working tree lock status
-    ret['locking']['branch']: Branch lock status
-    ret['locking']['repository']: Repository lock status
-    ret['missing']['branch']: Missing revisions in branch
-    ret['missing']['workingtree']: Missing revisions in working tree
-    ret['wtstats']['unchanged']: Unchanged files
-    ret['wtstats']['modified']: Modified files
-    ret['wtstats']['added']: Added files
-    ret['wtstats']['removed']: Removed files
-    ret['wtstats']['renamed']: Renamed files
-    ret['wtstats']['unknown']: Unknown files
-    ret['wtstats']['ignored']: Ingnored files
-    ret['wtstats']['subdirs']: Versioned subdirectories
-    ret['brstats']['revno']: Revisions in branch
-    ret['brstats']['commiters']: Number of commiters
-    ret['brstats']['age']: Age of branch in days
-    ret['brstats']['firstrev']: Time of first revision
-    ret['brstats']['lastrev']: Time of last revision
-    ret['repstats']['revisions']: Revisions in repository
-    ret['repstats']['size']: Size of repository in bytes
-    """
-    import bzrlib.bzrdir as bzrdir
-    
-    import info_helper
-    
-    ret = {}
-    try:
-        a_bzrdir = bzrdir.BzrDir.open_containing(location)[0]
-    except errors.NotBranchError:
-        raise errors.NotBranchError(location)
-
-    try:
-        working = a_bzrdir.open_workingtree()
-        working.lock_read()
-        try:
-            branch = working.branch
-            repository = branch.repository
-            control = working.bzrdir
-            
-            ret['location'] = info_helper.get_location_info(repository, branch, working)
-            ret['related'] = info_helper.get_related_info(branch)
-            ret['format'] = info_helper.get_format_info(control, repository, branch, working)
-            ret['locking'] = info_helper.get_locking_info(repository, branch, working)
-            ret['missing'] = {}
-            ret['missing']['branch'] = info_helper.get_missing_revisions_branch(branch)
-            ret['missing']['workingtree'] = info_helper.get_missing_revisions_working(working)
-            ret['wtstats'] = info_helper.get_working_stats(working)
-            ret['brstats'] = info_helper.get_branch_stats(branch)
-            ret['repstats'] = info_helper.get_repository_stats(repository)
-        finally:
-            working.unlock()
-            return ret
-        return
-    except (errors.NoWorkingTree, errors.NotLocalUrl):
-        pass
-
-    try:
-        branch = a_bzrdir.open_branch()
-        repository = branch.repository
-        control = a_bzrdir
-        branch.lock_read()
-        try:
-            ret['location'] = info_helper.get_location_info(repository, branch)
-            ret['related'] = info_helper.get_related_info(branch)
-            ret['format'] = info_helper.get_format_info(control, repository, branch)
-            ret['locking'] = info_helper.get_locking_info(repository, branch)
-            ret['missing']['branch'] = info_helper.get_missing_revisions_branch(branch)
-            ret['brstats'] = info_helper.get_branch_stats(branch)
-            ret['repstats'] = info_helper.get_repository_stats(repository)
-        finally:
-            branch.unlock()
-            return ret
-        return
-    except errors.NotBranchError:
-        pass
-
-    try:
-        repository = a_bzrdir.open_repository()
-        repository.lock_read()
-        try:
-            ret['location'] = info_helper.get_location_info(repository)
-            ret['format'] = info_helper.get_format_info(control, repository)
-            ret['locking'] = info_helper.get_locking_info(repository)
-            ret['repstats'] = info_helper.get_repository_stats(repository)
-        finally:
-            repository.unlock()
-        return ret
-    except errors.NoRepositoryPresent:
-        pass
-
-
-class InfoDialog(object):
-    """ Display Informations window and perform the needed actions. """
-    
-    def __init__(self, branch):
-        """ Initialize the Informations window. """
-        # Check if current location is a branch
-        self.notbranch = False
-        try:
-            self.ret = info(branch.base)
-        except errors.NotBranchError:
-            self.notbranch = True
-            return
-        
-        # Create the window
-        self.window = gtk.Dialog(title="Branch Information",
-                                  parent = None,
-                                  flags=0,
-                                  buttons=None)
-        self.window.set_icon_list(gtk.gdk.pixbuf_new_from_file(icon_path("oliveicon2.png")),
-                                  gtk.gdk.pixbuf_new_from_file(icon_path("olive-gtk.png")))
-        self.window.vbox.set_spacing(3)
-        self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
-        
-        infokeylist = ( ('location', _i18n("Location"), (
-                            ('lightcoroot', _i18n("Light checkout root")),
-                            ('sharedrepo', _i18n("Shared repository")),
-                            ('repobranch', _i18n("Repository branch")),
-                            ('cobranch', _i18n("Checkout of branch")),
-                            ('repoco', _i18n("Repository checkout")),
-                            ('coroot', _i18n("Checkout root")),
-                            ('branchroot', _i18n("Branch root")),
-                            )),
-                        ('related', _i18n("Related branches"), (
-                            ('parentbranch', _i18n("Parent branch")),
-                            ('publishbranch', _i18n("Publish to branch")),
-                            )),
-                        ('format', _i18n("Format"), (
-                            ('control', _i18n("Control format")),
-                            ('workingtree', _i18n("Working tree format")),
-                            ('branch', _i18n("Branch format")),
-                            ('repository', _i18n("Repository format")),
-                            )),
-                        ('locking', _i18n("Lock status"), (
-                            ('workingtree', _i18n("Working tree lock status")),
-                            ('branch', _i18n("Branch lock status")),
-                            ('repository', _i18n("Repository lock status")),
-                            )),
-                        #('missing', _i18n("Missing revisions"), (
-                        #    ('branch', _i18n("Missing revisions in branch")),
-                        #    ('workingtree', _i18n("Missing revisions in working tree")),
-                        #    )), # Missing is 'temporary' disabled
-                        ('wtstats', _i18n("In the working tree"), (
-                            ('unchanged', _i18n("Unchanged files")),
-                            ('modified', _i18n("Modified files")),
-                            ('added', _i18n("Added files")),
-                            ('removed', _i18n("Removed files")),
-                            ('renamed', _i18n("Renamed files")),
-                            ('unknown', _i18n("Unknown files")),
-                            ('ignored', _i18n("Ignored files")),
-                            ('subdirs', _i18n("Versioned subdirectories")),
-                            )),
-                        ('brstats', _i18n("Branch history"), (
-                            ('revno', _i18n("Revisions in branch")),
-                            ('commiters', _i18n("Number of commiters")),
-                            ('age', _i18n("Age of branch in days")),
-                            ('firstrev', _i18n("Time of first revision")),
-                            ('lastrev', _i18n("Time of last revision")),
-                            )),
-                        ('repstats', _i18n("Revision store"), (
-                            ('revisions', _i18n("Revisions in repository")),
-                            ('size', _i18n("Size of repository in bytes")),
-                            )),
-                        )
-               
-        # Generate status output
-        self._generate_info(infokeylist)
-        
-        button_close = gtk.Button(stock=gtk.STOCK_CLOSE)        
-        button_close.connect('clicked', self.close)
-        self.window.action_area.pack_end(button_close)
-        self.window.set_focus(button_close)
-    
-    def _generate_info(self, infokeylist):
-        """ Generate 'bzr info' output. """
-        expander={}
-        alignment={}
-        table={}
-        label = {}
-        description = {}
-        for key, keystring, subkeylist in infokeylist:
-            if self.ret.has_key(key):
-                tablelength = 0
-                for subkey, subkeystring in subkeylist:
-                    if self.ret[key].has_key(subkey):
-                        tablelength += 1
-                if tablelength == 0:
-                    pass
-                else:
-                    expander[key] = gtk.Expander(keystring)
-                    expander[key].set_use_markup(True)
-                    expander[key].connect('activate', self.activate)
-                    
-                    alignment[key]= gtk.Alignment()
-                    alignment[key].set_padding(0, 0, 24, 0)
-                    expander[key].add(alignment[key])
-                    
-                    table[key] = gtk.Table(tablelength, 2)
-                    table[key].set_col_spacings(12)
-                    alignment[key].add(table[key])
-                    
-                    label[key] = {}
-                    description[key] = {}
-                    
-                    tablepos = 0
-                    for subkey, subkeystring in subkeylist:
-                        if self.ret[key].has_key(subkey):
-                            label[key][subkey] = gtk.Label(subkeystring)
-                            table[key].attach(label[key][subkey], 0, 1, tablepos, tablepos + 1, gtk.FILL)
-                            label[key][subkey].set_alignment(0, 0.5)
-                            
-                            description[key][subkey] = gtk.Label(str(self.ret[key][subkey]))
-                            table[key].attach(description[key][subkey], 1, 2, tablepos, tablepos + 1, gtk.FILL)
-                            description[key][subkey].set_alignment(0, 0.5)
-                            tablepos += 1
-                    expander[key].set_expanded(True)
-                    self.window.vbox.pack_start(expander[key], False, True, 0)
-    
-    def activate(self, expander):
-        """ Redraw the window. """
-        self.window.resize(50, 50)
-        self.window.queue_resize()
-    
-    def display(self):
-        """ Display the Informations window. """
-        if self.notbranch:
-            error_dialog(_i18n('Directory is not a branch'),
-                         _i18n('You can perform this action only in a branch.'))
-            self.close()
-        else:
-            self.window.show_all()
-    
-    def close(self, widget=None):
-        self.window.destroy()

=== removed file 'olive/info_helper.py'
--- olive/info_helper.py	2008-07-19 23:16:51 +0000
+++ olive/info_helper.py	1970-01-01 00:00:00 +0000
@@ -1,323 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-# Some parts of the code are:
-# Copyright (C) 2005, 2006 by Canonical Ltd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import time
-import sys
-
-import bzrlib
-
-from bzrlib import (
-    bzrdir,
-    diff,
-    errors,
-    osutils,
-    urlutils,
-    )
-
-from bzrlib.diff import show_diff_trees
-from bzrlib.missing import find_unmerged
-    
-def _repo_rel_url(repo_url, inner_url):
-    """Return path with common prefix of repository path removed.
-
-    If path is not part of the repository, the original path is returned.
-    If path is equal to the repository, the current directory marker '.' is
-    returned.
-    Otherwise, a relative path is returned, with trailing '/' stripped.
-    """
-    inner_url = urlutils.normalize_url(inner_url)
-    repo_url = urlutils.normalize_url(repo_url)
-    if inner_url == repo_url:
-        return '.'
-    result = urlutils.relative_url(repo_url, inner_url)
-    if result != inner_url:
-        result = result.rstrip('/')
-    return result
-
-def get_location_info(repository, branch=None, working=None):
-    """ Get known locations for working, branch and repository.
-    
-    :return: a dictionary containing the needed infos
-    """
-    ret = {}
-    repository_path = repository.bzrdir.root_transport.base
-    if working and branch:
-        working_path = working.bzrdir.root_transport.base
-        branch_path = branch.bzrdir.root_transport.base
-        if working_path != branch_path:
-            # lightweight checkout
-            ret['lightcoroot'] = working_path
-            if repository.is_shared():
-                # lightweight checkout of branch in shared repository
-                ret['sharedrepo'] = repository_path
-                ret['repobranch'] = _repo_rel_url(repository_path, branch_path)
-            else:
-                # lightweight checkout of standalone branch
-                ret['cobranch'] = branch_path
-        elif repository.is_shared():
-            # branch with tree inside shared repository
-            ret['sharedrepo'] = repository_path
-            ret['repoco'] = _repo_rel_url(repository_path, branch_path)
-        elif branch.get_bound_location():
-            # normal checkout
-            ret['coroot'] = working_path
-            ret['cobranch'] = branch.get_bound_location()
-        else:
-            # standalone
-            ret['branchroot'] = working_path
-    elif branch:
-        branch_path = branch.bzrdir.root_transport.base
-        if repository.is_shared():
-            # branch is part of shared repository
-            ret['sharedrepo'] = repository_path
-            ret['repobranch'] = _repo_rel_url(repository_path, branch_path)
-        else:
-            # standalone branch
-            ret['branchroot'] = branch_path
-    else:
-        # shared repository
-        assert repository.is_shared()
-        ret['sharedrepo'] = repository_path
-    
-    return ret
-
-def get_related_info(branch):
-    """ Get parent and push location of branch.
-    
-    :return: a dictionary containing the needed infos
-    """
-    ret = {}
-    if branch.get_parent() or branch.get_push_location():
-        if branch.get_parent():
-            ret['parentbranch'] = branch.get_parent()
-        if branch.get_push_location():
-            ret['publishbranch'] = branch.get_push_location()
-    
-    return ret
-
-
-def get_format_info(control=None, repository=None, branch=None, working=None):
-    """ Get known formats for control, working, branch and repository.
-    
-    :return: a dictionary containing the needed infos
-    """
-    ret = {}
-    if control:
-        ret['control'] = control._format.get_format_description()
-    if working:
-        ret['workingtree'] = working._format.get_format_description()
-    if branch:
-        ret['branch'] = branch._format.get_format_description()
-    if repository:
-        ret['repository'] = repository._format.get_format_description()
-    
-    return ret
-
-
-def get_locking_info(repository, branch=None, working=None):
-    """ Get locking status of working, branch and repository.
-    
-    :return: a dictionary containing the needed infos
-    """
-    ret = {}
-    if (repository.get_physical_lock_status() or
-        (branch and branch.get_physical_lock_status()) or
-        (working and working.get_physical_lock_status())):
-        if working:
-            if working.get_physical_lock_status():
-                status = 'locked'
-            else:
-                status = 'unlocked'
-            ret['workingtree'] = status
-        if branch:
-            if branch.get_physical_lock_status():
-                status = 'locked'
-            else:
-                status = 'unlocked'
-            ret['branch'] = status
-        if repository:
-            if repository.get_physical_lock_status():
-                status = 'locked'
-            else:
-                status = 'unlocked'
-            ret['repository'] = status
-    
-    return ret
-
-def get_missing_revisions_branch(branch):
-    """ Get missing master revisions in branch.
-    
-    :return: a dictionary containing the needed infos
-    """
-    ret = {}
-    # Try with inaccessible branch ?
-    master = branch.get_master_branch()
-    if master:
-        local_extra, remote_extra = find_unmerged(branch, master)
-        if remote_extra:
-            ret = len(remote_extra)
-    
-    return ret
-
-
-def get_missing_revisions_working(working):
-    """ Get missing revisions in working tree.
-    
-    :return: a dictionary containing the needed infos
-    """
-    if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
-        # function deprecated after 0.9
-        from bzrlib.delta import compare_trees
-
-    ret = {}
-    branch = working.branch
-    basis = working.basis_tree()
-
-    if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
-        delta = compare_trees(basis, working, want_unchanged=True)
-    else:
-        delta = working.changes_from(basis, want_unchanged=True)
-
-    history = branch.revision_history()
-    tree_last_id = working.last_revision()
-
-    if len(history) and tree_last_id != history[-1]:
-        tree_last_revno = branch.revision_id_to_revno(tree_last_id)
-        missing_count = len(history) - tree_last_revno
-        ret = missing_count
-    
-    return ret
-
-
-def get_working_stats(working):
-    """ Get statistics about a working tree.
-    
-    :return: a dictionary containing the needed infos
-    """
-    if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
-        # function deprecated after 0.9
-        from bzrlib.delta import compare_trees
-    
-    ret = {}
-    basis = working.basis_tree()
-
-    if (bzrlib.version_info[0] == 0) and (bzrlib.version_info[1] < 9):
-        delta = compare_trees(basis, working, want_unchanged=True)
-    else:
-        delta = working.changes_from(basis, want_unchanged=True)
-
-    ret['unchanged'] = len(delta.unchanged)
-    ret['modified'] = len(delta.modified)
-    ret['added'] = len(delta.added)
-    ret['removed'] = len(delta.removed)
-    ret['renamed'] = len(delta.renamed)
-
-    ignore_cnt = unknown_cnt = 0
-    for path in working.extras():
-        if working.is_ignored(path):
-            ignore_cnt += 1
-        else:
-            unknown_cnt += 1
-    ret['unknown'] = unknown_cnt
-    ret['ignored'] = ignore_cnt
-
-    dir_cnt = 0
-    for path, ie in working.iter_entries_by_dir():
-        if ie.kind == 'directory':
-            dir_cnt += 1
-    ret['subdirs'] = dir_cnt
-
-    return ret
-
-def get_branch_stats(branch):
-    """ Get statistics about a branch.
-    
-    :return: a dictionary containing the needed infos
-    """
-    ret = {}
-    repository = branch.repository
-    history = branch.revision_history()
-
-    revno = len(history)
-    ret['revno'] = revno 
-    committers = {}
-    for rev in history:
-        committers[repository.get_revision(rev).committer] = True
-    ret['commiters'] = len(committers)
-    if revno > 0:
-        firstrev = repository.get_revision(history[0])
-        age = int((time.time() - firstrev.timestamp) / 3600 / 24)
-        ret['age'] = '%d days'%age
-        ret['firstrev'] = osutils.format_date(firstrev.timestamp,
-                                              firstrev.timezone)
-
-        lastrev = repository.get_revision(history[-1])
-        ret['lastrev'] = osutils.format_date(lastrev.timestamp,
-                                             lastrev.timezone)
-
-    return ret
-
-def get_repository_stats(repository):
-    """ Get statistics about a repository.
-    
-    :return: a dictionary containing the needed infos
-    """
-    ret = {}
-    if repository.bzrdir.root_transport.listable():
-        c, t = repository._revision_store.total_size(repository.get_transaction())
-        ret['revisions'] = c
-        ret['size'] = '%d KiB'%t
-
-    return ret
-
-def diff_helper(tree, specific_files, external_diff_options, 
-                    old_revision_spec=None, new_revision_spec=None,
-                    old_label='a/', new_label='b/', output=None):
-    """ Helper for diff.
-
-    :param tree: a WorkingTree
-
-    :param specific_files: the specific files to compare, or None
-
-    :param external_diff_options: if non-None, run an external diff, and pass it these options
-
-    :param old_revision_spec: if None, use basis tree as old revision, otherwise use the tree for the specified revision. 
-
-    :param new_revision_spec:  if None, use working tree as new revision, otherwise use the tree for the specified revision.
-    """
-    
-    if output == None:
-        output = sys.stdout
-    
-    if old_revision_spec is None:
-        old_tree = tree.basis_tree()
-    else:
-        old_tree = spec_tree(old_revision_spec)
-
-    if new_revision_spec is None:
-        new_tree = tree
-    else:
-        new_tree = spec_tree(new_revision_spec)
-
-    return show_diff_trees(old_tree, new_tree, output, specific_files,
-                           external_diff_options,
-                           old_label=old_label, new_label=new_label)
-
-def spec_tree(spec):
-        revision_id = spec.in_store(tree.branch).rev_id
-        return tree.branch.repository.revision_tree(revision_id)

=== removed file 'olive/launch.py'
--- olive/launch.py	2006-09-30 13:04:15 +0000
+++ olive/launch.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import sys
-import os
-
-def launch(path):
-    """ Launch program associated with path """
-
-    # Normalize filepath
-    normpath = os.path.normpath(path) 
-    
-    if sys.platform == 'win32':
-        # Windows is easy
-        os.startfile(normpath)
-    else:
-        # Maybe Gnome?
-        exe = search_exe('gnome-open')
-        if exe != None:
-            os.system("gnome-open %s" % normpath)
-            return
-        # Maybe KDE?
-        exe = search_exe('kfmclient')
-        if exe != None:
-            os.system("kfmclient exec file:%s" % normpath)
-            return
-
-        # TODO: support other platforms
-        print "DEBUG: file launch not supported on this platform."
-
-def search_exe(exe):
-    """ Search for given executable. """
-    found = 0
-    paths = os.environ['PATH'].split(os.pathsep)
-    for path in paths:
-        if os.path.exists(os.path.join(path,exe)):
-            found = 1
-            break
-    if found:
-        return True
-    return None

=== removed file 'olive/menu.py'
--- olive/menu.py	2010-01-25 01:58:58 +0000
+++ olive/menu.py	1970-01-01 00:00:00 +0000
@@ -1,383 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-import os.path
-import shutil
-import sys
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-import bzrlib.errors as errors
-from bzrlib.workingtree import WorkingTree
-
-from bzrlib.plugins.gtk import _i18n
-from bzrlib.plugins.gtk.dialog import error_dialog, info_dialog, question_dialog, warning_dialog
-from bzrlib.plugins.gtk.errors import show_bzr_error
-from bzrlib.plugins.gtk.annotate.gannotate import GAnnotateWindow
-from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
-from bzrlib.plugins.gtk.diff import DiffWindow
-from bzrlib.plugins.gtk.olive import Preferences, launch
-
-class OliveMenu:
-    """ This class is responsible for building the context menus. """
-    def __init__(self, path, selected, app=None):
-        # Load the UI file
-        from guifiles import UIFILENAME
-
-        self.uifile = UIFILENAME
-
-        # Preferences handler
-        self.pref = Preferences()
-        
-        # Set default values
-        self.path = path
-        self.selected = selected
-        self.app = app
-        
-        # Create the file list context menu
-        self.ui = gtk.UIManager()
-        
-        self.actiongroup = gtk.ActionGroup('context')
-        self.actiongroup.add_actions([('add', gtk.STOCK_ADD,
-                                       _i18n('Add'), None,
-                                       _i18n('Add the selected file'),
-                                       self.add_file),
-                                      ('remove', gtk.STOCK_REMOVE,
-                                       _i18n('Remove'), None,
-                                       _i18n('Remove the selected file'),
-                                       self.remove_file),
-                                      ('remove_and_delete', gtk.STOCK_REMOVE,
-                                       _i18n('Remove and delete'), None,
-                                       _i18n('Remove the selected file/dir and delete from disk'),
-                                       self.remove_and_delete_file),
-                                      ('rename', None,
-                                       _i18n('Rename'), None,
-                                       _i18n('Rename the selected file'),
-                                       self.rename_file),
-                                      ('open', gtk.STOCK_OPEN,
-                                       _i18n('Open'), None,
-                                       _i18n('Open the selected file'),
-                                       self.open_file),
-                                      ('revert', None,
-                                       _i18n('Revert'), None,
-                                       _i18n('Revert the changes'),
-                                       self.revert),
-                                      ('commit', None,
-                                       _i18n('Commit'), None,
-                                       _i18n('Commit the changes'),
-                                       self.commit),
-                                      ('annotate', None,
-                                       _i18n('Annotate'), None,
-                                       _i18n('Annotate the selected file'),
-                                       self.annotate),
-                                      ('diff', None,
-                                       _i18n('Diff'), None,
-                                       _i18n('Show the diff of the file'),
-                                       self.diff),
-                                      ('bookmark', None,
-                                       _i18n('Bookmark'), None,
-                                       _i18n('Bookmark current location'),
-                                       self.bookmark),
-                                      ('edit_bookmark', gtk.STOCK_EDIT,
-                                       _i18n('Edit'), None,
-                                       _i18n('Edit the selected bookmark'),
-                                       self.edit_bookmark),
-                                      ('remove_bookmark', gtk.STOCK_REMOVE,
-                                       _i18n('Remove'), None,
-                                       _i18n('Remove the selected bookmark'),
-                                       self.remove_bookmark),
-                                      ('open_folder', gtk.STOCK_OPEN,
-                                       _i18n('Open Folder'), None,
-                                       _i18n('Open bookmark folder in Nautilus'),
-                                       self.open_folder),
-                                      ('diff_selected', None,
-                                       _i18n('Selected...'), None,
-                                       _i18n('Show the differences of the selected file'),
-                                       self.diff_selected),
-                                      ('diff_all', None,
-                                       _i18n('All...'), None,
-                                       _i18n('Show the differences of all files'),
-                                       self.diff_all),
-                                      ('view_remote', None,
-                                       _i18n('View contents'), None,
-                                       _i18n('View the contents of the file in a builtin viewer'),
-                                       self.view_remote),
-                                      ('diff_remote', None,
-                                       _i18n('Show differences'), None,
-                                       _i18n('Show the differences between two revisions of the file'),
-                                       self.diff_remote),
-                                      ('revert_remote', None,
-                                       _i18n('Revert to this revision'), None,
-                                       _i18n('Revert the selected file to the selected revision'),
-                                       self.revert_remote)
-                                     ])
-        
-        self.ui.insert_action_group(self.actiongroup, 0)
-        self.ui.add_ui_from_file(self.uifile)
-        
-        self.cmenu_right = self.ui.get_widget('/context_right')
-        self.cmenu_left = self.ui.get_widget('/context_left')
-        self.toolbar_diff = self.ui.get_widget('/toolbar_diff')
-        self.cmenu_remote = self.ui.get_widget('/context_remote')
-        
-        # Set icons
-        # TODO: do it without using deprecated comm
-        #commit_menu = self.ui.get_widget('/context_right/commit')
-        #commit_image = self.comm.menuitem_branch_commit.get_image()
-        #commit_pixbuf = commit_image.get_pixbuf()
-        #commit_icon = gtk.Image()
-        #commit_icon.set_from_pixbuf(commit_pixbuf)
-        #commit_menu.set_image(commit_icon)
-        #diff_menu = self.ui.get_widget('/context_right/diff')
-        #diff_image = self.comm.menuitem_stats_diff.get_image()
-        #diff_pixbuf = diff_image.get_pixbuf()
-        #diff_icon = gtk.Image()
-        #diff_icon.set_from_pixbuf(diff_pixbuf)
-        #diff_menu.set_image(diff_icon)
-
-    def right_context_menu(self):
-        return self.cmenu_right
-    
-    def left_context_menu(self):
-        return self.cmenu_left
-    
-    def remote_context_menu(self):
-        return self.cmenu_remote
-    
-    @show_bzr_error
-    def add_file(self, action):
-        """ Right context menu -> Add """
-        import bzrlib.add
-        
-        # Add only the selected file
-        directory = self.path
-        filename = self.selected
-            
-        if filename is None:
-            error_dialog(_i18n('No file was selected'),
-                         _i18n('Please select a file from the list,\nor choose the other option.'))
-            return
-        
-        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
-        wt.add([path])
-        
-        self.app.refresh_right()
-    
-    @show_bzr_error
-    def annotate(self, action):
-        """ Right context menu -> Annotate """
-        directory = self.path
-        filename = self.selected
-        
-        if filename is None:
-            error_dialog(_i18n('No file was selected'),
-                         _i18n('Please select a file from the list.'))
-            return
-        
-        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
-        
-        branch = wt.branch
-        file_id = wt.path2id(wt.relpath(os.path.join(directory, filename)))
-        if file_id is None:
-            raise errors.NotVersionedError(filename)
-        window = GAnnotateWindow(all=False, plain=False, parent=self.app)
-        window.set_title(os.path.join(directory, filename) + " - Annotate")
-        config = GAnnotateConfig(window)
-        window.show()
-        branch.lock_read()
-        try:
-            window.annotate(wt, branch, file_id)
-        finally:
-            branch.unlock()
-    
-    @show_bzr_error
-    def remove_file(self, action, delete_on_disk=False):
-        """ Right context menu -> Remove """
-        # Remove only the selected file
-        directory = self.path
-        filename = self.selected
-        
-        if filename is None:
-            error_dialog(_i18n('No file was selected'),
-                         _i18n('Please select a file from the list,\nor choose the other option.'))
-            return
-        
-        wt, path = WorkingTree.open_containing(os.path.join(directory, filename))
-        wt.remove(path)
-        
-        if delete_on_disk:
-            abs_filename = os.path.join(directory,filename)
-            if os.path.isdir(abs_filename):
-                response = question_dialog(_i18n('Delete directory with all directories below ?'), abs_filename )
-                if response == gtk.RESPONSE_YES:
-                    shutil.rmtree(abs_filename)
-            else:
-                os.remove(abs_filename)
-                
-        self.app.set_path(self.path)
-        self.app.refresh_right()
-        
-    def remove_and_delete_file(self, action):
-        """ Right context menu -> Remove and delete"""
-        self.remove_file(action, delete_on_disk=True)
-
-    def rename_file(self, action):
-        """ Right context menu -> Rename """
-        from bzrlib.plugins.gtk.olive.rename import RenameDialog
-        wt = WorkingTree.open_containing(os.path.join(self.path, self.selected))[0]
-        rename = RenameDialog(wt, wt.relpath(self.path), self.selected)
-        response = rename.run()
-        rename.destroy()
-        if response == gtk.RESPONSE_OK:
-            self.app.refresh_right()
-    
-    def open_file(self, action):
-        """ Right context menu -> Open """
-        # Open only the selected file
-        filename = self.selected
-        
-        if filename is None:
-            error_dialog(_i18n('No file was selected'),
-                         _i18n('Please select a file from the list,\nor choose the other option.'))
-            return
-
-        if filename == '..':
-            # TODO: how to enter a directory?
-            return
-        else:
-            fullpath = os.path.join(self.path, filename)
-            launch.launch(fullpath) 
-
-    def revert(self, action):
-        """ Right context menu -> Revert """
-        wt, path = WorkingTree.open_containing(self.path)
-        ret = wt.revert([os.path.join(path, self.selected)])
-        if ret:
-            warning_dialog(_i18n('Conflicts detected'),
-                           _i18n('Please have a look at the working tree before continuing.'))
-        else:
-            info_dialog(_i18n('Revert successful'),
-                        _i18n('Selected file reverted to last revision.'))
-        self.app.refresh_right()       
-    
-    def commit(self, action):
-        """ Right context menu -> Commit """
-        from bzrlib.plugins.gtk.commit import CommitDialog
-        branch = None
-        try:
-            wt, path = WorkingTree.open_containing(self.path)
-            branch = wt.branch
-        except NotBranchError, e:
-            path = e.path
-        
-        if self.selected:
-            selected = os.path.join(path, self.selected)
-        else:
-            selected = None
-        commit = CommitDialog(wt=wt, selected=selected, parent=None)
-        response = commit.run()
-        if response != gtk.RESPONSE_NONE:
-            commit.hide()
-        
-            if response == gtk.RESPONSE_OK:
-                self.app.refresh_right()
-            
-            commit.destroy()
-    
-    @show_bzr_error
-    def diff(self, action):
-        """ Right context menu -> Diff """
-        wt = WorkingTree.open_containing(self.path)[0]
-        window = DiffWindow(self.app)
-        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
-        window.set_diff(wt.branch._get_nick(local=True), wt, parent_tree)
-        window.set_file(wt.relpath(self.path + os.sep + self.selected))
-        window.show()
-    
-    def bookmark(self, action):
-        """ Right context menu -> Bookmark """
-        if self.pref.add_bookmark(self.path):
-            info_dialog(_i18n('Bookmark successfully added'),
-                        _i18n('The current directory was bookmarked. You can reach\nit by selecting it from the left panel.'))
-            self.pref.write()
-        else:
-            warning_dialog(_i18n('Location already bookmarked'),
-                           _i18n('The current directory is already bookmarked.\nSee the left panel for reference.'))
-        
-        self.app.refresh_left()
-
-    def edit_bookmark(self, action):
-        """ Left context menu -> Edit """
-        from bookmark import BookmarkDialog
-        
-        if self.selected != None:
-            bookmark = BookmarkDialog(self.selected, self.app.window)
-            response = bookmark.run()
-            
-            if response != gtk.RESPONSE_NONE:
-                bookmark.hide()
-        
-                if response == gtk.RESPONSE_OK:
-                    self.app.refresh_left()
-            
-                bookmark.destroy()
-
-    def remove_bookmark(self, action):
-        """ Left context menu -> Remove """
-        
-        if self.selected != None:
-            self.pref.remove_bookmark(self.selected)
-            self.pref.write()
-        
-        self.app.refresh_left()
-    
-    def open_folder(self, action):
-        """ Left context menu -> Open Folder """
-        path = self.selected
-
-        if path != None:
-            launch.launch(path)
-    
-    def diff_selected(self, action):
-        """ Diff toolbutton -> Selected... """
-        print "DEBUG: not implemented."
-    
-    def diff_all(self, action):
-        """ Diff toolbutton -> All... """
-        wt = WorkingTree.open_containing(self.path)[0]
-        window = DiffWindow(self.app)
-        parent_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
-        window.set_diff(wt.branch._get_nick(local=True), wt, parent_tree)
-        window.show()
-    
-    def view_remote(self, action):
-        """ Remote context menu -> View contents """
-        print "DEBUG: view contents."
-    
-    def diff_remote(self, action):
-        """ Remote context menu -> Show differences """
-        print "DEBUG: show differences."
-    
-    def revert_remote(self, action):
-        """ Remote context menu -> Revert to this revision """
-        print "DEBUG: revert to this revision."

=== removed file 'olive/mkdir.py'
--- olive/mkdir.py	2008-07-17 21:10:05 +0000
+++ olive/mkdir.py	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-import bzrlib.errors as errors
-
-from bzrlib.plugins.gtk import _i18n
-from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
-from bzrlib.plugins.gtk.errors import show_bzr_error
-
-
-class MkdirDialog(gtk.Dialog):
-    """ Display the Make directory dialog and perform the needed actions. """
-    
-    def __init__(self, wt, wtpath, parent=None):
-        """ Initialize the Make directory dialog. """
-        gtk.Dialog.__init__(self, title="Olive - Make directory",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
-        
-        # Get arguments
-        self.wt = wt
-        self.wtpath = wtpath
-        
-        # Create widgets
-        self._hbox = gtk.HBox()
-        self._label_directory_name = gtk.Label(_i18n("Directory name"))
-        self._entry = gtk.Entry()
-        self._versioned = gtk.CheckButton(_i18n("_Versioned directory"), use_underline=True)
-        self._button_mkdir = gtk.Button(_i18n("_Make directory"), use_underline=True)
-        self._button_mkdir_icon = gtk.Image()
-        self._button_mkdir_icon.set_from_stock(gtk.STOCK_ADD, gtk.ICON_SIZE_BUTTON)
-        self._button_mkdir.set_image(self._button_mkdir_icon)
-        
-        self._entry.connect('activate', self._on_mkdir_clicked)
-        self._button_mkdir.connect('clicked', self._on_mkdir_clicked)
-        
-        # Add widgets to dialog
-        self.vbox.add(self._hbox)
-        self._hbox.add(self._label_directory_name)
-        self._hbox.add(self._entry)
-        self._hbox.set_spacing(5)
-        self.vbox.add(self._versioned)
-        self.action_area.pack_end(self._button_mkdir)
-        
-        self.vbox.show_all()
-
-    @show_bzr_error
-    def _on_mkdir_clicked(self, widget):
-        dirname = self._entry.get_text()
-        
-        if dirname == "":
-            error_dialog(_i18n('No directory name given'),
-                         _i18n('Please specify a desired name for the new directory.'))
-            return
-        
-        try:
-            os.mkdir(os.path.join(self.wt.basedir, self.wtpath, dirname))
-            
-            if self._versioned.get_active():
-                self.wt.add([os.path.join(self.wtpath, dirname)])
-        except OSError, e:
-            if e.errno == 17:
-                error_dialog(_i18n('Directory already exists'),
-                             _i18n('Please specify another name to continue.'))
-            else:
-                raise
-        
-        self.response(gtk.RESPONSE_OK)

=== removed file 'olive/move.py'
--- olive/move.py	2008-07-17 21:16:27 +0000
+++ olive/move.py	1970-01-01 00:00:00 +0000
@@ -1,115 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-import bzrlib.errors as errors
-from bzrlib.workingtree import WorkingTree
-
-from bzrlib.plugins.gtk import _i18n
-from bzrlib.plugins.gtk.dialog import error_dialog
-from bzrlib.plugins.gtk.errors import show_bzr_error
-
-
-class MoveDialog(gtk.Dialog):
-    """ Display the Move dialog and perform the needed actions. """
-    
-    def __init__(self, wt, wtpath, selected, parent=None):
-        """ Initialize the Move dialog. """
-        gtk.Dialog.__init__(self, title="Olive - Move",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
-        
-        # Get arguments
-        self.wt = wt
-        self.wtpath = wtpath
-        self.selected = selected
-        
-        if self.selected is None:
-            self.selected = ""
-        
-        if self.wtpath == "":
-            directory = os.path.dirname(self.wt.abspath(self.selected))
-        else:
-            directory = os.path.dirname(self.wt.abspath(self.wtpath + os.sep + self.selected))
-        
-        # Create widgets
-        self._hbox = gtk.HBox()
-        self._label_move_to = gtk.Label(_i18n("Move to"))
-        self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
-                                    parent=self.window,
-                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
-                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
-                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
-        self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
-        self.filechooser = gtk.FileChooserButton(self._filechooser_dialog)
-        self._button_move = gtk.Button(_i18n("_Move"))
-        self._button_move_icon = gtk.Image()
-        self._button_move_icon.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
-        self._button_move.set_image(self._button_move_icon)
-        
-        self._button_move.connect('clicked', self._on_move_clicked)
-        
-        # Set location
-        self._filechooser_dialog.set_current_folder(directory)
-        
-        # Add widgets to dialog
-        self.vbox.add(self._hbox)
-        self._hbox.add(self._label_move_to)
-        self._hbox.add(self.filechooser)
-        self._hbox.set_spacing(5)
-        self.action_area.pack_end(self._button_move)
-        
-        self.vbox.show_all()
-
-    @show_bzr_error
-    def _on_move_clicked(self, widget):
-        destination = self.filechooser.get_filename()
-        
-        if destination == None:
-            error_dialog(_i18n('No folder was selected'),
-                         _i18n('Please select a folder to move the selected file to'))
-            return
-        
-        filename = self.selected
-            
-        if filename is None:
-            error_dialog(_i18n('No file was selected'),
-                         _i18n('Please select a file from the list to proceed.'))
-            return
-        
-        source = os.path.join(self.wtpath, filename)
-        
-        # Move the file to a directory
-        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
-        wt2, path2 = WorkingTree.open_containing(destination)
-        if wt1.basedir != wt2.basedir:
-            error_dialog(_i18n('Not the same branch'),
-                         _i18n('The destination is not in the same branch.'))
-            return
-
-        wt1.move([source], wt1.relpath(destination))
-        
-        self.response(gtk.RESPONSE_OK)

=== removed file 'olive/remove.py'
--- olive/remove.py	2008-07-17 21:24:16 +0000
+++ olive/remove.py	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-	pass
-
-import gtk
-
-import bzrlib.errors as errors
-
-from bzrlib.plugins.gtk import _i18n
-from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
-from bzrlib.plugins.gtk.errors import show_bzr_error
-
-
-class RemoveDialog(gtk.Dialog):
-    """ This class wraps the old Remove window into a gtk.Dialog. """
-    
-    def __init__(self, wt, wtpath, selected='', parent=None):
-        """ Initialize the Remove file(s) dialog. """
-        gtk.Dialog.__init__(self, title="Olive - Remove files",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
-        
-        # Get arguments
-        self.wt = wt
-        self.wtpath = wtpath
-        self.selected = selected
-        
-        # Create widgets
-        self._label = gtk.Label(_i18n("Which file(s) do you want to remove?"))
-        self._radio_selected = gtk.RadioButton(None, _i18n("Selected: %s"%self.selected), False)
-        self._radio_added = gtk.RadioButton(self._radio_selected, _i18n("All files with status 'added'"), False)
-        self._button_remove = gtk.Button(stock=gtk.STOCK_REMOVE)
-        
-        self._button_remove.connect('clicked', self._on_remove_clicked)
-        
-        self.vbox.add(self._label)
-        self.vbox.add(self._radio_selected)
-        self.vbox.add(self._radio_added)
-        self.vbox.set_spacing(3)
-        self.action_area.pack_end(self._button_remove)
-        
-        self.vbox.show_all()
-        
-    @show_bzr_error
-    def _on_remove_clicked(self, button):
-        """ Remove button clicked handler. """
-        if self._radio_selected.get_active():
-            # Remove only the selected file
-            filename = self.selected
-            
-            if filename is None:
-                error_dialog(_i18n('No file was selected'),
-                             _i18n('Please select a file from the list,\nor choose the other option.'))
-                return
-            
-            self.wt.remove(os.path.join(self.wtpath, filename))
-        elif self._radio_added.get_active():
-            # Remove added files recursively
-            added = self.wt.changes_from(self.wt.basis_tree()).added
-            file_list = sorted([f[0] for f in added], reverse=True)
-            if len(file_list) == 0:
-                warning_dialog(_i18n('No matching files'),
-                               _i18n('No added files were found in the working tree.'))
-                return
-            self.wt.remove(file_list)
-        
-        self.response(gtk.RESPONSE_OK)

=== removed file 'olive/rename.py'
--- olive/rename.py	2008-07-18 10:39:25 +0000
+++ olive/rename.py	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-import bzrlib.errors as errors
-from bzrlib.workingtree import WorkingTree
-
-from bzrlib.plugins.gtk import _i18n
-from bzrlib.plugins.gtk.dialog import error_dialog
-from bzrlib.plugins.gtk.errors import show_bzr_error
-
-
-class RenameDialog(gtk.Dialog):
-    """ Display the Rename dialog and perform the needed actions. """
-    
-    def __init__(self, wt, wtpath, selected=None, parent=None):
-        """ Initialize the Rename file dialog. """
-        gtk.Dialog.__init__(self, title="Olive - Rename files",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
-        
-        # Get arguments
-        self.wt = wt
-        self.wtpath = wtpath
-        self.selected = selected
-        
-        # Create widgets
-        self._hbox = gtk.HBox()
-        self._label_rename_to = gtk.Label(_i18n("Rename to"))
-        self._entry = gtk.Entry()
-        self._button_rename = gtk.Button(_i18n("_Rename"))
-        self._button_rename_icon = gtk.Image()
-        self._button_rename_icon.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
-        self._button_rename.set_image(self._button_rename_icon)
-        
-        self._entry.connect('activate', self._on_rename_clicked)
-        self._button_rename.connect('clicked', self._on_rename_clicked)
-        
-        # Set text
-        if self.selected is not None:
-            self._entry.set_text(self.selected)
-        
-        # Add widgets to dialog
-        self.vbox.add(self._hbox)
-        self._hbox.add(self._label_rename_to)
-        self._hbox.add(self._entry)
-        self._hbox.set_spacing(5)
-        self.action_area.pack_end(self._button_rename)
-        
-        self.vbox.show_all()
-        
-    @show_bzr_error
-    def _on_rename_clicked(self, widget):
-        # Get entry
-        old_filename = self.selected
-        new_filename = self._entry.get_text()
-            
-        if old_filename is None:
-            error_dialog(_i18n('No file was selected'),
-                         _i18n('Please select a file from the list to proceed.'))
-            return
-        
-        if new_filename == "":
-            error_dialog(_i18n('Filename not given'),
-                         _i18n('Please specify a new name for the file.'))
-            return
-        
-        source = os.path.join(self.wtpath, old_filename)
-        destination = os.path.join(self.wtpath, new_filename)
-        
-        # Rename the file
-        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
-        wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
-
-        if wt1.basedir != wt2.basedir:
-            error_dialog(_i18n('Not the same branch'),
-                         _i18n('The destination is not in the same branch.'))
-            return
-        wt1.rename_one(source, destination)
-        
-        self.response(gtk.RESPONSE_OK)

=== removed file 'olive/window.py'
--- olive/window.py	2009-12-23 05:17:26 +0000
+++ olive/window.py	1970-01-01 00:00:00 +0000
@@ -1,575 +0,0 @@
-# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <[e-mail]>
-# Some parts of the code are:
-# Copyright (C) 2005, 2006 by Canonical Ltd
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-import os
-import sys
-import gtk
-import gobject
-
-from bzrlib.plugins.gtk import _i18n, icon_path
-
-
-class OliveGui(gtk.Window):
-    """ Olive main window """
-    
-    def __init__(self, calling_app):
-        # Pointer to calling instance for signal connection
-        self.signal = calling_app
-        
-        # Initialise window
-        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
-        self.set_title(_i18n("Olive - Bazaar GUI"))
-        self.set_icon_list(gtk.gdk.pixbuf_new_from_file(icon_path("oliveicon2.png")),
-                           gtk.gdk.pixbuf_new_from_file(icon_path("olive-gtk.png")),
-                           # Who has the svg version of the icon? Would be nice to include
-                           #gtk.gdk.pixbuf_new_from_file(icon_path("olive.svg"))
-                           )
-        self.set_property("width-request", 700)
-        self.set_property("height-request", 400)
-        
-        self.connect("destroy", self.destroy)
-        self.connect("delete_event", self.signal.on_window_main_delete_event)
-        
-        # Accelerator group to Quit program
-        accelgroup = gtk.AccelGroup()
-        self.add_accel_group(accelgroup)
-        self.quit_action = gtk.Action(_i18n("Quit"), None, None, gtk.STOCK_QUIT)
-        self.quit_action.connect('activate', self.signal.on_window_main_delete_event)
-        actiongroup = gtk.ActionGroup('QuitAction')
-        actiongroup.add_action_with_accel(self.quit_action, None)
-        self.quit_action.set_accel_group(accelgroup)
-        self.quit_action.connect_accelerator()
-        
-        # High level build up of window
-        self.vbox = gtk.VBox(False, 0)
-        self.add(self.vbox)
-        
-        # Menu bar
-        self._create_menubar()
-        self.vbox.pack_start(self.mb, False, False, 0)
-        
-        # Toolbar
-        self._create_toolbar()
-        self.vbox.pack_start(self.tb, False, False, 0)
-        
-        # Locationbar
-        self._create_locationbar()
-        self.vbox.pack_start(self.locationbar, False, False, 0)
-        
-        # Main area
-        self.hpaned_main = gtk.HPaned()
-        self._create_bookmarklist()
-        self.hpaned_main.add(self.scrolledwindow_left)
-        self._create_filelist()
-        self.hpaned_main.add(self.scrolledwindow_right)
-        self.vbox.pack_start(self.hpaned_main, True, True, 0)
-        
-        # Statusbar
-        self.statusbar = gtk.Statusbar()
-        self.vbox.pack_end(self.statusbar, False, False, 0)
-    
-    def show(self):
-        self.show_all()        
-    
-    def destroy(self, widget=None, data=None):
-        """ Ends the program """
-        gtk.main_quit()
-
-    def _create_menubar(self):
-        self.mb = gtk.MenuBar()
-        
-        # File menu
-        self.mb_file = gtk.MenuItem(_i18n("_File"))
-        self.mb_file_menu = gtk.Menu()
-        
-        self.mb_file_add = gtk.ImageMenuItem(gtk.STOCK_ADD, _i18n("_Add file(s)"))
-        self.mb_file_add.connect('activate', self.signal.on_menuitem_add_files_activate)
-        self.mb_file_menu.append(self.mb_file_add)
-        
-        self.mb_file_remove = gtk.ImageMenuItem(gtk.STOCK_REMOVE, _i18n("_Remove file(s)"))
-        self.mb_file_remove.connect('activate', self.signal.on_menuitem_remove_file_activate)
-        self.mb_file_menu.append(self.mb_file_remove)
-        
-        self.mb_file_menu.append(gtk.SeparatorMenuItem())
-        
-        self.mb_file_bookmark = gtk.MenuItem(_i18n("_Bookmark current directory"))
-        self.mb_file_bookmark.connect('activate', self.signal.on_menuitem_file_bookmark_activate)
-        self.mb_file_menu.append(self.mb_file_bookmark)
-        
-        self.mb_file_mkdir = gtk.MenuItem(_i18n("_Make directory"))
-        self.mb_file_mkdir.connect('activate', self.signal.on_menuitem_file_make_directory_activate)
-        self.mb_file_menu.append(self.mb_file_mkdir)
-        
-        self.mb_file_menu.append(gtk.SeparatorMenuItem())
-        
-        self.mb_file_rename = gtk.MenuItem(_i18n("_Rename"))
-        self.mb_file_rename.connect('activate', self.signal.on_menuitem_file_rename_activate)
-        self.mb_file_menu.append(self.mb_file_rename)
-        
-        self.mb_file_move = gtk.MenuItem(_i18n("_Move"))
-        self.mb_file_move.connect('activate', self.signal.on_menuitem_file_move_activate)
-        self.mb_file_menu.append(self.mb_file_move)
-        
-        self.mb_file_annotate = gtk.MenuItem(_i18n("_Annotate"))
-        self.mb_file_annotate.connect('activate', self.signal.on_menuitem_file_annotate_activate)
-        self.mb_file_menu.append(self.mb_file_annotate)
-        
-        self.mb_file_menu.append(gtk.SeparatorMenuItem())
-        
-        self.mb_file_quit = self.quit_action.create_menu_item()
-        self.mb_file_menu.append(self.mb_file_quit)
-        
-        self.mb_file.set_submenu(self.mb_file_menu)
-        self.mb.append(self.mb_file)
-        
-        # View menu
-        self.mb_view = gtk.MenuItem(_i18n("_View"))
-        self.mb_view_menu = gtk.Menu()
-        
-        self.mb_view_showhidden = gtk.CheckMenuItem(_i18n("Show _hidden files"))
-        self.mb_view_showhidden.connect('activate', self.signal.on_menuitem_view_show_hidden_files_activate)
-        self.mb_view_menu.append(self.mb_view_showhidden)
-        
-        self.mb_view_showignored = gtk.CheckMenuItem(_i18n("Show _ignored files"))
-        self.mb_view_showignored.connect('activate', self.signal.on_menuitem_view_show_ignored_files_activate)
-        self.mb_view_menu.append(self.mb_view_showignored)
-        
-        self.mb_view_menu.append(gtk.SeparatorMenuItem())
-        
-        self.mb_view_refresh = gtk.ImageMenuItem(gtk.STOCK_REFRESH, _i18n("_Refresh"))
-        self.mb_view_refresh.connect('activate', self.signal.on_menuitem_view_refresh_activate)
-        self.mb_view_menu.append(self.mb_view_refresh)
-        
-        self.mb_view.set_submenu(self.mb_view_menu)
-        self.mb.append(self.mb_view)
-        
-        # Branch menu
-        self.mb_branch = gtk.MenuItem(_i18n("_Branch"))
-        self.mb_branch_menu = gtk.Menu()
-        
-        self.mb_branch_initialize = gtk.MenuItem(_i18n("_Initialize"))
-        self.mb_branch_initialize.connect('activate', self.signal.on_menuitem_branch_initialize_activate)
-        self.mb_branch_menu.append(self.mb_branch_initialize)
-        
-        self.mb_branch_get = gtk.MenuItem(_i18n("_Get"))
-        self.mb_branch_get.connect('activate', self.signal.on_menuitem_branch_get_activate)
-        self.mb_branch_menu.append(self.mb_branch_get)
-        
-        self.mb_branch_checkout = gtk.MenuItem(_i18n("C_heckout"))
-        self.mb_branch_checkout.connect('activate', self.signal.on_menuitem_branch_checkout_activate)
-        self.mb_branch_menu.append(self.mb_branch_checkout)
-        
-        self.mb_branch_menu.append(gtk.SeparatorMenuItem())
-        
-        self.mb_branch_pull = gtk.ImageMenuItem(_i18n("Pu_ll"))
-        pullimage = gtk.Image()
-        pullimage.set_from_file(icon_path("pull16.png"))
-        self.mb_branch_pull.set_image(pullimage)
-        self.mb_branch_pull.connect('activate', self.signal.on_menuitem_branch_pull_activate)
-        self.mb_branch_menu.append(self.mb_branch_pull)
-        
-        self.mb_branch_push = gtk.ImageMenuItem(_i18n("Pu_sh"))
-        pushimage = gtk.Image()
-        pushimage.set_from_file(icon_path("push16.png"))
-        self.mb_branch_push.set_image(pushimage)
-        self.mb_branch_push.connect('activate', self.signal.on_menuitem_branch_push_activate)
-        self.mb_branch_menu.append(self.mb_branch_push)
-        
-        self.mb_branch_update = gtk.MenuItem(_i18n("_Update"))
-        self.mb_branch_update.connect('activate', self.signal.on_menuitem_branch_update_activate)
-        self.mb_branch_menu.append(self.mb_branch_update)
-        
-        self.mb_branch_menu.append(gtk.SeparatorMenuItem())
-        
-        self.mb_branch_revert = gtk.ImageMenuItem(_i18n("_Revert all changes"))
-        revertimage = gtk.Image()
-        revertimage.set_from_stock(gtk.STOCK_REVERT_TO_SAVED, gtk.ICON_SIZE_MENU)
-        self.mb_branch_revert.set_image(revertimage)
-        self.mb_branch_revert.connect('activate', self.signal.on_menuitem_branch_revert_activate)
-        self.mb_branch_menu.append(self.mb_branch_revert)
-        
-        self.mb_branch_merge = gtk.MenuItem(_i18n("_Merge"))
-        self.mb_branch_merge.connect('activate', self.signal.on_menuitem_branch_merge_activate)
-        self.mb_branch_menu.append(self.mb_branch_merge)
-        
-        self.mb_branch_commit = gtk.ImageMenuItem(_i18n("_Commit"))
-        commitimage = gtk.Image()
-        commitimage.set_from_file(icon_path("commit16.png"))
-        self.mb_branch_commit.set_image(commitimage)
-        self.mb_branch_commit.connect('activate', self.signal.on_menuitem_branch_commit_activate)
-        self.mb_branch_menu.append(self.mb_branch_commit)
-        
-        self.mb_branch_menu.append(gtk.SeparatorMenuItem())
-        
-        self.mb_branch_tags = gtk.ImageMenuItem(_i18n("Ta_gs"))
-        tagsimage = gtk.Image()
-        tagsimage.set_from_file(icon_path("tag-16.png"))
-        self.mb_branch_tags.set_image(tagsimage)
-        self.mb_branch_tags.connect('activate', self.signal.on_menuitem_branch_tags_activate)
-        self.mb_branch_menu.append(self.mb_branch_tags)
-        
-        self.mb_branch_status = gtk.MenuItem(_i18n("S_tatus"))
-        self.mb_branch_status.connect('activate', self.signal.on_menuitem_branch_status_activate)
-        self.mb_branch_menu.append(self.mb_branch_status)
-        
-        self.mb_branch_missingrevisions = gtk.MenuItem(_i18n("Missing _revisions"))
-        self.mb_branch_missingrevisions.connect('activate', self.signal.on_menuitem_branch_missing_revisions_activate)
-        self.mb_branch_menu.append(self.mb_branch_missingrevisions)
-        
-        self.mb_branch_conflicts = gtk.MenuItem(_i18n("Con_flicts"))
-        self.mb_branch_conflicts.connect('activate', self.signal.on_menuitem_branch_conflicts_activate)
-        self.mb_branch_menu.append(self.mb_branch_conflicts)
-        
-        self.mb_branch.set_submenu(self.mb_branch_menu)
-        self.mb.append(self.mb_branch)
-        
-        # Statistics menu
-        self.mb_statistics = gtk.MenuItem(_i18n("_Statistics"))
-        self.mb_statistics_menu = gtk.Menu()
-        
-        self.mb_statistics_differences = gtk.ImageMenuItem(_i18n("_Differences"))
-        diffimage = gtk.Image()
-        diffimage.set_from_file(icon_path("diff16.png"))
-        self.mb_statistics_differences.set_image(diffimage)
-        self.mb_statistics_differences.connect('activate', self.signal.on_menuitem_stats_diff_activate)
-        self.mb_statistics_menu.append(self.mb_statistics_differences)
-        
-        self.mb_statistics_log = gtk.ImageMenuItem(_i18n("_Log"))
-        logimage = gtk.Image()
-        logimage.set_from_file(icon_path("log16.png"))
-        self.mb_statistics_log.set_image(logimage)
-        self.mb_statistics_log.connect('activate', self.signal.on_menuitem_stats_log_activate)
-        self.mb_statistics_menu.append(self.mb_statistics_log)
-        
-        self.mb_statistics_information = gtk.MenuItem(_i18n("_Information"))
-        self.mb_statistics_information.connect('activate', self.signal.on_menuitem_stats_infos_activate)
-        self.mb_statistics_menu.append(self.mb_statistics_information)
-        
-        self.mb_statistics.set_submenu(self.mb_statistics_menu)
-        self.mb.append(self.mb_statistics)
-        
-        # Help menu
-        self.mb_help = gtk.MenuItem(_i18n("Help"))
-        self.mb_help_menu = gtk.Menu()
-        
-        self.mb_help_about = gtk.ImageMenuItem(gtk.STOCK_ABOUT)
-        self.mb_help_about.connect('activate', self.signal.on_about_activate)
-        self.mb_help_menu.append(self.mb_help_about)
-        
-        self.mb_help.set_submenu(self.mb_help_menu)
-        self.mb.append(self.mb_help)
-    
-    def _create_toolbar(self):
-        self.tb = gtk.Toolbar()
-        
-        self.tb_refresh_icon = gtk.Image()
-        self.tb_refresh_icon.set_from_file(icon_path("refresh.png"))
-        self.tb_refresh = gtk.ToolButton(self.tb_refresh_icon, _i18n("Refresh"))
-        self.tb_refresh.connect('clicked', self.signal.on_menuitem_view_refresh_activate)
-        self.tb_refresh.set_tooltip_text(_i18n("Refresh the file list"))
-        self.tb_refresh.set_is_important(True)
-        self.tb.add(self.tb_refresh)
-        
-        self.tb_diff_icon = gtk.Image()
-        self.tb_diff_icon.set_from_file(icon_path("diff.png"))
-        self.tb_diff = gtk.ToolButton(self.tb_diff_icon, _i18n("Diff"))
-        self.tb_diff.connect('clicked', self.signal.on_menuitem_stats_diff_activate)
-        self.tb_diff.set_tooltip_text(_i18n("View changes since last commit"))
-        self.tb.add(self.tb_diff)
-        
-        self.tb_log_icon = gtk.Image()
-        self.tb_log_icon.set_from_file(icon_path("log.png"))
-        self.tb_log = gtk.ToolButton(self.tb_log_icon, _i18n("Log"))
-        self.tb_log.connect('clicked', self.signal.on_menuitem_stats_log_activate)
-        self.tb_log.set_tooltip_text(_i18n("View the revision history"))
-        self.tb.add(self.tb_log)
-        
-        self.tb.add(gtk.SeparatorToolItem())
-        
-        self.tb_commit_icon = gtk.Image()
-        self.tb_commit_icon.set_from_file(icon_path("commit.png"))
-        self.tb_commit = gtk.ToolButton(self.tb_commit_icon, _i18n("Commit"))
-        self.tb_commit.connect('clicked', self.signal.on_menuitem_branch_commit_activate)
-        self.tb_commit.set_tooltip_text(_i18n("Commit changes to the current branch"))
-        self.tb_commit.set_is_important(True)
-        self.tb.add(self.tb_commit)
-        
-        self.tb.add(gtk.SeparatorToolItem())
-        
-        self.tb_pull_icon = gtk.Image()
-        self.tb_pull_icon.set_from_file(icon_path("pull.png"))
-        self.tb_pull = gtk.ToolButton(self.tb_pull_icon, _i18n("Pull"))
-        self.tb_pull.connect('clicked', self.signal.on_menuitem_branch_pull_activate)
-        self.tb_pull.set_tooltip_text(_i18n("Pull changes from the parent branch"))
-        self.tb.add(self.tb_pull)
-        
-        self.tb_push_icon = gtk.Image()
-        self.tb_push_icon.set_from_file(icon_path("push.png"))
-        self.tb_push = gtk.ToolButton(self.tb_push_icon, _i18n("Push"))
-        self.tb_push.connect('clicked', self.signal.on_menuitem_branch_push_activate)
-        self.tb_push.set_tooltip_text(_i18n("Push the branch to a remote location"))
-        self.tb.add(self.tb_push)
-        
-        self.tb_update_icon = gtk.Image()
-        self.tb_update_icon.set_from_file(icon_path("pull.png"))
-        self.tb_update = gtk.ToolButton(self.tb_update_icon, _i18n("Update"))
-        self.tb_update.connect('clicked', self.signal.on_menuitem_branch_update_activate)
-        self.tb_update.set_tooltip_text(_i18n("Update the working tree"))
-        self.tb.add(self.tb_update)
-    
-    def _create_locationbar(self):
-        """ Creates the location bar, including the history widgets """
-        self.locationbar = gtk.HBox()
-        
-        self.button_location_up = gtk.Button()
-        self.button_location_up.set_relief(gtk.RELIEF_NONE)
-        image_location_up = gtk.Image()
-        image_location_up.set_from_stock(gtk.STOCK_GO_UP, gtk.ICON_SIZE_BUTTON)
-        self.button_location_up.add(image_location_up)
-        self.button_location_up.connect("clicked", self.signal.on_button_location_up_clicked)
-        self.locationbar.pack_start(self.button_location_up, False, False, 0)
-        
-        self.entry_location = gtk.Entry()
-        self.entry_location.connect("activate", self.signal.on_button_location_jump_clicked)
-        self.locationbar.pack_start(self.entry_location, True, True, 0)
-        
-        self.location_status = gtk.Image()
-        self.location_status.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_BUTTON)
-        self.locationbar.pack_start(self.location_status, False, False, 0)
-        
-        self.button_location_jump = gtk.Button(stock=gtk.STOCK_JUMP_TO)
-        self.button_location_jump.set_relief(gtk.RELIEF_NONE)
-        self.button_location_jump.connect("clicked", self.signal.on_button_location_jump_clicked)
-        self.locationbar.pack_start(self.button_location_jump, False, False, 0)
-        
-        self.locationbar.pack_start(gtk.VSeparator(), False, False, 0)
-        
-        self.checkbutton_history = gtk.CheckButton(_i18n("H_istory Mode"))
-        self.checkbutton_history.connect("toggled", self.signal.on_checkbutton_history_toggled)
-        self.locationbar.pack_start(self.checkbutton_history, False, False, 0)
-        
-        self.entry_history_revno = gtk.Entry()
-        self.entry_history_revno.set_property("width-request", 75)
-        self.entry_history_revno.set_sensitive(False)
-        self.entry_history_revno.connect("activate", self.signal.on_entry_history_revno_activate)
-        self.locationbar.pack_start(self.entry_history_revno, False, False, 0)
-        
-        self.button_history_browse = gtk.Button()
-        self.button_history_browse.set_sensitive(False)
-        self.image_history_browse = gtk.Image()
-        self.image_history_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
-        self.button_history_browse.add(self.image_history_browse)
-        self.button_history_browse.connect("clicked", self.signal.on_button_history_browse_clicked)
-        self.locationbar.pack_start(self.button_history_browse, False, False, 0)
-    
-    def _create_bookmarklist(self):
-        """ Creates the bookmark list (a ListStore in a TreeView in a ScrolledWindow)"""
-        self.scrolledwindow_left = gtk.ScrolledWindow()
-        self.scrolledwindow_left.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        
-        self.treeview_left = gtk.TreeView()
-        self.treeview_left.connect("button-press-event", self.signal.on_treeview_left_button_press_event)
-        self.treeview_left.connect("row-activated", self.signal.on_treeview_left_row_activated)
-        self.scrolledwindow_left.add(self.treeview_left)
-
-        self.bookmarklist = gtk.ListStore(gobject.TYPE_STRING, 
-                                          gobject.TYPE_STRING, 
-                                          gobject.TYPE_STRING)
-        self.treeview_left.set_model(self.bookmarklist)
-        
-        icon = gtk.CellRendererPixbuf()
-        cell = gtk.CellRendererText()
-        
-        col_bookmark = gtk.TreeViewColumn(_i18n('Bookmarks'))
-        col_bookmark.pack_start(icon, False)
-        col_bookmark.pack_start(cell, False)
-        col_bookmark.set_attributes(icon, stock_id=2)
-        col_bookmark.add_attribute(cell, 'text', 0)
-        self.treeview_left.append_column(col_bookmark)
-    
-    def _create_filelist(self):
-        """ Creates the file list (a ListStore in a TreeView in a ScrolledWindow)"""
-        self.scrolledwindow_right = gtk.ScrolledWindow()
-        self.scrolledwindow_right.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        
-        self.treeview_right = gtk.TreeView()
-        self.treeview_right.connect("button-press-event", self.signal.on_treeview_right_button_press_event)
-        self.treeview_right.connect("row-activated", self.signal.on_treeview_right_row_activated)
-        self.scrolledwindow_right.add(self.treeview_right)
-        
-        # Model: [ icon, dir, name, status text, status, size (int), size (human), mtime (int), mtime (local), fileid ]
-        self.filelist = gtk.ListStore(gobject.TYPE_STRING,
-                                      gobject.TYPE_BOOLEAN,
-                                      gobject.TYPE_STRING,
-                                      gobject.TYPE_STRING,
-                                      gobject.TYPE_STRING,
-                                      gobject.TYPE_STRING,
-                                      gobject.TYPE_STRING,
-                                      gobject.TYPE_INT,
-                                      gobject.TYPE_STRING,
-                                      gobject.TYPE_STRING)
-        self.treeview_right.set_model(self.filelist)
-        
-        # Set up the cells
-        cellpb = gtk.CellRendererPixbuf()
-        cell = gtk.CellRendererText()
-        # For columns that get a different text color based on status (4)
-        cellstatus = gtk.CellRendererText()
-        
-        self.col_filename = gtk.TreeViewColumn(_i18n('Filename'))
-        self.col_filename.pack_start(cellpb, False)
-        self.col_filename.pack_start(cell, True)
-        self.col_filename.set_attributes(cellpb, stock_id=0)
-        self.col_filename.add_attribute(cell, 'text', 2)
-        self.col_filename.set_resizable(True)
-        self.treeview_right.append_column(self.col_filename)
-        
-        self.col_status = gtk.TreeViewColumn(_i18n('Status'))
-        self.col_status.pack_start(cellstatus, True)
-        self.col_status.add_attribute(cellstatus, 'text', 3)
-        self.col_status.set_cell_data_func(cellstatus, self._map_status_color)
-        self.col_status.set_resizable(True)
-        self.treeview_right.append_column(self.col_status)
-        
-        self.col_size = gtk.TreeViewColumn(_i18n('Size'))
-        self.col_size.pack_start(cell, True)
-        self.col_size.add_attribute(cell, 'text', 6)
-        self.col_size.set_resizable(True)
-        self.treeview_right.append_column(self.col_size)
-        
-        self.col_mtime = gtk.TreeViewColumn(_i18n('Last modified'))
-        self.col_mtime.pack_start(cell, True)
-        self.col_mtime.add_attribute(cell, 'text', 8)
-        self.col_mtime.set_resizable(True)
-        self.treeview_right.append_column(self.col_mtime)
-        
-        # Set up the properties of the TreeView
-        self.treeview_right.set_headers_visible(True)
-        self.treeview_right.set_headers_clickable(True)
-        self.treeview_right.set_search_column(1)
-        
-        # Set up sorting
-        self.filelist.set_sort_func(13, self.signal._sort_filelist_callback, None)
-        self.filelist.set_sort_column_id(13, gtk.SORT_ASCENDING)
-        self.col_filename.set_sort_column_id(13)
-        self.col_status.set_sort_column_id(3)
-        self.col_size.set_sort_column_id(5)
-        self.col_mtime.set_sort_column_id(7)
-    
-    def _map_status_color(self, column, cell, model, iter):
-        status = model.get_value(iter, 4)
-        if status == 'unchanged':
-            colorstatus = gtk.gdk.color_parse('black')
-            weight = 400 # standard value
-        elif status == 'removed':
-            colorstatus = gtk.gdk.color_parse('red')
-            weight = 800
-        elif status == 'added':
-            colorstatus = gtk.gdk.color_parse('green')
-            weight = 800
-        elif status == 'modified':
-            colorstatus = gtk.gdk.color_parse("#FD00D3")
-            weight = 800
-        elif status == 'renamed':
-            colorstatus = gtk.gdk.color_parse('blue')
-            weight = 800
-        elif status == 'ignored':
-            colorstatus = gtk.gdk.color_parse('grey')
-            weight = 600
-        else: # status == unknown
-            colorstatus = gtk.gdk.color_parse('orange')
-            weight = 800
-        cell.set_property('foreground-gdk', colorstatus)
-        cell.set_property('weight', weight)
-    
-    def set_view_to_localbranch(self, notbranch=False):
-        """ Change the sensitivity of gui items to reflect the fact that the path is a branch or not"""
-        self.mb_branch_initialize.set_sensitive(notbranch)
-        self.mb_branch_get.set_sensitive(notbranch)
-        self.mb_branch_checkout.set_sensitive(notbranch)
-        self.mb_branch_pull.set_sensitive(not notbranch)
-        self.mb_branch_push.set_sensitive(not notbranch)
-        self.mb_branch_update.set_sensitive(not notbranch)
-        self.mb_branch_revert.set_sensitive(not notbranch)
-        self.mb_branch_merge.set_sensitive(not notbranch)
-        self.mb_branch_commit.set_sensitive(not notbranch)
-        self.mb_branch_tags.set_sensitive(not notbranch)
-        self.mb_branch_status.set_sensitive(not notbranch)
-        self.mb_branch_missingrevisions.set_sensitive(not notbranch)
-        self.mb_branch_conflicts.set_sensitive(not notbranch)
-        self.mb_statistics.set_sensitive(not notbranch)
-        self.mb_statistics_differences.set_sensitive(not notbranch)
-        self.mb_file_add.set_sensitive(not notbranch)
-        self.mb_file_remove.set_sensitive(not notbranch)
-        self.mb_file_mkdir.set_sensitive(not notbranch)
-        self.mb_file_rename.set_sensitive(not notbranch)
-        self.mb_file_move.set_sensitive(not notbranch)
-        self.mb_file_annotate.set_sensitive(not notbranch)
-        self.tb_diff.set_sensitive(not notbranch)
-        self.tb_log.set_sensitive(not notbranch)
-        self.tb_commit.set_sensitive(not notbranch)
-        self.tb_pull.set_sensitive(not notbranch)
-        self.tb_push.set_sensitive(not notbranch)
-        self.tb_update.set_sensitive(not notbranch)
-    
-    def set_view_to_remotebranch(self):
-        """ Change the sensitivity of gui items to reflect the fact that the branch is remote"""
-        self.mb_file_add.set_sensitive(False)
-        self.mb_file_remove.set_sensitive(False)
-        self.mb_file_mkdir.set_sensitive(False)
-        self.mb_file_rename.set_sensitive(False)
-        self.mb_file_move.set_sensitive(False)
-        self.mb_file_annotate.set_sensitive(False)
-        self.mb_branch_initialize.set_sensitive(False)
-        self.mb_branch_get.set_sensitive(True)
-        self.mb_branch_checkout.set_sensitive(True)
-        self.mb_branch_pull.set_sensitive(False)
-        self.mb_branch_push.set_sensitive(False)
-        self.mb_branch_update.set_sensitive(False)
-        self.mb_branch_revert.set_sensitive(False)
-        self.mb_branch_merge.set_sensitive(False)
-        self.mb_branch_commit.set_sensitive(False)
-        self.mb_branch_tags.set_sensitive(True)
-        self.mb_branch_status.set_sensitive(False)
-        self.mb_branch_missingrevisions.set_sensitive(False)
-        self.mb_branch_conflicts.set_sensitive(False)
-        self.mb_statistics.set_sensitive(True)
-        self.mb_statistics_differences.set_sensitive(False)
-        self.tb_diff.set_sensitive(False)
-        self.tb_log.set_sensitive(True)
-        self.tb_commit.set_sensitive(False)
-        self.tb_pull.set_sensitive(False)
-        self.tb_push.set_sensitive(False)
-        self.tb_update.set_sensitive(False)
-    
-    def set_location_status(self, stock_id, allowPopup=False):
-        self.location_status.destroy()
-        if allowPopup:
-            self.location_status = gtk.Button()
-            self.location_status.set_relief(gtk.RELIEF_NONE)
-            image = gtk.image_new_from_stock(stock_id, gtk.ICON_SIZE_BUTTON)
-            image.show()
-            self.location_status.add(image)
-        else:
-            self.location_status = gtk.image_new_from_stock(stock_id, gtk.ICON_SIZE_BUTTON)
-        self.locationbar.pack_start(self.location_status, False, False, 0)
-        if sys.platform == 'win32':
-            self.locationbar.reorder_child(self.location_status, 2)
-        else:
-            self.locationbar.reorder_child(self.location_status, 1)
-        self.location_status.show()

=== modified file 'setup.py'
--- setup.py	2010-03-01 08:48:46 +0000
+++ setup.py	2010-05-29 23:49:22 +0000
@@ -5,9 +5,6 @@
 from distutils.core import setup, Command
 from distutils.command.install_data import install_data
 from distutils.command.build import build
-from distutils.dep_util import newer
-from distutils.log import info
-import glob
 import os
 import sys
 
@@ -83,7 +80,6 @@
 
     def run(self):
         import subprocess
-        self.data_files.extend(self._compile_po_files())
         self.data_files.extend(self._nautilus_plugin())
         install_data.run(self)
 
@@ -93,36 +89,6 @@
         except OSError:
             pass
 
-    def _compile_po_files(self):
-        data_files = []
-
-        # Don't install language files on Win32
-        if sys.platform == 'win32':
-            return data_files
-
-        PO_DIR = 'po'
-        for po in glob.glob(os.path.join(PO_DIR,'*.po')):
-            lang = os.path.basename(po[:-3])
-            # It's necessary to compile in this directory (not in po_dir)
-            # because install_data can't rename file
-            mo = os.path.join('build', 'mo', lang, 'olive-gtk.mo')
-
-            directory = os.path.dirname(mo)
-            if not os.path.exists(directory):
-                info('creating %s' % directory)
-                os.makedirs(directory)
-            if newer(po, mo):
-                # True if mo doesn't exist
-                cmd = 'msgfmt -o %s %s' % (mo, po)
-                info('compiling %s -> %s' % (po, mo))
-                if os.system(cmd) != 0:
-                    raise SystemExit('Error while running msgfmt')
-                dest = os.path.dirname(
-                    os.path.join('share', 'locale', lang,
-                                 'LC_MESSAGES', 'olive-gtk.mo'))
-                data_files.append((dest, [mo]))
-        return data_files
-
     def _nautilus_plugin(self):
         files = []
         if sys.platform[:5] == 'linux':
@@ -144,13 +110,12 @@
         maintainer_email = "[e-mail]",
         description = "GTK+ Frontends for various Bazaar commands",
         license = "GNU GPL v2 or later",
-        scripts = ['olive-gtk', 'bzr-handle-patch', 'bzr-notify'],
+        scripts = ['bzr-handle-patch', 'bzr-notify'],
         url = "http://bazaar-vcs.org/BzrGtk",
         package_dir = {
             "bzrlib.plugins.gtk": ".",
             "bzrlib.plugins.gtk.viz": "viz",
             "bzrlib.plugins.gtk.annotate": "annotate",
-            "bzrlib.plugins.gtk.olive": "olive",
             "bzrlib.plugins.gtk.tests": "tests",
             "bzrlib.plugins.gtk.branchview": "branchview",
             "bzrlib.plugins.gtk.preferences": "preferences",
@@ -159,14 +124,11 @@
             "bzrlib.plugins.gtk",
             "bzrlib.plugins.gtk.viz",
             "bzrlib.plugins.gtk.annotate",
-            "bzrlib.plugins.gtk.olive",
             "bzrlib.plugins.gtk.tests",
             "bzrlib.plugins.gtk.branchview",
             "bzrlib.plugins.gtk.preferences",
         ],
-        data_files=[('share/olive', ['cmenu.ui',
-                                     ]),
-                    ('share/bzr-gtk', ['credits.pickle']),
+        data_files=[ ('share/bzr-gtk', ['credits.pickle']),
                     ('share/bzr-gtk/icons', ['icons/commit.png',
                                              'icons/commit16.png',
                                              'icons/diff.png',
@@ -178,8 +140,6 @@
                                              'icons/push.png',
                                              'icons/push16.png',
                                              'icons/refresh.png',
-                                             'icons/olive-gtk.png',
-                                             'icons/oliveicon2.png',
                                              'icons/sign-bad.png',
                                              'icons/sign-ok.png',
                                              'icons/sign.png',
@@ -187,13 +147,11 @@
                                              'icons/tag-16.png',
                                              'icons/bug.png',
                                              'icons/bzr-icon-64.png']),
-                    ('share/applications', ['olive-gtk.desktop',
-                                            'bazaar-properties.desktop',
+                    ('share/applications', ['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/pixmaps', ['icons/bzr-icon-64.png']),
                     ('share/icons/hicolor/scalable/emblems',
                      ['icons/emblem-bzr-added.svg',
                       'icons/emblem-bzr-conflict.svg',

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2009-05-07 09:54:50 +0000
+++ tests/__init__.py	2010-05-29 23:49:22 +0000
@@ -23,7 +23,6 @@
         'test_diff',
         'test_history',
         'test_linegraph',
-        'test_preferences',
         'test_revisionview',
         ]
 

=== removed file 'tests/test_preferences.py'
--- tests/test_preferences.py	2007-03-15 16:23:15 +0000
+++ tests/test_preferences.py	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-# Copyright (C) 2007 Jelmer Vernooij <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-from bzrlib.tests import TestCase, TestCaseInTempDir
-from bzrlib.plugins.gtk.olive import Preferences
-
-import os
-
-# FIXME: need to make sure that this also tests writing/reading.
-class TestPreferences(TestCaseInTempDir):
-    def setUp(self):
-        super(TestPreferences, self).setUp()
-        self.prefs = Preferences(os.path.join(self.test_dir, 'prefs'))
-
-    def test_create(self):
-        Preferences()
-
-    def test_add_bookmark(self):
-        """make sure a bookmark can be added. This function is only supposed 
-        to store the location, not try to access it. """
-        self.assertTrue(self.prefs.add_bookmark("file://foobar"))
-        self.assertTrue("file://foobar" in self.prefs.get_bookmarks())
-
-    def test_add_bookmark_twice(self):
-        """Adding an already present bookmark will result in False being 
-        returned."""
-        self.assertTrue(self.prefs.add_bookmark("file://foobar"))
-        self.assertFalse(self.prefs.add_bookmark("file://foobar"))
-
-    def test_set_bookmark_title(self):
-        """Test setting a title for an existing bookmark."""
-        self.prefs.add_bookmark("file://foobar")
-        self.prefs.set_bookmark_title("file://foobar", "My Bookmark")
-
-    def test_remove_bookmark(self):
-        """Test removing a bookmark."""
-        self.prefs.add_bookmark("http://example.com/branch")
-        self.prefs.remove_bookmark("http://example.com/branch")
-        self.assertFalse("http://example.com/branch" in self.prefs.get_bookmarks())
-
-    def test_get_bookmarks_empty(self):
-        """Test whether a new Preferences() object has an empty bookmarks 
-        list."""
-        self.assertEqual([], self.prefs.get_bookmarks())
-
-    def test_get_bookmark_title_set(self):
-        """Test getting a title for an existing bookmark."""
-        self.prefs.add_bookmark("file://foobar")
-        self.prefs.set_bookmark_title("file://foobar", "My Bookmark")
-        self.assertEqual("My Bookmark", self.prefs.get_bookmark_title("file://foobar"))
-
-    def test_get_bookmark_title_implicit(self):
-        """Test getting a bookmark title for a bookmark that doesn't
-        have a title set."""
-        self.prefs.add_bookmark("file://bla")
-        self.assertEqual("file://bla", self.prefs.get_bookmark_title("file://bla"))
-
-    def test_set_preference(self):
-        """Check whether setting preferences works."""
-        self.prefs.set_preference("foo", True)
-        self.prefs.set_preference("foo", False)
-        self.prefs.set_preference("foo", "bloe")
-
-    def test_get_preference_bool(self):
-        """Check whether a preference can be retrieved."""
-        self.prefs.set_preference("foo", True)
-        self.assertEqual(True, self.prefs.get_preference("foo", "bool"))
-
-    def test_get_preference_str(self):
-        """Check whether a string preference can be retrieved."""
-        self.prefs.set_preference("bla", "bloe")
-        self.assertEqual("bloe", self.prefs.get_preference("bla"))
-
-    def test_get_preference_nonexistant(self):
-        """Check whether get_preference returns None for nonexisting 
-        options."""
-        self.assertEqual(None, self.prefs.get_preference("foo"))
-