/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-09-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

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 bzrlib.plugins.gtk.olive.branch import BranchDialog
 
41
        from clone import CloneDialog
42
42
 
43
 
        window = BranchDialog('.')
44
 
        window.display()
 
43
        window = CloneDialog()
 
44
        if window.run() == gtk.RESPONSE_OK:
 
45
            bzrdir = BzrDir.open(window.url)
 
46
            bzrdir.sprout(window.dest_path)
45
47
 
46
48
register_command(cmd_gbranch)
47
49
 
208
210
            if str(e) == "could not open display":
209
211
                raise NoDisplayError
210
212
 
211
 
        from olive.commit import CommitDialog
 
213
        from commit import GCommitDialog
212
214
        from bzrlib.commit import Commit
213
215
        from bzrlib.errors import (BzrCommandError, PointlessCommit, ConflictsInTree, 
214
216
           StrictCommitFailed)
215
217
 
216
218
        (wt, path) = WorkingTree.open_containing(filename)
217
 
 
218
 
        dialog = CommitDialog(wt, path)
219
 
        dialog.display()
220
 
        gtk.main()
 
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)
221
231
 
222
232
register_command(cmd_gcommit)
223
233