1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
|
# -*- coding: utf-8 -*-
#
# QBzr - Qt frontend to Bazaar commands
# Copyright (C) 2006 Lukáš Lalinský <lalinsky@gmail.com>
# Copyright (C) 2008, 2009 Alexander Belchenko
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import os
import sys
from bzrlib import errors, ui
from bzrlib.option import Option
from bzrlib.commands import Command
import bzrlib.builtins
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), '''
import signal, shlex, thread
from PyQt4 import QtGui, QtCore
from bzrlib import (
builtins,
commands,
osutils,
)
from bzrlib.branch import Branch
from bzrlib.bzrdir import BzrDir
from bzrlib.workingtree import WorkingTree
from bzrlib.plugins.qbzr.lib import i18n
from bzrlib.plugins.qbzr.lib.add import AddWindow
from bzrlib.plugins.qbzr.lib.annotate import AnnotateWindow
from bzrlib.plugins.qbzr.lib.browse import BrowseWindow
from bzrlib.plugins.qbzr.lib.cat import (
QBzrCatWindow,
QBzrViewWindow,
cat_to_native_app,
)
from bzrlib.plugins.qbzr.lib.commit import CommitWindow
from bzrlib.plugins.qbzr.lib.config import QBzrConfigWindow
from bzrlib.plugins.qbzr.lib.diffwindow import DiffWindow
from bzrlib.plugins.qbzr.lib.getupdates import UpdateBranchWindow, UpdateCheckoutWindow
from bzrlib.plugins.qbzr.lib.help import show_help
from bzrlib.plugins.qbzr.lib.log import LogWindow
from bzrlib.plugins.qbzr.lib.info import QBzrInfoWindow
from bzrlib.plugins.qbzr.lib.init import QBzrInitWindow
from bzrlib.plugins.qbzr.lib.main import QBzrMainWindow
from bzrlib.plugins.qbzr.lib.pull import (
QBzrPullWindow,
QBzrPushWindow,
QBzrBranchWindow,
QBzrMergeWindow,
)
from bzrlib.plugins.qbzr.lib.revert import RevertWindow
from bzrlib.plugins.qbzr.lib.subprocess import SubprocessUIFactory
from bzrlib.plugins.qbzr.lib.tag import TagWindow
from bzrlib.plugins.qbzr.lib.util import (
FilterOptions,
is_valid_encoding,
open_tree,
)
from bzrlib.plugins.qbzr.lib.uifactory import QUIFactory
from bzrlib.plugins.qbzr.lib.send import SendWindow
''')
from bzrlib.plugins.qbzr.lib import MS_WINDOWS
from bzrlib.plugins.qbzr.lib.diff_arg import DiffArgProvider
class InvalidEncodingOption(errors.BzrError):
_fmt = ('Invalid encoding: %(encoding)s\n'
'Valid encodings are:\n%(valid)s')
def __init__(self, encoding):
errors.BzrError.__init__(self)
self.encoding = encoding
import encodings
self.valid = ', '.join(sorted(list(
set(encodings.aliases.aliases.values())))).replace('_','-')
def check_encoding(encoding):
if is_valid_encoding(encoding):
return encoding
raise InvalidEncodingOption(encoding)
class PyQt4NotInstalled(errors.BzrError):
_fmt = ('QBzr require at least PyQt 4.4 and '
'Qt 4.4 to run. Please check your install')
def report_missing_pyqt(unbound):
"""Decorator for q-commands run method to catch ImportError PyQt4
and show explanation to user instead of scary traceback.
See bugs: #240123, #163728
"""
def run(self, *args, **kwargs):
try:
return unbound(self, *args, **kwargs)
except ImportError, e:
if str(e).endswith('PyQt4'):
raise PyQt4NotInstalled
raise
return run
def install_gettext(unbound):
"""Decorator for q-commands run method to enable gettext translations."""
def run(self, *args, **kwargs):
i18n.install()
try:
return unbound(self, *args, **kwargs)
finally:
i18n.uninstall()
return run
class QBzrCommand(Command):
"""Base class for all q-commands.
NOTES:
1) q-command should define method '_qbzr_run' instead of 'run' (as in
bzrlib).
2) The _qbzr_run method should return 0 for successfull exit
and 1 if operation was cancelled by user.
3) The _qbzr_run method can return None, in this case return code will be
asked from self.main_window instance (if there is one).
self.main_window should be instance of QBzrWindow or QBzrDialog
with attribute "return_code" set to 0 or 1.
"""
@install_gettext
@report_missing_pyqt
def run(self, *args, **kwargs):
ui.ui_factory = QUIFactory()
# Set up global exception handling.
from bzrlib.plugins.qbzr.lib.trace import excepthook
sys.excepthook = excepthook
ret_code = self._qbzr_run(*args, **kwargs)
if ret_code is None:
main_window = getattr(self, "main_window", None)
if main_window is not None:
ret_code = getattr(main_window, "return_code", None)
return ret_code
ui_mode_option = Option("ui-mode", help="Causes dialogs to wait after the operation is complete.")
# A special option so 'revision' can be passed as a simple string, when we do
# *not* wan't bzrlib's feature of parsing the revision string before passing it.
# This is used when we just want a plain string to pass to our dialog for it to
# display in the UI, and we will later pass it to bzr for parsing. If you want
# bzrlib to parse and pass a revisionspec object, just pass the string
# 'revision' as normal.
simple_revision_option = Option("revision",
short_name='r',
type=unicode,
help='See "help revisionspec" for details.')
def bzr_option(cmd_name, opt_name):
"""Helper so we can 'borrow' options from bzr itself without needing to
duplicate the help text etc. Pass the builtin bzr command name and an
option name.
eg:
takes_options = [bzr_option("push", "create-prefix")]
would give a command the exact same '--create-prefix' option as bzr's
push command has, including help text, parsing, etc.
"""
from bzrlib.commands import get_cmd_object
cmd=get_cmd_object(cmd_name, False)
return cmd.options()[opt_name]
class cmd_qannotate(QBzrCommand):
"""Show the origin of each line in a file."""
takes_args = ['filename']
takes_options = ['revision',
Option('encoding', type=check_encoding,
help='Encoding of files content (default: utf-8).'),
ui_mode_option,
Option('no-graph', help="Shows the log with no graph."),
]
aliases = ['qann', 'qblame']
def _load_branch(self, filename, revision):
"""To assist in getting a UI up as soon as possible, the UI calls
back to this function to process the command-line args and convert
them into the branch and tree etc needed by the UI.
"""
wt, branch, relpath = \
BzrDir.open_containing_tree_or_branch(filename)
if wt is not None:
wt.lock_read()
else:
branch.lock_read()
try:
if revision is None:
if wt is not None:
tree = wt
else:
tree = branch.repository.revision_tree(
branch.last_revision())
elif len(revision) != 1:
raise errors.BzrCommandError(
'bzr qannotate --revision takes exactly 1 argument')
else:
tree = branch.repository.revision_tree(
revision_id = revision[0].in_history(branch).rev_id)
file_id = tree.path2id(relpath)
if file_id is None:
raise errors.NotVersionedError(filename)
entry = tree.inventory[file_id]
if entry.kind != 'file':
raise errors.BzrCommandError(
'bzr qannotate only works for files (got %r)' % entry.kind)
#repo = branch.repository
#w = repo.weave_store.get_weave(file_id, repo.get_transaction())
#content = list(w.annotate_iter(entry.revision))
#revision_ids = set(o for o, t in content)
#revision_ids = [o for o in revision_ids if repo.has_revision(o)]
#revisions = branch.repository.get_revisions(revision_ids)
finally:
if wt is not None:
wt.unlock()
else:
branch.unlock()
return branch, tree, wt, relpath, file_id
def _qbzr_run(self, filename=None, revision=None, encoding=None,
ui_mode=False, no_graph=False):
app = QtGui.QApplication(sys.argv)
win = AnnotateWindow(None, None, None, None,
encoding=encoding, ui_mode=ui_mode,
loader=self._load_branch,
loader_args=(filename, revision),
no_graph=no_graph)
win.show()
app.exec_()
class cmd_qadd(QBzrCommand):
"""GUI for adding files or directories."""
takes_args = ['selected*']
takes_options = [ui_mode_option]
def _qbzr_run(self, selected_list=None, ui_mode=False):
tree, selected_list = builtins.tree_files(selected_list)
if selected_list == ['']:
selected_list = []
application = QtGui.QApplication(sys.argv)
self.main_window = AddWindow(tree, selected_list, dialog=False, ui_mode=ui_mode)
self.main_window.show()
application.exec_()
class cmd_qrevert(QBzrCommand):
"""Revert changes files."""
takes_args = ['selected*']
takes_options = [ui_mode_option, bzr_option('revert', 'no-backup')]
def _qbzr_run(self, selected_list=None, ui_mode=False, no_backup=False):
tree, selected_list = builtins.tree_files(selected_list)
if selected_list == ['']:
selected_list = []
application = QtGui.QApplication(sys.argv)
self.main_window = RevertWindow(tree, selected_list, dialog=False,
ui_mode=ui_mode,
backup=not no_backup)
self.main_window.show()
application.exec_()
class cmd_qconflicts(QBzrCommand):
"""Show conflicts."""
takes_args = []
takes_options = []
aliases = ['qresolve']
def _qbzr_run(self):
from bzrlib.plugins.qbzr.lib.conflicts import ConflictsWindow
application = QtGui.QApplication(sys.argv)
self.main_window = ConflictsWindow(u'.')
self.main_window.show()
application.exec_()
class cmd_qbrowse(QBzrCommand):
"""Show inventory or working tree."""
takes_args = ['location?']
takes_options = ['revision']
aliases = ['qbw']
def _qbzr_run(self, revision=None, location=None):
app = QtGui.QApplication(sys.argv)
if revision is None:
win = BrowseWindow(location = location)
else:
win = BrowseWindow(location = location, revision = revision[0])
win.show()
app.exec_()
class cmd_qcommit(QBzrCommand):
"""GUI for committing revisions."""
takes_args = ['selected*']
takes_options = [
bzr_option('commit', 'message'),
bzr_option('commit', 'local'),
ui_mode_option,
]
aliases = ['qci']
def _qbzr_run(self, selected_list=None, message=None, local=False, ui_mode=False):
tree, selected_list = builtins.tree_files(selected_list)
if selected_list == ['']:
selected_list = []
application = QtGui.QApplication(sys.argv)
self.main_window = CommitWindow(tree, selected_list, dialog=False,
message=message, local=local, ui_mode=ui_mode)
self.main_window.show()
application.exec_()
class cmd_qdiff(QBzrCommand, DiffArgProvider):
"""Show differences in working tree in a GUI window."""
takes_args = ['file*']
takes_options = [
'revision',
Option('complete', help='Show complete files.'),
Option('encoding', type=check_encoding,
help='Encoding of files content (default: utf-8).'),
Option('added', short_name='A', help='Show diff for added files.'),
Option('deleted', short_name='K', help='Show diff for deleted files.'),
Option('modified', short_name='M',
help='Show diff for modified files.'),
Option('renamed', short_name='R', help='Show diff for renamed files.'),
bzr_option('diff', 'old'),
bzr_option('diff', 'new'),
]
if 'change' in Option.OPTIONS:
takes_options.append('change')
aliases = ['qdi']
def get_diff_window_args(self, processEvents):
from bzrlib.diff import _get_trees_to_diff
old_tree, new_tree, specific_files, extra_trees = \
_get_trees_to_diff(self.file_list, self.revision,
self.old, self.new)
processEvents()
if self.file_list:
default_location = self.file_list[0]
else:
# If no path is given, the current working tree is used
default_location = u'.'
if self.old is None:
self.old = default_location
wt, old_branch, rp = \
BzrDir.open_containing_tree_or_branch(self.old)
processEvents()
if self.new is None:
self.new = default_location
if self.new != self.old :
wt, new_branch, rp = \
BzrDir.open_containing_tree_or_branch(self.new)
else:
new_branch = old_branch
processEvents()
return old_tree, new_tree, old_branch, new_branch, specific_files
def get_ext_diff_args(self, processEvents):
args = []
if self.revision and len(self.revision) == 1:
args.append("-r %s" % (self.revision[0].user_spec,))
elif self.revision and len(self.revision) == 2:
args.append("-r %s..%s" % (self.revision[0].user_spec,
self.revision[1].user_spec))
if self.new and not self.new==".":
args.append("--new=%s" % self.new)
if self.old and not self.old==".":
args.append("--old=%s" % self.old)
if self.file_list:
args.extend(self.file_list)
return None, args
def _qbzr_run(self, revision=None, file_list=None, complete=False,
encoding=None,
added=None, deleted=None, modified=None, renamed=None,
old=None, new=None, ui_mode=False):
if revision and len(revision) > 2:
raise errors.BzrCommandError('bzr qdiff --revision takes exactly'
' one or two revision specifiers')
# changes filter
filter_options = FilterOptions(added=added, deleted=deleted,
modified=modified, renamed=renamed)
if not (added or deleted or modified or renamed):
# if no filter option used then turn all on
filter_options.all_enable()
self.revision = revision
self.file_list = file_list
self.old = old
self.new = new
app = QtGui.QApplication(sys.argv)
window = DiffWindow(self,
complete=complete,
encoding=encoding,
filter_options=filter_options,
ui_mode=ui_mode)
window.show()
app.exec_()
class cmd_qlog(QBzrCommand):
"""Show log of a repository, branch, file, or directory in a Qt window.
By default show the log of the branch containing the working directory.
If multiple files are speciffied, they must be from the same branch.
:Examples:
Log the current branch::
bzr qlog
Log of files::
bzr qlog foo.c bar.c
Log from different branches::
bzr qlog ~/branch1 ~/branch2
"""
takes_args = ['locations*']
takes_options = [ui_mode_option,
Option('no-graph', help="Shows the log with no graph."),
]
def _qbzr_run(self, locations_list, ui_mode=False, no_graph=False):
app = QtGui.QApplication(sys.argv)
window = LogWindow(locations_list, None, None, ui_mode=ui_mode,
no_graph=no_graph)
window.show()
app.exec_()
class cmd_qconfig(QBzrCommand):
"""Configure Bazaar and QBzr."""
takes_args = []
takes_options = []
aliases = ['qconfigure']
def _qbzr_run(self):
app = QtGui.QApplication(sys.argv)
window = QBzrConfigWindow()
window.show()
app.exec_()
class cmd_qcat(QBzrCommand):
"""View the contents of a file as of a given revision.
If no revision is nominated, the last revision is used.
"""
takes_options = [
'revision',
Option('encoding', type=check_encoding,
help='Encoding of files content (default: utf-8).'),
Option('native',
help='Show file with native application.'),
]
takes_args = ['filename']
def _qbzr_run(self, filename, revision=None, encoding=None, native=None):
if revision is not None and len(revision) != 1:
raise errors.BzrCommandError("bzr qcat --revision takes exactly"
" one revision specifier")
if native:
branch, relpath = Branch.open_containing(filename)
if revision is None:
tree = branch.basis_tree()
else:
revision_id = revision[0].in_branch(branch).rev_id
tree = branch.repository.revision_tree(revision_id)
result = cat_to_native_app(tree, relpath)
return int(not result)
app = QtGui.QApplication(sys.argv)
window = QBzrCatWindow(filename = filename, revision = revision,
encoding = encoding)
window.show()
app.exec_()
class cmd_qpull(QBzrCommand):
"""Turn this branch into a mirror of another branch."""
takes_options = [
'remember', 'overwrite',
simple_revision_option,
bzr_option('pull', 'directory'),
ui_mode_option,
]
takes_args = ['location?']
def _qbzr_run(self, location=None, directory=None,
remember=None, overwrite=None, revision=None, ui_mode=False):
if directory is None:
directory = u'.'
try:
tree_to = WorkingTree.open_containing(directory)[0]
branch_to = tree_to.branch
except errors.NoWorkingTree:
tree_to = None
branch_to = Branch.open_containing(directory)[0]
app = QtGui.QApplication(sys.argv)
self.main_window = QBzrPullWindow(branch_to, tree_to, location,
remember=remember,
overwrite=overwrite,
revision=revision,
ui_mode=ui_mode)
self.main_window.show()
app.exec_()
class cmd_qmerge(QBzrCommand):
"""Perform a three-way merge."""
takes_options = [ui_mode_option,
simple_revision_option,
bzr_option('merge', 'directory'),
bzr_option('merge', 'force'),
bzr_option('merge', 'uncommitted'),
'remember']
takes_args = ['location?']
def _qbzr_run(self, location=None, directory=None, revision=None,
remember=None, force=None, uncommitted=None, ui_mode=False):
if directory is None:
directory = u'.'
try:
tree_to = WorkingTree.open_containing(directory)[0]
branch_to = tree_to.branch
except errors.NoWorkingTree:
tree_to = None
branch_to = Branch.open_containing(directory)[0]
app = QtGui.QApplication(sys.argv)
self.main_window = QBzrMergeWindow(branch_to, tree_to, location,
revision=revision, remember=remember, force=force,
uncommitted=uncommitted, ui_mode=ui_mode)
self.main_window.show()
app.exec_()
class cmd_qpush(QBzrCommand):
"""Update a mirror of this branch."""
takes_options = ['remember', 'overwrite',
bzr_option("push", "create-prefix"),
bzr_option("push", "use-existing-dir"),
bzr_option("push", "directory"),
ui_mode_option]
takes_args = ['location?']
def _qbzr_run(self, location=None, directory=None,
remember=None, overwrite=None,
create_prefix=None, use_existing_dir=None,
ui_mode=False):
if directory is None:
directory = u'.'
try:
tree_to = WorkingTree.open_containing(directory)[0]
branch_to = tree_to.branch
except errors.NoWorkingTree:
tree_to = None
branch_to = Branch.open_containing(directory)[0]
app = QtGui.QApplication(sys.argv)
self.main_window = QBzrPushWindow(branch_to, tree_to,
location=location,
create_prefix=create_prefix,
use_existing_dir=use_existing_dir,
remember=remember,
overwrite=overwrite,
ui_mode=ui_mode)
self.main_window.show()
app.exec_()
class cmd_qbranch(QBzrCommand):
"""Create a new copy of a branch."""
takes_options = [simple_revision_option,
ui_mode_option]
takes_args = ['from_location?', 'to_location?']
def _qbzr_run(self, from_location=None, to_location=None,
revision=None, ui_mode=False):
app = QtGui.QApplication(sys.argv)
self.main_window = QBzrBranchWindow(from_location, to_location,
revision=revision, ui_mode=ui_mode)
self.main_window.show()
app.exec_()
class cmd_qinfo(QBzrCommand):
"""Shows information about the current location."""
takes_options = []
takes_args = []
def _qbzr_run(self):
tree, relpath = WorkingTree.open_containing(u'.')
app = QtGui.QApplication(sys.argv)
window = QBzrInfoWindow(tree)
window.show()
app.exec_()
class cmd_qinit(QBzrCommand):
"""Initializes a new branch or shared repository."""
takes_options = [ui_mode_option]
takes_args = ['location?']
def _qbzr_run(self, location=u'.', ui_mode=False):
app = QtGui.QApplication(sys.argv)
self.main_window = QBzrInitWindow(location, ui_mode=ui_mode)
self.main_window.show()
app.exec_()
class cmd_merge(bzrlib.builtins.cmd_merge, DiffArgProvider):
__doc__ = bzrlib.builtins.cmd_merge.__doc__
takes_options = bzrlib.builtins.cmd_merge.takes_options + [
Option('qpreview', help='Instead of merging, '
'show a diff of the merge in a GUI window.'),
Option('encoding', type=check_encoding,
help='Encoding of files content, used with --qpreview '
'(default: utf-8).'),
]
def run(self, *args, **kw):
self.qpreview = ('qpreview' in kw)
if self.qpreview:
kw['preview'] = kw['qpreview']
del kw['qpreview']
self._encoding = kw.get('encoding')
if self._encoding:
del kw['encoding']
return bzrlib.builtins.cmd_merge.run(self, *args, **kw)
def get_diff_window_args(self, processEvents):
tree_merger = self.merger.make_merger()
self.tt = tree_merger.make_preview_transform()
result_tree = self.tt.get_preview_tree()
return self.merger.this_tree, result_tree, None, None, None
@install_gettext
@report_missing_pyqt
def _do_qpreview(self, merger):
# Set up global execption handeling.
from bzrlib.plugins.qbzr.lib.trace import excepthook
sys.excepthook = excepthook
self.merger = merger
try:
application = QtGui.QApplication(sys.argv)
window = DiffWindow(self, encoding=self._encoding)
window.show()
application.exec_()
finally:
if self.tt:
self.tt.finalize()
def _do_preview(self, merger, *args, **kw):
if self.qpreview:
self._do_qpreview(merger)
else:
bzrlib.builtins.cmd_merge._do_preview(self, merger, *args, **kw)
class cmd_qmain(QBzrCommand):
"""The QBzr main application.
Not finished -- DON'T USE
"""
takes_options = []
takes_args = []
hidden = True
def _qbzr_run(self):
# Remove svn checkout support
try:
from bzrlib.plugins.svn.format import SvnWorkingTreeDirFormat
except ImportError:
pass
else:
from bzrlib.bzrdir import BzrDirFormat, format_registry
BzrDirFormat.unregister_control_format(SvnWorkingTreeDirFormat)
format_registry.remove('subversion-wc')
# Start QBzr
app = QtGui.QApplication(sys.argv)
window = QBzrMainWindow()
window.setDirectory(osutils.realpath(u'.'))
window.show()
app.exec_()
class cmd_qsubprocess(Command):
takes_args = ['cmd']
hidden = True
if MS_WINDOWS:
def __win32_ctrl_c(self):
import win32event
from bzrlib.plugins.qbzr.lib.subprocess import get_event_name
ev = win32event.CreateEvent(None, 0, 0, get_event_name(os.getpid()))
try:
win32event.WaitForSingleObject(ev, win32event.INFINITE)
finally:
ev.Close()
thread.interrupt_main()
def run(self, cmd):
if MS_WINDOWS:
thread.start_new_thread(self.__win32_ctrl_c, ())
else:
signal.signal(signal.SIGINT, sigabrt_handler)
ui.ui_factory = SubprocessUIFactory(sys.stdin, sys.stdout, sys.stderr)
if cmd.startswith('@'):
fname = cmd[1:]
f = open(fname, 'rb')
try:
cmd_utf8 = f.read()
finally:
f.close()
else:
cmd_utf8 = cmd.encode('utf8')
# XXX use bencode to avoid shlex, because it does not like backslashes
# and therefore problematic on Windows.
argv = [p.decode('utf8') for p in shlex.split(cmd_utf8)]
commands.run_bzr(argv)
def sigabrt_handler(signum, frame):
raise KeyboardInterrupt()
class cmd_qgetupdates(QBzrCommand):
"""Fetches external changes into the working tree."""
takes_args = ['location?']
takes_options = [ui_mode_option]
aliases = ['qgetu', 'qgetup']
def _qbzr_run(self, location=u".", ui_mode=False):
branch, relpath = Branch.open_containing(location)
app = QtGui.QApplication(sys.argv)
if branch.get_bound_location():
window = UpdateCheckoutWindow(branch, ui_mode=ui_mode)
else:
window = UpdateBranchWindow(branch, ui_mode=ui_mode)
self.main_window = window
self.main_window.show()
app.exec_()
class cmd_qgetnew(QBzrCommand):
"""Creates a new working tree (either a checkout or full branch)."""
takes_args = ['location?']
takes_options = [ui_mode_option]
aliases = ['qgetn']
def _qbzr_run(self, location=u".", ui_mode=False):
from bzrlib.plugins.qbzr.lib.getnew import GetNewWorkingTreeWindow
app = QtGui.QApplication(sys.argv)
self.main_window = GetNewWorkingTreeWindow(location, ui_mode=ui_mode)
self.main_window.show()
app.exec_()
class cmd_qhelp(QBzrCommand):
"""Shows a help window"""
takes_args = ['topic']
# until we get links and better HTML out of 'topics', this is hidden.
hidden = True
def _qbzr_run(self, topic):
app = QtGui.QApplication(sys.argv)
window = show_help(topic)
app.exec_()
class cmd_qtag(QBzrCommand):
"""Edit tags."""
takes_args = ['tag_name?']
takes_options = [
ui_mode_option,
bzr_option('tag', 'delete'),
bzr_option('tag', 'directory'),
bzr_option('tag', 'force'),
'revision',
]
def _qbzr_run(self, tag_name=None, delete=None, directory=u'.',
force=None, revision=None, ui_mode=False):
branch = Branch.open_containing(directory)[0]
# determine action based on given options
action = TagWindow.action_from_options(force=force, delete=delete)
app = QtGui.QApplication(sys.argv)
self.main_window = TagWindow(branch, tag_name=tag_name, action=action,
revision=revision, ui_mode=ui_mode)
self.main_window.show()
app.exec_()
class cmd_qviewer(QBzrCommand):
"""Simple file viewer."""
aliases = []
takes_args = ['filename']
takes_options = [
Option('encoding', type=check_encoding,
help='Encoding of file content (default: utf-8).'),
]
_see_also = ['qcat']
def _qbzr_run(self, filename, encoding=None):
app = QtGui.QApplication(sys.argv)
window = QBzrViewWindow(filename=filename, encoding=encoding)
window.show()
app.exec_()
class cmd_qversion(QBzrCommand):
"""Show version/system information."""
takes_args = []
takes_options = []
aliases = []
def _qbzr_run(self):
from bzrlib.plugins.qbzr.lib.sysinfo import QBzrSysInfoWindow
application = QtGui.QApplication(sys.argv)
window = QBzrSysInfoWindow()
window.show()
application.exec_()
class cmd_qplugins(QBzrCommand):
"""Show information about installed plugins."""
takes_args = []
takes_options = []
aliases = []
def _qbzr_run(self):
from bzrlib.plugins.qbzr.lib.plugins import QBzrPluginsWindow
app = QtGui.QApplication(sys.argv)
window = QBzrPluginsWindow()
window.show()
app.exec_()
class cmd_qupdate(QBzrCommand):
"""Update working tree with latest changes in the branch."""
aliases = ['qup']
takes_args = ['directory?']
takes_options = [ui_mode_option]
def _qbzr_run(self, directory=None, ui_mode=False):
from bzrlib.plugins.qbzr.lib.update import QBzrUpdateWindow
application = QtGui.QApplication(sys.argv)
tree = open_tree(directory, ui_mode)
if tree is None:
return
self.main_window = QBzrUpdateWindow(tree, ui_mode)
self.main_window.show()
application.exec_()
class cmd_qsend(QBzrCommand):
"""Mail or create a merge-directive for submitting changes."""
takes_args = ['submit_branch?', 'public_branch?']
takes_options = [ui_mode_option]
def _qbzr_run(self, submit_branch=".", public_branch=None, ui_mode=False):
branch = Branch.open_containing(submit_branch)[0]
app = QtGui.QApplication(sys.argv)
window = SendWindow(branch, ui_mode)
window.show()
app.exec_()
class cmd_qswitch(QBzrCommand):
"""Set the branch of a checkout and update."""
takes_args = ['location?']
takes_options = [ui_mode_option]
def _qbzr_run(self, location=None, ui_mode=False):
from bzrlib.plugins.qbzr.lib.switch import QBzrSwitchWindow
application = QtGui.QApplication(sys.argv)
branch = Branch.open_containing(".")[0]
bzrdir = BzrDir.open_containing(".")[0]
self.main_window = QBzrSwitchWindow(branch, bzrdir, location, ui_mode)
self.main_window.show()
application.exec_()
class cmd_qunbind(QBzrCommand):
"""Convert the current checkout into a regular branch."""
takes_options = [ui_mode_option]
def _qbzr_run(self, ui_mode=False):
from bzrlib.plugins.qbzr.lib.unbind import QBzrUnbindDialog
application = QtGui.QApplication(sys.argv)
branch = Branch.open_containing(".")[0]
if branch.get_bound_location() == None:
raise errors.BzrCommandError("This branch is not bound.")
self.main_window = QBzrUnbindDialog(branch, ui_mode)
self.main_window.show()
application.exec_()
class cmd_qexport(QBzrCommand):
"""Export current or past revision to a destination directory or archive.
DEST is the destination file or dir where the branch will be exported.
If BRANCH_OR_SUBDIR is omitted then the branch containing the current working
directory will be used.
"""
takes_args = ['dest?','branch_or_subdir?']
takes_options = [ui_mode_option]
def _qbzr_run(self, dest=None, branch_or_subdir=None, ui_mode=False):
from bzrlib.plugins.qbzr.lib.export import QBzrExportDialog
application = QtGui.QApplication(sys.argv)
if branch_or_subdir == None:
branch = Branch.open_containing(".")[0]
else:
branch = Branch.open_containing(branch_or_subdir)[0]
window = QBzrExportDialog(dest, branch, ui_mode)
window.show()
application.exec_()
class cmd_qbind(QBzrCommand):
"""Convert the current branch into a checkout of the supplied branch.
LOCATION is the branch where you want to bind your current branch.
"""
takes_args = ['location?']
takes_options = [ui_mode_option]
def _qbzr_run(self, location=None, ui_mode=False):
from bzrlib.plugins.qbzr.lib.bind import QBzrBindDialog
application = QtGui.QApplication(sys.argv)
branch = Branch.open_containing(".")[0]
self.main_window = QBzrBindDialog(branch, location, ui_mode)
self.main_window.show()
application.exec_()
|