Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

revert qt-related changes in hgtk, remove hgqt/hgtk.py

the hgtk command should continue to start the GTK dialogs,
use Yuki's new hgqt command for the Qt dialogs

Changeset 7eb6acf1f07a

Parent cb60f632d185

by Adrian Buehlmann

Changes to 2 files · Browse files at 7eb6acf1f07a Showing diff from parent cb60f632d185 Diff from another changeset...

Change 1 of 3 Show Entire File hgtk Stacked
 
25
26
27
28
29
30
31
 
37
38
39
40
 
41
42
43
 
53
54
55
56
 
57
58
59
60
61
62
63
 
64
65
66
67
68
69
70
 
71
72
73
 
25
26
27
 
28
29
30
 
36
37
38
 
39
40
41
42
 
52
53
54
 
55
56
57
58
59
60
61
 
62
63
64
65
66
67
68
 
69
70
71
72
@@ -25,7 +25,6 @@
 import pygtk  pygtk.require('2.0')  import gtk -import PyQt4    from mercurial import demandimport  demandimport.ignore.append('win32com.shell') @@ -37,7 +36,7 @@
 import traceback    try: - import tortoisehg.hgqt.hgtk + import tortoisehg.hgtk.hgtk  except ImportError:   sys.stderr.write("abort: couldn't find hgtk libraries in [%s]\n" %   ';'.join(sys.path)) @@ -53,21 +52,21 @@
  sys.exit(1)    if not capt or 'THGDEBUG' in os.environ or '--profile' in sys.argv: - sys.exit(tortoisehg.hgqt.hgtk.dispatch(sys.argv[1:])) + sys.exit(tortoisehg.hgtk.hgtk.dispatch(sys.argv[1:]))  else:   mystderr = cStringIO.StringIO()   origstderr = sys.stderr   sys.stderr = mystderr   ret = 0   try: - ret = tortoisehg.hgqt.hgtk.dispatch(sys.argv[1:]) + ret = tortoisehg.hgtk.hgtk.dispatch(sys.argv[1:])   sys.stderr = origstderr   mystderr.seek(0)   for l in mystderr.readlines():   if l.startswith('Traceback') or l.startswith('TypeError') or \   l.startswith('NameError'):   from tortoisehg.hgtk.bugreport import run - from tortoisehg.hgqt.hgtk import gtkrun + from tortoisehg.hgtk.hgtk import gtkrun   error = 'Recoverable runtime error (stderr):\n'   error += mystderr.getvalue()   opts = {}
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​hgtk.py Stacked
 
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
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,825 +0,0 @@
-# hgtk.py - front-end script for TortoiseHg dialogs -# -# Copyright 2008 Steve Borho <steve@borho.org> -# Copyright 2008 TK Soh <teekaysoh@gmail.com> -# -# This software may be used and distributed according to the terms of the -# GNU General Public License version 2, incorporated herein by reference. - -shortlicense = ''' -Copyright (C) 2008-2010 Steve Borho <steve@borho.org> and others. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -''' - -import os -import pdb -import sys -import subprocess -import traceback -import gtk -import gobject - -import mercurial.ui as _ui -from mercurial import hg, util, fancyopts, cmdutil, extensions, error - -from tortoisehg.util.i18n import agettext as _ -from tortoisehg.util import hglib, paths, shlib -from tortoisehg.util import version as thgversion -try: - from tortoisehg.util.config import nofork as config_nofork -except ImportError: - config_nofork = None - -from tortoisehg.hgtk import textview - -try: - import win32con - openflags = win32con.CREATE_NO_WINDOW -except ImportError: - openflags = 0 - -nonrepo_commands = '''userconfig shellconfig clone debugcomplete init -about help version thgstatus serve''' - -# Add TortoiseHg signals, hooked to key accelerators in gtklib -for sig in ('copy-clipboard', 'thg-diff', 'thg-parent', 'thg-rename', - 'thg-revision', 'mq-move-up', 'mq-move-down', 'mq-move-top', - 'mq-move-bottom', 'mq-pop', 'mq-push'): - gobject.signal_new(sig, gtk.TreeView, - gobject.SIGNAL_ACTION, gobject.TYPE_NONE, ()) -for sig in ('thg-exit', 'thg-close', 'thg-refresh', 'thg-accept', - 'thg-reflow', 'status-scroll-down', 'status-scroll-up', - 'status-next-file', 'status-previous-file', - 'status-select-all', 'status-next-page', - 'status-previous-page'): - gobject.signal_new(sig, gtk.Window, - gobject.SIGNAL_ACTION, gobject.TYPE_NONE, ()) -for sig in ('thg-close', 'thg-new'): - gobject.signal_new(sig, gtk.Notebook, - gobject.SIGNAL_ACTION, gobject.TYPE_NONE, ()) -for sig in ('thg-undo', 'thg-redo'): - gobject.signal_new(sig, textview.UndoableTextView, - gobject.SIGNAL_ACTION, gobject.TYPE_NONE, ()) - -gtkmainalive = False -def dispatch(args): - "run the command specified in args" - try: - u = _ui.ui() - if '--traceback' in args: - u.setconfig('ui', 'traceback', 'on') - if '--debugger' in args: - pdb.set_trace() - return _runcatch(u, args) - except SystemExit: - pass - except KeyboardInterrupt: - print _('\nCaught keyboard interrupt, aborting.\n') - except: - from tortoisehg.hgtk.bugreport import run - if '--debugger' in args: - pdb.post_mortem(sys.exc_info()[2]) - error = traceback.format_exc() - opts = {} - opts['cmd'] = ' '.join(sys.argv[1:]) - opts['error'] = error - opts['nofork'] = True - if gtkmainalive: - dlg = run(u, **opts) - dlg.display() - dlg.show_all() - else: - gtkrun(run, u, **opts) - -origwdir = os.getcwd() -def portable_fork(ui, opts): - if 'THG_HGTK_SPAWN' in os.environ or ( - not opts.get('fork') and opts.get('nofork')): - return - elif ui.configbool('tortoisehg', 'hgtkfork', None) is not None: - if not ui.configbool('tortoisehg', 'hgtkfork'): - return - elif config_nofork: - return - # Spawn background process and exit - if hasattr(sys, "frozen"): - args = sys.argv - else: - args = [sys.executable] + sys.argv - os.environ['THG_HGTK_SPAWN'] = '1' - cmdline = subprocess.list2cmdline(args) - os.chdir(origwdir) - subprocess.Popen(cmdline, - creationflags=openflags, - shell=True) - sys.exit(0) - -def get_list_from_file(filename): - try: - if filename == '-': - lines = [ x.replace("\n", "") for x in sys.stdin.readlines() ] - else: - fd = open(filename, "r") - lines = [ x.replace("\n", "") for x in fd.readlines() ] - fd.close() - os.unlink(filename) - except IOError, e: - sys.stderr.write(_('can not read file "%s". Ignored.\n') % filename) - return [] - - # Convert absolute file paths to repo/cwd canonical - cwd = os.getcwd() - root = paths.find_root(cwd) - if not root: - return lines - if cwd == root: - cwd_rel = '' - else: - cwd_rel = cwd[len(root+os.sep):] + os.sep - files = [] - for f in lines: - try: - cpath = util.canonpath(root, cwd, f) - # canonpath will abort on .hg/ paths - except util.Abort: - continue - if cpath.startswith(cwd_rel): - cpath = cpath[len(cwd_rel):] - files.append(cpath) - else: - files.append(f) - return files - -def _parse(ui, args): - options = {} - cmdoptions = {} - - try: - args = fancyopts.fancyopts(args, globalopts, options) - except fancyopts.getopt.GetoptError, inst: - raise error.ParseError(None, inst) - - if args: - alias, args = args[0], args[1:] - aliases, i = cmdutil.findcmd(alias, table, ui.config("ui", "strict")) - for a in aliases: - if a.startswith(alias): - alias = a - break - cmd = aliases[0] - c = list(i[1]) - else: - alias = None - cmd = None - c = [] - - # combine global options into local - for o in globalopts: - c.append((o[0], o[1], options[o[1]], o[3])) - - try: - args = fancyopts.fancyopts(args, c, cmdoptions) - except fancyopts.getopt.GetoptError, inst: - raise error.ParseError(cmd, inst) - - # separate global options back out - for o in globalopts: - n = o[1] - options[n] = cmdoptions[n] - del cmdoptions[n] - - listfile = options.get('listfile') - if listfile: - del options['listfile'] - args += get_list_from_file(listfile) - - return (cmd, cmd and i[0] or None, args, options, cmdoptions, alias) - -def _runcatch(ui, args): - try: - try: - return runcommand(ui, args) - finally: - ui.flush() - except error.ParseError, inst: - if inst.args[0]: - ui.status(_("hgtk %s: %s\n") % (inst.args[0], inst.args[1])) - help_(ui, inst.args[0]) - else: - ui.status(_("hgtk: %s\n") % inst.args[1]) - help_(ui, 'shortlist') - except error.AmbiguousCommand, inst: - ui.status(_("hgtk: command '%s' is ambiguous:\n %s\n") % - (inst.args[0], " ".join(inst.args[1]))) - except error.UnknownCommand, inst: - ui.status(_("hgtk: unknown command '%s'\n") % inst.args[0]) - help_(ui, 'shortlist') - except error.RepoError, inst: - ui.status(_("abort: %s!\n") % inst) - - return -1 - -def runcommand(ui, args): - cmd, func, args, options, cmdoptions, alias = _parse(ui, args) - cmdoptions['alias'] = alias - ui.setconfig("ui", "verbose", str(bool(options["verbose"]))) - - if options['help']: - return help_(ui, cmd) - elif not cmd: - return help_(ui, 'shortlist') - - path = options['repository'] - if path: - if path.startswith('bundle:'): - s = path[7:].split('+', 1) - if len(s) == 1: - path, bundle = os.getcwd(), s[0] - else: - path, bundle = s - cmdoptions['bundle'] = os.path.abspath(bundle) - path = ui.expandpath(path) - cmdoptions['repository'] = path - os.chdir(path) - if options['fork']: - cmdoptions['fork'] = True - if options['nofork'] or options['profile']: - cmdoptions['nofork'] = True - path = paths.find_root(os.getcwd()) - if path: - try: - lui = ui.copy() - lui.readconfig(os.path.join(path, ".hg", "hgrc")) - except IOError: - pass - else: - lui = ui - - extensions.loadall(ui) - - if options['quiet']: - ui.quiet = True - - if cmd not in nonrepo_commands.split() and not path: - raise error.RepoError(_("There is no Mercurial repository here" - " (.hg not found)")) - - cmdoptions['mainapp'] = True - d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) - return _runcommand(lui, options, cmd, d) - -def _runcommand(ui, options, cmd, cmdfunc): - def checkargs(): - try: - return cmdfunc() - except error.SignatureError: - raise error.ParseError(cmd, _("invalid arguments")) - - if options['profile']: - format = ui.config('profiling', 'format', default='text') - - if not format in ['text', 'kcachegrind']: - ui.warn(_("unrecognized profiling format '%s'" - " - Ignored\n") % format) - format = 'text' - - output = ui.config('profiling', 'output') - - if output: - path = ui.expandpath(output) - ostream = open(path, 'wb') - else: - ostream = sys.stderr - - try: - from mercurial import lsprof - except ImportError: - raise util.Abort(_( - 'lsprof not available - install from ' - 'http://codespeak.net/svn/user/arigo/hack/misc/lsprof/')) - p = lsprof.Profiler() - p.enable(subcalls=True) - try: - return checkargs() - finally: - p.disable() - - if format == 'kcachegrind': - import lsprofcalltree - calltree = lsprofcalltree.KCacheGrind(p) - calltree.output(ostream) - else: - # format == 'text' - stats = lsprof.Stats(p.getstats()) - stats.sort() - stats.pprint(top=10, file=ostream, climit=5) - - if output: - ostream.close() - else: - return checkargs() - -mainwindow = None -def thgexit(win): - if hasattr(mainwindow, 'should_live'): - if mainwindow.should_live(): return - mainwindow.destroy() - -def gtkrun(dlgfunc, ui, *args, **opts): - portable_fork(ui, opts) - win = dlgfunc(ui, *args, **opts) - if not win: - return - global mainwindow, gtkmainalive - mainwindow = win - if hasattr(win, 'display'): - win.display() - win.show_all() - if 'response' in gobject.signal_list_names(win): - win.connect('response', gtk.main_quit) - win.connect('destroy', gtk.main_quit) - gtk.gdk.threads_init() - gtk.gdk.threads_enter() - gtkmainalive = True - gtk.main() - gtkmainalive = False - gtk.gdk.threads_leave() - -def about(ui, *pats, **opts): - """about TortoiseHg""" - from tortoisehg.hgtk.about import run - gtkrun(run, ui, *pats, **opts) - -def add(ui, *pats, **opts): - """add files""" - from tortoisehg.hgtk.quickop import run - gtkrun(run, ui, *pats, **opts) - -def thgstatus(ui, *pats, **opts): - """update TortoiseHg status cache""" - from tortoisehg.util.thgstatus import run - run(ui, *pats, **opts) - -def clone(ui, *pats, **opts): - """clone tool""" - from tortoisehg.hgtk.clone import run - gtkrun(run, ui, *pats, **opts) - -def commit(ui, *pats, **opts): - """commit tool""" - # move cwd to repo root if repo is merged, so we can show - # all the changed files - repo = hg.repository(ui, path=paths.find_root()) - if len(repo.parents()) > 1: - os.chdir(repo.root) - pats = [] - from tortoisehg.hgtk.commit import run - gtkrun(run, ui, *pats, **opts) - -def shelve(ui, *pats, **opts): - """shelve/unshelve tool""" - from tortoisehg.hgtk.thgshelve import run - gtkrun(run, ui, *pats, **opts) - -def userconfig(ui, *pats, **opts): - """user configuration editor""" - from tortoisehg.hgtk.thgconfig import run - gtkrun(run, ui, *pats, **opts) - -def repoconfig(ui, *pats, **opts): - """repository configuration editor""" - from tortoisehg.hgtk.thgconfig import run - gtkrun(run, ui, *pats, **opts) - -def shellconfig(ui, *pats, **opts): - """Explorer extension configuration editor""" - from PyQt4 import QtGui - from tortoisehg.hgqt.shellconf import ShellConfigWindow - app = QtGui.QApplication(sys.argv) - form = ShellConfigWindow() - form.show() - app.exec_() - -def rename(ui, *pats, **opts): - """rename a single file or directory""" - if not pats or len(pats) > 2: - from tortoisehg.hgtk import gdialog - gdialog.Prompt(_('Rename error'), - _('rename takes one or two path arguments'), None).run() - return - from tortoisehg.hgtk.rename import run - gtkrun(run, ui, *pats, **opts) - -def guess(ui, *pats, **opts): - """guess previous renames or copies""" - from tortoisehg.hgtk.guess import run - gtkrun(run, ui, *pats, **opts) - -def datamine(ui, *pats, **opts): - """repository search and annotate tool""" - from tortoisehg.hgtk.datamine import run - gtkrun(run, ui, *pats, **opts) - -def hgignore(ui, *pats, **opts): - """ignore filter editor""" - from tortoisehg.hgtk.hgignore import run - gtkrun(run, ui, *pats, **opts) - -def hginit(ui, *pats, **opts): - """repository initialization tool""" - from tortoisehg.hgtk.hginit import run - gtkrun(run, ui, *pats, **opts) - -def log(ui, *pats, **opts): - """Repository Explorer (changelog viewer)""" - from tortoisehg.hgtk.history import run - gtkrun(run, ui, *pats, **opts) - -def merge(ui, *pats, **opts): - """merge tool""" - from tortoisehg.hgtk.merge import run - gtkrun(run, ui, *pats, **opts) - -def recovery(ui, *pats, **opts): - """recover, rollback & verify""" - from tortoisehg.hgtk.recovery import run - gtkrun(run, ui, *pats, **opts) - -def remove(ui, *pats, **opts): - """file status viewer in remove mode""" - from tortoisehg.hgtk.quickop import run - gtkrun(run, ui, *pats, **opts) - -def revert(ui, *pats, **opts): - """file status viewer in revert mode""" - from tortoisehg.hgtk.quickop import run - gtkrun(run, ui, *pats, **opts) - -def forget(ui, *pats, **opts): - """file status viewer in forget mode""" - from tortoisehg.hgtk.quickop import run - gtkrun(run, ui, *pats, **opts) - -def serve(ui, *pats, **opts): - """web server""" - from tortoisehg.hgtk.serve import run - if paths.find_root() == None and not opts['webdir_conf']: - raise error.RepoError(_("There is no Mercurial repository here" - " (.hg not found)")) - gtkrun(run, ui, *pats, **opts) - -def status(ui, *pats, **opts): - """file status & diff viewer""" - from tortoisehg.hgtk.status import run - gtkrun(run, ui, *pats, **opts) - -def strip(ui, *pats, **opts): - """strip changesets""" - from tortoisehg.hgtk.thgstrip import run - gtkrun(run, ui, *pats, **opts) - -def synch(ui, *pats, **opts): - """repository synchronization tool""" - from tortoisehg.hgtk.synch import run - cmd = opts['alias'] - if cmd in ('push', 'outgoing', 'email'): - opts['pushmode'] = True - else: - opts['pushmode'] = False - gtkrun(run, ui, *pats, **opts) - -def update(ui, *pats, **opts): - """update/checkout tool""" - from tortoisehg.hgtk.update import run - gtkrun(run, ui, *pats, **opts) - -def browse(ui, *pats, **opts): - """browse repository state""" - from tortoisehg.hgtk.browse import run - gtkrun(run, ui, *pats, **opts) - -def vdiff(ui, *pats, **opts): - """launch configured visual diff tool""" - from tortoisehg.hgtk.visdiff import run - gtkrun(run, ui, *pats, **opts) - -def thgimport(ui, *pats, **opts): - """import patches to repository/patch queue""" - from tortoisehg.hgtk.thgimport import run - gtkrun(run, ui, *pats, **opts) - -def mpatch(ui, rejfile, *pats, **opts): - """Attempt to resolve conflicts in a .rej file""" - def abort(err): - from tortoisehg.hgtk import gdialog - gdialog.Prompt(_('mpatch error'), err, None).run() - return None - if not rejfile or pats or not rejfile.endswith('.rej'): - return abort(_('mpatch expects *.rej file argument\n')) - if not os.path.exists(rejfile): - return abort(_('%s does not exist\n') % rejfile) - # Assume patch was made from repo root, and arrange ourselves thusly - repo = hg.repository(ui, path=paths.find_root()) - rejfile = util.canonpath(repo.root, repo.getcwd(), rejfile) - os.chdir(repo.root) - source = rejfile[:-4] - if not os.path.exists(source): - return abort(_('%s does not exist\n') % source) - from tortoisehg.util import prej - from tortoisehg.hgtk import visdiff - prej.run(ui, rejfile, source, visdiff.filemerge) - -### help management, adapted from mercurial.commands.help_() -def help_(ui, name=None, with_version=False, **opts): - """show help for a command, extension, or list of commands - - With no arguments, print a list of commands and short help. - - Given a command name, print help for that command. - - Given an extension name, print help for that extension, and the - commands it provides.""" - option_lists = [] - - def addglobalopts(aliases): - if ui.verbose: - option_lists.append((_("global options:"), globalopts)) - if name == 'shortlist': - option_lists.append((_('use "hgtk help" for the full list ' - 'of commands'), ())) - else: - if name == 'shortlist': - msg = _('use "hgtk help" for the full list of commands ' - 'or "hgtk -v" for details') - elif aliases: - msg = _('use "hgtk -v help%s" to show aliases and ' - 'global options') % (name and " " + name or "") - else: - msg = _('use "hgtk -v help %s" to show global options') % name - option_lists.append((msg, ())) - - def helpcmd(name): - if with_version: - version(ui) - ui.write('\n') - - try: - aliases, i = cmdutil.findcmd(name, table, False) - except error.AmbiguousCommand, inst: - select = lambda c: c.lstrip('^').startswith(inst.args[0]) - helplist(_('list of commands:\n\n'), select) - return - - # synopsis - ui.write("%s\n" % i[2]) - - # aliases - if not ui.quiet and len(aliases) > 1: - ui.write(_("\naliases: %s\n") % ', '.join(aliases[1:])) - - # description - doc = i[0].__doc__ - if not doc: - doc = _("(No help text available)") - if ui.quiet: - doc = doc.splitlines(0)[0] - ui.write("\n%s\n" % doc.rstrip()) - - if not ui.quiet: - # options - if i[1]: - option_lists.append((_("options:\n"), i[1])) - - addglobalopts(False) - - def helplist(header, select=None): - h = {} - cmds = {} - for c, e in table.iteritems(): - f = c.split("|", 1)[0] - if select and not select(f): - continue - if (not select and name != 'shortlist' and - e[0].__module__ != __name__): - continue - if name == "shortlist" and not f.startswith("^"): - continue - f = f.lstrip("^") - if not ui.debugflag and f.startswith("debug"): - continue - doc = e[0].__doc__ - if doc and 'DEPRECATED' in doc and not ui.verbose: - continue - #doc = gettext(doc) - if not doc: - doc = _("(no help text available)") - h[f] = doc.splitlines()[0].rstrip() - cmds[f] = c.lstrip("^") - - if not h: - ui.status(_('no commands defined\n')) - return - - ui.status(header) - fns = sorted(h) - m = max(map(len, fns)) - for f in fns: - if ui.verbose: - commands = cmds[f].replace("|",", ") - ui.write(" %s:\n %s\n"%(commands, h[f])) - else: - ui.write(' %-*s %s\n' % (m, f, util.wrap(h[f], m + 4))) - - if not ui.quiet: - addglobalopts(True) - - def helptopic(name): - from mercurial import help - for names, header, doc in help.helptable: - if name in names: - break - else: - raise error.UnknownCommand(name) - - # description - if not doc: - doc = _("(No help text available)") - if hasattr(doc, '__call__'): - doc = doc() - - ui.write("%s\n" % header) - ui.write("%s\n" % doc.rstrip()) - - if name and name != 'shortlist': - i = None - for f in (helpcmd, helptopic): - try: - f(name) - i = None - break - except error.UnknownCommand, inst: - i = inst - if i: - raise i - - else: - # program name - if ui.verbose or with_version: - version(ui) - else: - ui.status(_("Hgtk - TortoiseHg's GUI tools for Mercurial SCM (Hg)\n")) - ui.status('\n') - - # list of commands - if name == "shortlist": - header = _('basic commands:\n\n') - else: - header = _('list of commands:\n\n') - - helplist(header) - - # list all option lists - opt_output = [] - for title, options in option_lists: - opt_output.append(("\n%s" % title, None)) - for shortopt, longopt, default, desc in options: - if "DEPRECATED" in desc and not ui.verbose: continue - opt_output.append(("%2s%s" % (shortopt and "-%s" % shortopt, - longopt and " --%s" % longopt), - "%s%s" % (desc, - default - and _(" (default: %s)") % default - or ""))) - - if opt_output: - opts_len = max([len(line[0]) for line in opt_output if line[1]] or [0]) - for first, second in opt_output: - if second: - ui.write(" %-*s %s\n" % (opts_len, first, second)) - else: - ui.write("%s\n" % first) - -def version(ui, **opts): - """output version and copyright information""" - ui.write(_('TortoiseHg Dialogs (version %s), ' - 'Mercurial (version %s)\n') % - (hglib.fromutf(thgversion.version()), hglib.hgversion)) - if not ui.quiet: - ui.write(shortlicense) - -def debugcomplete(ui, cmd='', **opts): - """output list of possible commands""" - if opts.get('options'): - options = [] - otables = [globalopts] - if cmd: - aliases, entry = cmdutil.findcmd(cmd, table, False) - otables.append(entry[1]) - for t in otables: - for o in t: - if o[0]: - options.append('-%s' % o[0]) - options.append('--%s' % o[1]) - ui.write("%s\n" % "\n".join(options)) - return - - cmdlist = cmdutil.findpossible(cmd, table) - if ui.verbose: - cmdlist = [' '.join(c[0]) for c in cmdlist.values()] - ui.write("%s\n" % "\n".join(sorted(cmdlist))) - -def archive(ui, *pats, **opts): - """create an unversioned archive of a repository revision""" - from tortoisehg.hgtk.archive import run - gtkrun(run, ui, *pats, **opts) - -globalopts = [ - ('R', 'repository', '', - _('repository root directory or symbolic path name')), - ('v', 'verbose', None, _('enable additional output')), - ('q', 'quiet', None, _('suppress output')), - ('h', 'help', None, _('display help and exit')), - ('', 'debugger', None, _('start debugger')), - ('', 'profile', None, _('print command execution profile')), - ('', 'nofork', None, _('do not fork GUI process')), - ('', 'fork', None, _('always fork GUI process')), - ('', 'listfile', '', _('read file list from file')), -] - -table = { - "about": (about, [], _('hgtk about')), - "add": (add, [], _('hgtk add [FILE]...')), - "^clone": (clone, [], _('hgtk clone SOURCE [DEST]')), - "^commit|ci": (commit, - [('u', 'user', '', _('record user as committer')), - ('d', 'date', '', _('record datecode as commit date'))], - _('hgtk commit [OPTIONS] [FILE]...')), - "^datamine|annotate|blame|grep": (datamine, [], _('hgtk datamine')), - "^hgignore|ignore|filter": (hgignore, [], _('hgtk hgignore [FILE]')), - "^init": (hginit, [], _('hgtk init [DEST]')), - "^log|history|explorer": (log, - [('l', 'limit', '', _('limit number of changes displayed'))], - _('hgtk log [OPTIONS] [FILE]')), - "merge": (merge, - [('r', 'rev', '', _('revision to merge with'))], - _('hgtk merge')), - "^recovery|rollback|verify": (recovery, [], _('hgtk recovery')), - "^shelve|unshelve": (shelve, [], _('hgtk shelve')), - "synch|pull|push|incoming|outgoing|email": (synch, [], _('hgtk synch')), - "^status|st|diff": (status, - [('r', 'rev', [], _('revisions to compare'))], - _('hgtk status [FILE]...')), - "^userconfig": (userconfig, - [('', 'focus', '', _('field to give initial focus'))], - _('hgtk userconfig')), - "^repoconfig": (repoconfig, - [('', 'focus', '', _('field to give initial focus'))], - _('hgtk repoconfig')), - "^guess": (guess, [], _('hgtk guess')), - "remove|rm": (revert, [], _('hgtk remove [FILE]...')), - "rename|mv": (rename, [], _('hgtk rename SOURCE [DEST]')), - "revert": (revert, [], _('hgtk revert [FILE]...')), - "forget": (forget, [], _('hgtk forget [FILE]...')), - "^serve": - (serve, - [('', 'webdir-conf', '', _('name of the webdir config file'))], - _('hgtk serve [OPTION]...')), - "thgstatus": (thgstatus, - [('', 'delay', None, _('wait until the second ticks over')), - ('n', 'notify', [], _('notify the shell for paths given')), - ('', 'remove', None, _('remove the status cache')), - ('s', 'show', None, _('show the contents of the' - ' status cache (no update)')), - ('', 'all', None, _('udpate all repos in current dir')) ], - _('hgtk thgstatus [OPTION]')), - "^update|checkout|co": (update, - [('r', 'rev', None, _('revision to update'))], - ('hgtk update')), - "^vdiff": (vdiff, - [('c', 'change', '', _('changeset to view in diff tool')), - ('r', 'rev', [], _('revisions to view in diff tool')), - ('b', 'bundle', '', _('bundle file to preview'))], - _('launch visual diff tool')), - "^version": (version, - [('v', 'verbose', None, _('print license'))], - _('hgtk version [OPTION]')), - "debugcomplete": (debugcomplete, - [('o', 'options', None, _('show the command options'))], - _('[-o] CMD')), - "help": (help_, [], _('hgtk help [COMMAND]')), - "archive": (archive, - [('r', 'rev', '', _('revision to update'))], - ('hgtk archive')), - "strip": (strip, [], ('hgtk strip [REV]')), - "browse": (browse, [], ('hgtk browse [REV]')), - "^mpatch": (mpatch, [], ('hgtk mpatch file.rej')), - "import": (thgimport, - [('', 'repo', False, _('import to the repository')), - ('', 'mq', False, _('import to the patch queue (MQ)'))], - _('hgtk import [OPTION] [SOURCE]...')), -} - -if os.name == 'nt': - # TODO: extra detection to determine if shell extension is installed - table['shellconfig'] = (shellconfig, [], _('hgtk shellconfig'))