[Pkg-bazaar-commits] ./bzr-gtk/unstable r118: Merge from trunk.
Szilveszter Farkas (Phanatic)
Szilveszter.Farkas at gmail.com
Fri Apr 10 07:49:42 UTC 2009
------------------------------------------------------------
revno: 118
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Fri 2006-12-15 17:56:54 +0100
message:
Merge from trunk.
removed:
NEWS
modified:
__init__.py
olive-gtk.desktop
olive/commit.py
olive/menu.py
setup.py
------------------------------------------------------------
revno: 66.2.8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2006-12-13 13:28:50 +0100
message:
Merge fixes from Szilveszter.
modified:
cmenu.ui
olive.glade
olive/__init__.py
olive/commit.py
olive/menu.py
olive/rename.py
------------------------------------------------------------
revno: 66.2.9
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2006-12-13 13:29:59 +0100
message:
Fix desktop file. Patch from Toshio Kuratomi. Fixes #75278.
modified:
olive-gtk.desktop
------------------------------------------------------------
revno: 66.2.10
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2006-12-13 14:06:49 +0100
message:
Merge some fixes from Alexander Belchenko
modified:
__init__.py
olive/commit.py
olive/menu.py
------------------------------------------------------------
revno: 93.1.15
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr-gtk.win32.bialix
timestamp: Thu 2006-10-26 16:49:12 +0300
message:
Added auto-detection of file encoding for gannotate.
- Try to get latest revision of file to annotate;
- Check if file starts with UTF-8 BOM marker;
- If not use bzrlib.user_encoding for decoding file content.
modified:
annotate/gannotate.py
------------------------------------------------------------
revno: 93.1.16
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr-gtk.win32.bialix
timestamp: Thu 2006-10-26 17:41:43 +0300
message:
Partial fix for problem with encodings in diff window
modified:
__init__.py
viz/diffwin.py
------------------------------------------------------------
revno: 93.1.17
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr-gtk.win32.bialix
timestamp: Fri 2006-10-27 12:21:37 +0300
message:
gcommit reworked again.
- if there is no working tree or there is no branch
we need catch bzrlib errors;
- added new error dialog for case when there is
no working tree.
modified:
__init__.py
olive/__init__.py
olive/commit.py
------------------------------------------------------------
revno: 93.1.18
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr-gtk.win32.bialix
timestamp: Wed 2006-11-15 14:59:29 +0200
message:
Fix for commit command in olive context menu
modified:
olive/menu.py
------------------------------------------------------------
revno: 93.1.19
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: bzr-gtk.win32.bialix
timestamp: Wed 2006-11-15 15:33:35 +0200
message:
If there is no pending merge on commit then don't show empty pending merge part in commit dialog.
(It's just waste screen space)
modified:
olive/commit.py
------------------------------------------------------------
revno: 66.2.11
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2006-12-13 14:07:15 +0100
message:
Remove obsolete file.
removed:
NEWS
------------------------------------------------------------
revno: 66.2.12
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2006-12-13 14:15:03 +0100
message:
Release 0.13.0.
modified:
__init__.py
setup.py
------------------------------------------------------------
revno: 66.2.13
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Wed 2006-12-13 14:20:25 +0100
message:
Install olive.
modified:
setup.py
-------------- next part --------------
=== removed file 'NEWS'
--- a/NEWS 2006-09-30 10:21:43 +0000
+++ b/NEWS 1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-Olive NEWS
-==========
-
-Olive 0.11.0 (2006-09-27)
-
- - Got rid of the backend code. (Jelmer Vernooij)
- - Some cleanups.
- - Directory listing much faster due to native bzrlib usage.
- - bzrk used from bzr-gtk.
-
-Olive 0.10.1 (2006-09-17)
-
- - Fixed bug #53963: Close button in About box.
- - Drive selection is now available under Win32 platforms. That means new
- dependency (pyWin32)
- - If the TreeView in the Status window would be empty, display a "No changes."
- message.
- - Fixed setup.py install failure on Win32.
-
-Olive 0.10.0 (2006-09-04)
-
- - Version number adjusted to Bazaar's plugin versioning policy.
- - New 'bzr missing' functionality (Branch/Missing revisions menu item)
- - po files get built and installed properly (thanks to St?phane Raimbault)
- - Fixed several minor bugs.
-
-Olive 0.1 (2006-08-22)
-
- - The first public release.
=== modified file '__init__.py'
--- a/__init__.py 2006-11-21 14:19:41 +0000
+++ b/__init__.py 2006-12-13 13:15:03 +0000
@@ -22,7 +22,7 @@
from bzrlib.workingtree import WorkingTree
from bzrlib.bzrdir import BzrDir
-__version__ = '0.12.0'
+__version__ = '0.13.0'
class cmd_gbranch(Command):
"""GTK+ branching.
@@ -77,7 +77,7 @@
window.connect("destroy", lambda w: gtk.main_quit())
window.set_diff("Working Tree", tree1, tree2)
if filename is not None:
- tree_filename = tree1.relpath(filename)
+ tree_filename = wt.relpath(filename)
try:
window.set_file(tree_filename)
except NoSuchFile:
=== modified file 'olive-gtk.desktop'
--- a/olive-gtk.desktop 2006-08-15 17:37:54 +0000
+++ b/olive-gtk.desktop 2006-12-13 12:29:59 +0000
@@ -1,4 +1,5 @@
[Desktop Entry]
+Encoding=UTF-8
Type=Application
Version=1.0
Name=Olive
@@ -6,4 +7,4 @@
Comment=Graphical User Interface for the Bazaar Version Control System
Icon=olive-gtk.png
Exec=/usr/bin/olive-gtk
-Categories=Application;Development
+Categories=Application;Development;
=== modified file 'olive/commit.py'
--- a/olive/commit.py 2006-12-10 19:30:04 +0000
+++ b/olive/commit.py 2006-12-13 13:06:49 +0000
@@ -87,12 +87,12 @@
error_dialog(_('Directory does not have a working tree'),
_('Operation aborted.'))
self.close()
- dialog_shown = False
+ return False
if self.notbranch:
error_dialog(_('Directory is not a branch'),
_('You can perform this action only in a branch.'))
self.close()
- dialog_shown = False
+ return False
else:
if self.wt.branch.get_bound_location() is not None:
# we have a checkout, so the local commit checkbox must appear
@@ -108,11 +108,7 @@
self.textview.modify_font(pango.FontDescription("Monospace"))
self.window.show()
- dialog_shown = True
- if dialog_shown:
- # Gives the focus to the commit message area
- self.textview.grab_focus()
- return dialog_shown
+ return True
def _create_file_view(self):
self.file_store = gtk.ListStore(gobject.TYPE_BOOLEAN, # [0] checkbox
@@ -155,6 +151,15 @@
self.file_store.append([ True, path+marker, _('modified'), path ])
def _create_pending_merges(self):
+ if not self.pending:
+ # hide unused pending merge part
+ scrolled_window = self.glade.get_widget('scrolledwindow_commit_pending')
+ parent = scrolled_window.get_parent()
+ parent.remove(scrolled_window)
+ parent = self.pending_label.get_parent()
+ parent.remove(self.pending_label)
+ return
+
liststore = gtk.ListStore(gobject.TYPE_STRING,
gobject.TYPE_STRING,
gobject.TYPE_STRING)
@@ -167,9 +172,6 @@
self.pending_view.append_column(gtk.TreeViewColumn(_('Summary'),
gtk.CellRendererText(), text=2))
- if not self.pending:
- return
-
for item in self.pending:
liststore.append([ item['date'],
item['committer'],
=== modified file 'olive/menu.py'
--- a/olive/menu.py 2006-12-10 20:16:18 +0000
+++ b/olive/menu.py 2006-12-13 13:06:49 +0000
@@ -205,8 +205,13 @@
def commit(self, action):
""" Right context menu -> Commit """
from commit import CommitDialog
- wt, path = WorkingTree.open_containing(self.path)
- commit = CommitDialog(wt, path)
+ branch = None
+ try:
+ wt, path = WorkingTree.open_containing(self.path)
+ branch = wt.branch
+ except NotBranchError, e:
+ path = e.path
+ commit = CommitDialog(wt, path, not branch)
commit.display()
def diff(self, action):
=== modified file 'setup.py'
--- a/setup.py 2006-11-02 22:51:33 +0000
+++ b/setup.py 2006-12-13 13:20:25 +0000
@@ -49,7 +49,7 @@
setup(
name = "bzr-gtk",
- version = "0.12.0",
+ version = "0.13.0",
maintainer = "Jelmer Vernooij",
maintainer_email = "jelmer at samba.org",
description = "GTK+ Frontends for various Bazaar commands",
@@ -58,13 +58,15 @@
package_dir = {
"bzrlib.plugins.gtk": ".",
"bzrlib.plugins.gtk.viz": "viz",
- "bzrlib.plugins.gtk.annotate": "annotate"
+ "bzrlib.plugins.gtk.annotate": "annotate",
+ "bzrlib.plugins.gtk.olive": "olive"
},
packages = [
"olive",
"bzrlib.plugins.gtk",
"bzrlib.plugins.gtk.viz",
- "bzrlib.plugins.gtk.annotate"
+ "bzrlib.plugins.gtk.annotate",
+ "bzrlib.plugins.gtk.olive"
],
data_files=[('share/olive', ['olive.glade',
'oliveicon2.png',
More information about the Pkg-bazaar-commits
mailing list