/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2006-11-21 14:19:41 UTC
  • mfrom: (91.1.12 trunk)
  • mto: (66.6.5 gtk)
  • mto: This revision was merged to the branch mainline in revision 112.
  • Revision ID: abentley@panoramicfeedback.com-20061121141941-m82u7iqexarwirkv
Merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
22
22
from bzrlib.workingtree import WorkingTree
23
23
from bzrlib.bzrdir import BzrDir
24
24
 
25
 
__version__ = '0.10.0'
 
25
__version__ = '0.12.0'
26
26
 
27
27
class cmd_gbranch(Command):
28
28
    """GTK+ branching.
38
38
            if str(e) == "could not open display":
39
39
                raise NoDisplayError
40
40
 
41
 
        from clone import CloneDialog
 
41
        from bzrlib.plugins.gtk.olive.branch import BranchDialog
42
42
 
43
 
        window = CloneDialog()
44
 
        if window.run() == gtk.RESPONSE_OK:
45
 
            bzrdir = BzrDir.open(window.url)
46
 
            bzrdir.sprout(window.dest_path)
 
43
        window = BranchDialog('.')
 
44
        window.display()
47
45
 
48
46
register_command(cmd_gbranch)
49
47
 
73
71
            tree1 = wt
74
72
            tree2 = tree1.basis_tree()
75
73
 
76
 
        from bzrlib.plugins.gtk.viz.diffwin import DiffWindow
 
74
        from viz.diffwin import DiffWindow
77
75
        import gtk
78
76
        window = DiffWindow()
79
77
        window.connect("destroy", lambda w: gtk.main_quit())
208
206
    takes_options = []
209
207
 
210
208
    def run(self, filename=None):
 
209
        import os
211
210
        import pygtk
212
211
        pygtk.require("2.0")
213
212
 
217
216
            if str(e) == "could not open display":
218
217
                raise NoDisplayError
219
218
 
220
 
        from commit import GCommitDialog
 
219
        from olive.commit import CommitDialog
221
220
        from bzrlib.commit import Commit
222
 
        from bzrlib.errors import (BzrCommandError, PointlessCommit, ConflictsInTree, 
223
 
           StrictCommitFailed)
224
 
 
225
 
        (wt, path) = WorkingTree.open_containing(filename)
226
 
        branch = wt.branch
227
 
 
228
 
        file_id = wt.path2id(path)
229
 
 
230
 
        if file_id is None:
231
 
            raise NotVersionedError(filename)
232
 
 
233
 
        dialog = GCommitDialog(wt)
234
 
        dialog.set_title(path + " - Commit")
235
 
        if dialog.run() != gtk.RESPONSE_CANCEL:
236
 
            Commit().commit(working_tree=wt,message=dialog.message,
237
 
                specific_files=dialog.specific_files)
 
221
        from bzrlib.errors import (BzrCommandError,
 
222
                                   NotBranchError,
 
223
                                   NoWorkingTree,
 
224
                                   PointlessCommit,
 
225
                                   ConflictsInTree,
 
226
                                   StrictCommitFailed)
 
227
 
 
228
        wt = None
 
229
        branch = None
 
230
        try:
 
231
            (wt, path) = WorkingTree.open_containing(filename)
 
232
            branch = wt.branch
 
233
        except NotBranchError, e:
 
234
            path = e.path
 
235
        except NoWorkingTree, e:
 
236
            path = e.base
 
237
            try:
 
238
                (branch, path) = Branch.open_containing(path)
 
239
            except NotBranchError, e:
 
240
                path = e.path
 
241
 
 
242
        dialog = CommitDialog(wt, path, not branch)
 
243
        if dialog.display():
 
244
            dialog.window.connect("destroy", lambda w: gtk.main_quit())
 
245
            gtk.main()
238
246
 
239
247
register_command(cmd_gcommit)
240
248