/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: John Arbash Meinel
  • Date: 2007-10-30 21:15:13 UTC
  • mfrom: (326 trunk)
  • mto: (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071030211513-l8ukdfa81g1y74mi
Merge the latest trunk 326

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
19
19
gannotate         GTK+ annotate. 
20
20
gbranch           GTK+ branching. 
21
21
gcheckout         GTK+ checkout. 
22
 
gcommit           GTK+ commit dialog 
 
22
gcommit           GTK+ commit dialog.
23
23
gconflicts        GTK+ conflicts. 
24
24
gdiff             Show differences in working tree in a GTK+ Window. 
25
25
ginit             Initialise a new branch.
26
26
gmissing          GTK+ missing revisions dialog. 
27
27
gpreferences      GTK+ preferences dialog. 
28
 
gpush             GTK+ push. 
29
 
gstatus           GTK+ status dialog 
 
28
gpush             GTK+ push.
 
29
gsend             GTK+ send merge directive.
 
30
gstatus           GTK+ status dialog.
30
31
gtags             Manage branch tags.
31
32
visualise         Graphically visualise this branch. 
32
33
"""
393
394
        status.run()
394
395
 
395
396
 
 
397
class cmd_gsend(GTKCommand):
 
398
    """GTK+ send merge directive.
 
399
 
 
400
    """
 
401
    def run(self):
 
402
        (br, path) = branch.Branch.open_containing(".")
 
403
        gtk = self.open_display()
 
404
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
 
405
        from StringIO import StringIO
 
406
        dialog = SendMergeDirectiveDialog(br)
 
407
        if dialog.run() == gtk.RESPONSE_OK:
 
408
            outf = StringIO()
 
409
            outf.writelines(dialog.get_merge_directive().to_lines())
 
410
            mail_client = br.get_config().get_mail_client()
 
411
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
 
412
                outf.getvalue())
 
413
 
 
414
            
 
415
 
396
416
 
397
417
class cmd_gconflicts(GTKCommand):
398
 
    """ GTK+ conflicts.
 
418
    """GTK+ conflicts.
399
419
    
400
420
    Select files from the list of conflicts and run an external utility to
401
421
    resolve them.
408
428
        dialog.run()
409
429
 
410
430
 
411
 
 
412
431
class cmd_gpreferences(GTKCommand):
413
432
    """ GTK+ preferences dialog.
414
433
 
420
439
        dialog.run()
421
440
 
422
441
 
423
 
 
424
442
class cmd_gmissing(Command):
425
443
    """ GTK+ missing revisions dialog.
426
444
 
477
495
 
478
496
 
479
497
commands = [
 
498
    cmd_gannotate, 
 
499
    cmd_gbranch,
 
500
    cmd_gcheckout, 
 
501
    cmd_gcommit, 
 
502
    cmd_gconflicts, 
 
503
    cmd_gdiff,
 
504
    cmd_ginit,
480
505
    cmd_gmissing, 
481
506
    cmd_gpreferences, 
482
 
    cmd_gconflicts, 
 
507
    cmd_gpush, 
 
508
    cmd_gsend,
483
509
    cmd_gstatus,
484
 
    cmd_gcommit, 
485
 
    cmd_gannotate, 
486
 
    cmd_visualise, 
487
 
    cmd_gdiff,
488
 
    cmd_gpush, 
489
 
    cmd_gcheckout, 
490
 
    cmd_gbranch,
491
 
    cmd_ginit,
492
 
    cmd_gtags
 
510
    cmd_gtags,
 
511
    cmd_visualise
493
512
    ]
494
513
 
495
514
for cmd in commands: