/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: Jelmer Vernooij
  • Date: 2006-10-08 20:51:52 UTC
  • Revision ID: jelmer@samba.org-20061008205152-1c5306ee8eb43b95
Use Olive's clone dialog in nautilus-bzr; remove the old Clone dialog 
from BzrGtk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
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
 
210
208
            if str(e) == "could not open display":
211
209
                raise NoDisplayError
212
210
 
213
 
        from commit import GCommitDialog
 
211
        from olive.commit import CommitDialog
214
212
        from bzrlib.commit import Commit
215
213
        from bzrlib.errors import (BzrCommandError, PointlessCommit, ConflictsInTree, 
216
214
           StrictCommitFailed)
217
215
 
218
216
        (wt, path) = WorkingTree.open_containing(filename)
219
 
        branch = wt.branch
220
 
 
221
 
        file_id = wt.path2id(path)
222
 
 
223
 
        if file_id is None:
224
 
            raise NotVersionedError(filename)
225
 
 
226
 
        dialog = GCommitDialog(wt)
227
 
        dialog.set_title(path + " - Commit")
228
 
        if dialog.run() != gtk.RESPONSE_CANCEL:
229
 
            Commit().commit(working_tree=wt,message=dialog.message,
230
 
                specific_files=dialog.specific_files)
 
217
 
 
218
        dialog = CommitDialog(wt, path)
 
219
        dialog.display()
 
220
        gtk.main()
231
221
 
232
222
register_command(cmd_gcommit)
233
223