/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-11-02 23:01:58 UTC
  • mto: (66.2.3 bzr-gtk)
  • mto: This revision was merged to the branch mainline in revision 108.
  • Revision ID: jelmer@samba.org-20061102230158-a3db0c4fdbd00640
Cherrypick Alexanders' fix for #68127.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
199
199
    takes_options = []
200
200
 
201
201
    def run(self, filename=None):
 
202
        import os
202
203
        import pygtk
203
204
        pygtk.require("2.0")
204
205
 
210
211
 
211
212
        from olive.commit import CommitDialog
212
213
        from bzrlib.commit import Commit
213
 
        from bzrlib.errors import (BzrCommandError, PointlessCommit, ConflictsInTree, 
214
 
           StrictCommitFailed)
215
 
 
216
 
        (wt, path) = WorkingTree.open_containing(filename)
217
 
 
218
 
        dialog = CommitDialog(wt, path, standalone=True)
219
 
        dialog.display()
220
 
        gtk.main()
 
214
        from bzrlib.errors import (BzrCommandError,
 
215
                                   NotBranchError,
 
216
                                   NoWorkingTree,
 
217
                                   PointlessCommit,
 
218
                                   ConflictsInTree,
 
219
                                   StrictCommitFailed)
 
220
 
 
221
        wt = None
 
222
        branch = None
 
223
        try:
 
224
            (wt, path) = WorkingTree.open_containing(filename)
 
225
            branch = wt.branch
 
226
        except NotBranchError, e:
 
227
            path = e.path
 
228
        except NoWorkingTree, e:
 
229
            path = e.base
 
230
            try:
 
231
                (branch, path) = Branch.open_containing(path)
 
232
            except NotBranchError, e:
 
233
                path = e.path
 
234
 
 
235
        dialog = CommitDialog(wt, path, not branch)
 
236
        if dialog.display():
 
237
            dialog.window.connect("destroy", lambda w: gtk.main_quit())
 
238
            gtk.main()
221
239
 
222
240
register_command(cmd_gcommit)
223
241