Rev 149: Move diff to top-level directory as well. in file:///home/jelmer/bzr-gtk/trunk/
Jelmer Vernooij
jelmer at samba.org
Sat Feb 3 13:01:26 GMT 2007
At file:///home/jelmer/bzr-gtk/trunk/
------------------------------------------------------------
revno: 149
revision-id: jelmer at samba.org-20070203130112-m1stbo29f1ahthzs
parent: jelmer at samba.org-20070203124133-z02b51snxvn13zhx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-02-03 14:01:12 +0100
message:
Move diff to top-level directory as well.
renamed:
viz/diffwin.py => diff.py diffwin.py-20051017070234-cb5c6dc4960142f5
modified:
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
annotate/gannotate.py xannotate.py-20051024072750-fe35acd6bb909bd3
nautilus-bzr.py __init__.py-20060412205316-7a81eb8ae29ffc79
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
viz/bzrkapp.py bzrkapp.py-20051017001327-f638ae3a8eab3a9f
=== renamed file 'viz/diffwin.py' => 'diff.py'
=== modified file '__init__.py'
--- a/__init__.py 2007-02-03 11:52:13 +0000
+++ b/__init__.py 2007-02-03 13:01:12 +0000
@@ -176,7 +176,7 @@
tree1 = wt
tree2 = tree1.basis_tree()
- from viz.diffwin import DiffWindow
+ from viz.diff import DiffWindow
import gtk
window = DiffWindow()
window.connect("destroy", lambda w: gtk.main_quit())
=== modified file 'annotate/gannotate.py'
--- a/annotate/gannotate.py 2007-02-03 12:41:33 +0000
+++ b/annotate/gannotate.py 2007-02-03 13:01:12 +0000
@@ -243,7 +243,7 @@
tree2 = repository.revision_tree(revision.parent_ids[0])
else:
tree2 = repository.revision_tree(NULL_REVISION)
- from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
+ from bzrlib.plugins.gtk.viz.diff import DiffWindow
window = DiffWindow()
window.set_diff("Diff for row %d" % (row+1), tree1, tree2)
window.set_file(tree1.id2path(self.file_id))
=== modified file 'nautilus-bzr.py'
--- a/nautilus-bzr.py 2007-02-03 10:25:09 +0000
+++ b/nautilus-bzr.py 2007-02-03 13:01:12 +0000
@@ -70,7 +70,7 @@
except NotBranchError:
return
- from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
+ from bzrlib.plugins.gtk.viz.diff import DiffWindow
window = DiffWindow()
window.set_diff(tree.branch.nick, tree, tree.branch.basis_tree())
window.show()
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py 2007-02-03 12:35:55 +0000
+++ b/olive/__init__.py 2007-02-03 13:01:12 +0000
@@ -39,23 +39,12 @@
from errors import show_bzr_error
from guifiles import GLADEFILENAME
-# import this classes only once
-try:
- from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
- from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
- 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.push import PushDialog
-except ImportError:
- # olive+bzr-gtk not installed. try to import from sources
- path = os.path.dirname(os.path.dirname(__file__))
- if path not in sys.path:
- sys.path.append(path)
- from viz.diffwin import DiffWindow
- from viz.branchwin import BranchWindow
- from annotate.gannotate import GAnnotateWindow
- from annotate.config import GAnnotateConfig
+from bzrlib.plugins.gtk.viz.diff import DiffWindow
+from bzrlib.plugins.gtk.viz.branchwin import BranchWindow
+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.push import PushDialog
# History delimiter used in config files
delimiter = ' '
=== modified file 'viz/bzrkapp.py'
--- a/viz/bzrkapp.py 2006-09-06 09:27:12 +0000
+++ b/viz/bzrkapp.py 2007-02-03 13:01:12 +0000
@@ -15,7 +15,7 @@
import gtk
from branchwin import BranchWindow
-from diffwin import DiffWindow
+from bzrlib.plugins.gtk.diff import DiffWindow
class BzrkApp(object):
More information about the bazaar-commits
mailing list