Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

many errors moved to error.py in mercurial tip

Changeset 95bec2d6ed59…

Parent 9a9e4fe2ac0b…

by Steve Borho

Changes to 20 files · Browse files at 95bec2d6ed59 Showing diff from parent 9a9e4fe2ac0b Diff from another changeset...

Change 1 of 2 Show Changes Only contrib/​hgtk 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
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
 #!/usr/bin/env python  #  # front-end script for TortoiseHg dialogs  #  # Copyright (C) 2008 Steve Borho <steve@borho.org>  # Copyright (C) 2008 TK Soh <teekaysoh@gmail.com>    # set TORTOISEHG_PATH in your environment to point the location  # of your tortoisehg repository, or modify 'tortoisehg_dir' below:  tortoisehg_dir = '~/tools/tortoisehg-dev'    import os  import sys  import traceback  import pygtk  pygtk.require('2.0')  import gtk  import shlex  from mercurial.i18n import _  from mercurial import hg, util, fancyopts, commands, cmdutil -from mercurial.repo import RepoError  import mercurial.ui as _ui   -class ParseError(Exception): - """Exception raised on errors in parsing the command line.""" +try: + from mercurial.error import RepoError, UnknownCommand, AmbiguousCommand + from mercurial.error import ParseError +except ImportError: + from mercurial.repo import RepoError + from mercurial.cmdutil import UnknownCommand, AmbiguousCommand + class ParseError(Exception): + """Exception raised on errors in parsing the command line."""    nonrepo_commands = 'userconfig clone init about help'    def dispatch(args):   "run the command specified in args"   try:   u = _ui.ui(traceback='--traceback' in args)   except util.Abort, inst:   sys.stderr.write(_("abort: %s\n") % inst)   return -1   return _runcatch(u, args)    def _parse(ui, args):   options = {}   cmdoptions = {}     try:   args = fancyopts.fancyopts(args, globalopts, options)   except fancyopts.getopt.GetoptError, inst:   raise ParseError(None, inst)     if args:   cmd, args = args[0], args[1:]   aliases, i = cmdutil.findcmd(cmd, table, ui.config("ui", "strict"))   cmd = aliases[0]   c = list(i[1])   else:   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 ParseError(cmd, inst)     # separate global options back out   for o in globalopts:   n = o[1]   options[n] = cmdoptions[n]   del cmdoptions[n]     return (cmd, cmd and i[0] or None, args, options, cmdoptions)    def _runcatch(ui, args):   try:   try:   return runcommand(ui, args)   finally:   ui.flush()   except ParseError, inst:   if inst.args[0]:   ui.warn(_("hgtk %s: %s\n") % (inst.args[0], inst.args[1]))   help_(ui, inst.args[0])   else:   ui.warn(_("hgtk: %s\n") % inst.args[1]) - help_('shortlist') - except cmdutil.AmbiguousCommand, inst: + help_(ui, 'shortlist') + except AmbiguousCommand, inst:   ui.warn(_("hgtk: command '%s' is ambiguous:\n %s\n") %   (inst.args[0], " ".join(inst.args[1]))) - except cmdutil.UnknownCommand, inst: + except UnknownCommand, inst:   ui.warn(_("hgtk: unknown command '%s'\n") % inst.args[0])   help_(ui, 'shortlist')   except RepoError, inst:   ui.warn(_("abort: %s!\n") % inst)   except util.Abort, inst:   ui.warn(_("abort: %s\n") % inst)     return -1    def runcommand(ui, args):   fullargs = args   cmd, func, args, options, cmdoptions = _parse(ui, args)   ui.updateopts(options["verbose"])     if options['help']:   return help_(ui, cmd)   elif not cmd:   return help_(ui, 'shortlist')     if hasattr(sys, "frozen"):   # Py2exe environment   thgdir = os.path.dirname(sys.executable)   os.environ['THG_ICON_PATH'] = os.path.join(thgdir, 'icons')   else:   # Add TortoiseHg to python path   path = os.environ.get('TORTOISEHG_PATH') or tortoisehg_dir   norm = os.path.normpath(os.path.expanduser(path))   if norm not in sys.path:   sys.path.append(norm)     try:   # assuming TortoiseHg source layout, with hgtk in contrib   path = os.path.dirname(os.path.realpath(__file__))   except NameError:   # __file__ not available in pdb mode   path = os.path.dirname(sys.argv[0])   norm = os.path.normpath(os.path.join(path, '..'))   if norm not in sys.path:   sys.path.append(norm)     try:   from hggtk import hglib   except ImportError, inst:   m = str(inst).split()[-1]   if m in "hglib hggtk".split():   # fix "tortoisehg_dir" at the top of this script, or ...   raise util.Abort(_('Please set TORTOISEHG_PATH to location '   'of your tortoisehg repository'))   else:   raise util.Abort(_('could not import module %s!\n' % m))   except:   raise     path = hglib.rootpath(os.getcwd())   if path:   try:   lui = _ui.ui(parentui=ui)   lui.readconfig(os.path.join(path, ".hg", "hgrc"))   except IOError:   pass   else:   lui = ui   if options['repository']:   path = lui.expandpath(options['repository'])     if cmd not in nonrepo_commands.split():   try:   repo = hg.repository(ui, path=path)   except RepoError, inst:   # try to guess the repo from first of file args   root = None   if args:   path = hglib.rootpath(args[0])   if path:   repo = hg.repository(ui, path=path)   else:   raise RepoError(_("There is no Mercurial repository here"   " (.hg not found)"))   cmdoptions['root'] = os.path.abspath(path)     try:   return func(ui, *args, **cmdoptions)   except TypeError, inst:   # was this an argument error?   tb = traceback.extract_tb(sys.exc_info()[2])   if len(tb) != 1: # no   raise   raise ParseError(cmd, _("invalid arguments"))    def about(ui, **opts):   """about TortoiseHg"""   from hggtk.about import run   run(**opts)    def clone(ui, source=None, dest=None, **opts):   """clone tool"""   from hggtk.clone import run   opts['files'] = [os.path.abspath(x) for x in (source, dest) if x]   run(**opts)    def commit(ui, *pats, **opts):   """commit tool"""   from hggtk.commit import run   opts['files'] = [os.path.abspath(x) for x in pats]   run(**opts)    def userconfig(ui, **opts):   """user configuration editor"""   from hggtk.thgconfig import run   run(**opts)    def repoconfig(ui, *pats, **opts):   """repository configuration editor"""   from hggtk.thgconfig import run   opts['files'] = opts['root']   run(**opts)    def rename(ui, *pats, **opts):   """rename a single file or directory"""   from hggtk.rename import run   if not pats or len(pats) > 2:   raise util.Abort("rename takes one or two path arguments")   try:   opts['fname'] = pats[0]   opts['target'] = pats[1] or pats[0]   except IndexError:   pass   run(**opts)    def guess(ui, *pats, **opts):   """guess previous renames or copies"""   from hggtk.rename import run   opts['detect'] = True   run(**opts)    def datamine(ui, *pats, **opts):   """repository search and annotate tool"""   from hggtk.datamine import run   opts['files'] = sys.argv[2:] or []   run(**opts)    def hginit(ui, dest=None, **opts):   """repository initialization tool"""   from hggtk.hginit import run   if dest:   opts['files'] = [dest]   run(**opts)    def log(ui, *pats, **opts):   """changelog viewer"""   from hggtk.history import run   opts['files'] = [os.path.abspath(x) for x in pats]   run(**opts)    def merge(ui, node=None, rev=None, **opts):   """merge tool """   from hggtk.merge import run   run(**opts)    def recovery(ui, *pats, **opts):   """recover, rollback & verify"""   from hggtk.recovery import run   run(**opts)    def serve(ui, **opts):   """web server"""   from hggtk.serve import run   run(**opts)    def status(ui, *pats, **opts):   """file status viewer     Also do add, remove and revert.   """     from hggtk.status import run   opts['files'] = [os.path.abspath(x) for x in pats]   run(**opts)    def synch(ui, **opts):   """repository synchronization tool"""   from hggtk.synch import run   cmd = sys.argv[1]   if 'push'.startswith(cmd) or 'outgoing'.startswith(cmd):   opts['pushmode'] = True   else:   opts['pushmode'] = False   run(**opts)    def update(ui, **opts):   """update/checkout tool"""   from hggtk.update import run   run(**opts)    ### help management, adapted from mercurial.commands.help_()  def help_(ui, name=None, with_version=False):   """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')   aliases, i = cmdutil.findcmd(name, table)   # 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.items():   f = c.split("|", 1)[0]   if select and not select(f):   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 not doc:   doc = _("(No help text available)")   h[f] = doc.splitlines(0)[0].rstrip()   cmds[f] = c.lstrip("^")     if not h:   ui.status(_('no commands defined\n'))   return     ui.status(header)   fns = h.keys()   fns.sort()   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, h[f]))     if not ui.quiet:   addglobalopts(True)     def helptopic(name):   v = None   for i in help.helptable:   l = i.split('|')   if name in l:   v = i   header = l[-1]   if not v:   raise cmdutil.UnknownCommand(name)     # description   doc = help.helptable[v]   if not doc:   doc = _("(No help text available)")   if callable(doc):   doc = doc()     ui.write("%s\n" % header)   ui.write("%s\n" % doc.rstrip())     def helpext(name):   try:   mod = extensions.find(name)   except KeyError:   raise cmdutil.UnknownCommand(name)     doc = (mod.__doc__ or _('No help text available')).splitlines(0)   ui.write(_('%s extension - %s\n') % (name.split('.')[-1], doc[0]))   for d in doc[1:]:   ui.write(d, '\n')     ui.status('\n')     try:   ct = mod.cmdtable   except AttributeError:   ct = {}     modcmds = dict.fromkeys([c.split('|', 1)[0] for c in ct])   helplist(_('list of commands:\n\n'), modcmds.has_key)     if name and name != 'shortlist':   i = None   for f in (helpcmd, helptopic, helpext):   try:   f(name)   i = None   break   except cmdutil.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):   """output version and copyright information"""   pass    globalopts = [   ('R', 'repository', '',   _('repository root directory or symbolic path name')),   ('v', 'verbose', None, _('enable additional output')),   ('h', 'help', None, _('display help and exit')),  ]    table = {   "^about": (about, [], _('hgtk about')),   "^clone": (clone, [], _('hgtk clone SOURCE [DEST]')),   "^commit|ci": (commit, [], _('hgtk commit [FILE]...')),   "^datamine|annotate|blame": (datamine, [], _('hgtk datamine')),   "^init": (hginit, [], _('hgtk init [DEST]')),   "^log|history": (log,   [('l', 'limit', '', _('limit number of changes displayed'))],   _('hgtk log [OPTIONS] [FILE]')),   "^merge": (merge, [], _('hgtk merge')),   "^recovery|rollback|verify": (recovery, [], _('hgtk recovery')),   "^synch|pull|push|incoming|outgoing|email": (synch, [], _('hgtk synch')),   "^status|st": (status, [], _('hgtk status [FILE]...')),   "^userconfig": (userconfig, [], _('hgtk userconfig')),   "^repoconfig": (repoconfig, [], _('hgtk repoconfig')),   "^guess": (guess, [], _('hgtk guess')),   "^rename|mv": (rename, [], _('hgtk rename SOURCE [DEST]')),   "^serve":   (serve,   [('', 'webdir-conf', '', _('name of the webdir config file'))],   _('hgtk serve [OPTION]...')),   "^update|checkout|co": (update, [], _('hgtk update')),   "help": (help_, [], _('hgtk help [COMMAND]')),  }    if __name__=='__main__':   sys.exit(dispatch(sys.argv[1:]))
Change 1 of 3 Show Entire File contrib/​nautilus-thg.py Stacked
 
12
13
14
15
 
16
17
18
 
21
22
23
 
 
 
 
 
 
24
25
26
 
71
72
73
74
 
75
76
77
 
12
13
14
 
15
16
17
18
 
21
22
23
24
25
26
27
28
29
30
31
32
 
77
78
79
 
80
81
82
83
@@ -12,7 +12,7 @@
 import gconf  import gtk  import gobject -from mercurial import hg, ui, repo, match, util +from mercurial import hg, ui, match, util  from mercurial.node import short  import nautilus  import os @@ -21,6 +21,12 @@
 import tempfile  import time  import urllib + +try: + from mercurial.error import RepoError +except ImportError: + from mercurial.repo import RepoError +  TORTOISEHG_PATH = '~/tools/tortoisehg-dev'  TERMINAL_KEY = '/desktop/gnome/applications/terminal/exec'   @@ -71,7 +77,7 @@
  self.cacheroot = p   self.cacherepo = hg.repository(ui.ui(), path=p)   return self.cacherepo - except repo.RepoError: + except RepoError:   self.cacheroot = None   self.cacherepo = None   return None
Change 1 of 4 Show Entire File hggtk/​changeset.py Stacked
 
16
17
18
19
20
21
22
 
23
24
25
26
27
 
 
 
 
 
28
29
30
 
268
269
270
271
 
272
273
274
 
293
294
295
296
 
297
298
299
 
623
624
625
626
 
627
628
629
 
16
17
18
 
19
 
 
20
21
22
23
24
25
26
27
28
29
30
31
32
33
 
271
272
273
 
274
275
276
277
 
296
297
298
 
299
300
301
302
 
626
627
628
 
629
630
631
632
@@ -16,15 +16,18 @@
 import pango  import StringIO   -from mercurial.i18n import _  from mercurial.node import * -from mercurial import cmdutil, util, ui, hg, commands -from mercurial import context, patch, revlog +from mercurial import cmdutil, context, util, ui, hg, patch  from gdialog import *  from hgcmd import CmdDialog  from hglib import toutf, fromutf, displaytime, hgcmd_toq, diffexpand  from gtklib import StatusBar   +try: + from mercurial.error import LookupError +except ImportError: + from mercurial.revlog import LookupError +  class ChangeSet(GDialog):   """GTK+ based dialog for displaying repository logs   """ @@ -268,7 +271,7 @@
  if f in files:   try:   src = getfilectx(f, c).renamed() - except revlog.LookupError: + except LookupError:   return None   if src:   f = src[0] @@ -293,7 +296,7 @@
  s = 'A'   ctx1.filectx(f)   s = 'M' - except revlog.LookupError: + except LookupError:   pass   status[f] = s   return s @@ -623,7 +626,7 @@
  try:   fctx = ctx.filectx(self.curfile)   has_filelog = fctx.filelog().linkrev(fctx.filerev()) == ctx.rev() - except revlog.LookupError: + except LookupError:   has_filelog = False   self._ann_menu.set_sensitive(has_filelog)   self._save_menu.set_sensitive(has_filelog)
Change 1 of 1 Show Entire File hggtk/​commit.py Stacked
 
16
17
18
 
19
20
21
 
16
17
18
19
20
21
22
@@ -16,6 +16,7 @@
 import cStringIO    from mercurial.i18n import _ +from mercurial.node import *  from mercurial import ui, hg  from shlib import shell_notify  from gdialog import *
Change 1 of 2 Show Entire File hggtk/​diff.py Stacked
 
12
13
14
15
 
16
17
18
 
110
111
112
113
 
114
115
116
 
12
13
14
 
15
16
17
18
 
110
111
112
 
113
114
115
116
@@ -12,7 +12,7 @@
 import gtk  import pango  import sys -from hglib import gettabwidth +from hglib import gettabwidth, RepoError  from mercurial import hg, ui, cmdutil, util, patch  from mercurial.i18n import _  from shlib import set_tortoise_icon @@ -110,7 +110,7 @@
  self.ui = ui.ui()   try:   self.repo = hg.repository(self.ui, path=self.root) - except hg.RepoError: + except RepoError:   return None     matcher = cmdutil.match(self.repo, self.files)
Change 1 of 1 Show Entire File hggtk/​gdialog.py Stacked
 
24
25
26
27
28
 
 
29
30
31
 
24
25
26
 
 
27
28
29
30
31
@@ -24,8 +24,8 @@
 import pango    from mercurial.i18n import _ -from mercurial.node import * -from mercurial import cmdutil, util, ui, hg, commands, patch +from mercurial.node import short +from mercurial import cmdutil, util, ui, hg, commands  from hgext import extdiff  from shlib import shell_notify, set_tortoise_icon, Settings  from thgconfig import ConfigDialog
Change 1 of 1 Show Entire File hggtk/​hgemail.py Stacked
 
14
15
16
17
 
18
19
20
 
14
15
16
 
17
18
19
20
@@ -14,7 +14,7 @@
 from tempfile import mkstemp  from dialog import *  from mercurial import hg, ui, extensions -from mercurial.repo import RepoError +from hglib import RepoError  from thgconfig import ConfigDialog  from hgcmd import CmdDialog  
Change 1 of 2 Show Entire File hggtk/​hginit.py Stacked
 
11
12
13
14
 
 
15
16
17
 
146
147
148
149
 
150
151
152
 
11
12
13
 
14
15
16
17
18
 
147
148
149
 
150
151
152
153
@@ -11,7 +11,8 @@
 import gtk  import pango  from dialog import error_dialog, info_dialog -from mercurial import hg, ui, util, repo +from mercurial import hg, ui, util +from hglib import RepoError  import shlib    class InitDialog(gtk.Window): @@ -146,7 +147,7 @@
    try:   hg.repository(u, dest, create=1) - except repo.RepoError, inst: + except RepoError, inst:   error_dialog(self, "Unable to create new repository",   str(inst))   return False
Change 1 of 1 Show Entire File hggtk/​hglib.py Stacked
 
5
6
7
8
9
10
11
12
13
 
 
 
 
 
 
14
15
16
 
5
6
7
 
 
8
9
10
11
12
13
14
15
16
17
18
19
20
@@ -5,12 +5,16 @@
 import threading, thread2  import Queue  from mercurial import hg, ui, util, extensions, commands, hook -from mercurial.repo import RepoError -from mercurial.node import *  from mercurial.i18n import _  from dialog import entry_dialog    try: + from mercurial.error import RepoError, ParseError +except ImportError: + from mercurial.repo import RepoError + from mercurial.cmdutil import ParseError + +try:   try:   from mercurial import demandimport   except:
Change 1 of 1 Show Entire File hggtk/​logfilter.py Stacked
 
11
12
13
14
15
16
 
17
18
19
 
11
12
13
 
14
 
15
16
17
18
@@ -11,9 +11,8 @@
 import sys  import gtk  from gdialog import * -from mercurial.node import *  from mercurial import cmdutil, util, hg, ui -from mercurial.repo import RepoError +from hglib import RepoError  from shlib import shell_notify, set_tortoise_icon    class FilterDialog(gtk.Dialog):
Change 1 of 1 Show Entire File hggtk/​merge.py Stacked
 
12
13
14
 
15
16
17
18
19
20
 
12
13
14
15
16
17
 
18
19
20
@@ -12,9 +12,9 @@
 from dialog import *  from mercurial.node import *  from mercurial import util, hg, ui +from hglib import RepoError  from hgcmd import CmdDialog  from shlib import set_tortoise_icon, shell_notify -from mercurial.repo import RepoError  import histselect    class MergeDialog(gtk.Window):
Change 1 of 1 Show Entire File hggtk/​recovery.py Stacked
 
17
18
19
20
21
22
 
23
24
 
25
26
27
 
17
18
19
 
 
 
20
21
 
22
23
24
25
@@ -17,11 +17,9 @@
 import Queue  import os  import threading -from mercurial import hg, ui, util -from mercurial.repo import RepoError -from mercurial.node import * +from mercurial import hg, ui, util  from dialog import error_dialog, question_dialog -from hglib import HgThread, toutf +from hglib import HgThread, toutf, RepoError  from shlib import set_tortoise_icon, shell_notify  import gtklib  
Change 1 of 1 Show Entire File hggtk/​revisions.py Stacked
 
14
15
16
17
18
19
20
21
22
 
23
24
25
 
14
15
16
 
17
 
18
19
20
21
22
23
24
@@ -14,12 +14,11 @@
 import gobject  import pango  from mercurial import hg, ui, cmdutil, util -from mercurial.repo import RepoError  from mercurial.i18n import _ -from mercurial.node import *  from dialog import error_dialog, question_dialog  from revtree import RevisionTree  from shlib import set_tortoise_icon +from hglib import RepoError    class RevisionDialog(gtk.Dialog):   def __init__(self, root=''):
Change 1 of 2 Show Entire File hggtk/​serve.py Stacked
 
24
25
26
27
28
29
30
 
124
125
126
127
 
128
129
130
 
24
25
26
 
27
28
29
 
123
124
125
 
126
127
128
129
@@ -24,7 +24,6 @@
 import hglib  from dialog import question_dialog, error_dialog  from mercurial import hg, ui, commands, cmdutil, util -from mercurial.repo import RepoError  from mercurial.hgweb import server  from mercurial.i18n import _  from shlib import set_tortoise_icon @@ -124,7 +123,7 @@
  def _get_config(self):   try:   repo = hg.repository(ui.ui(), path=self._root) - except RepoError: + except hglib.RepoError:   print 'no repository found'   gtk.main_quit()   self.defport = repo.ui.config('web', 'port') or '8000'
Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
15
16
17
18
19
20
21
 
15
16
17
 
18
19
20
@@ -15,7 +15,6 @@
 import pango    from mercurial.i18n import _ -from mercurial.node import *  from mercurial import cmdutil, util, ui, hg, commands, patch, mdiff  from mercurial import merge as merge_  from shlib import shell_notify
Change 1 of 1 Show Entire File hggtk/​synch.py Stacked
 
18
19
20
21
22
23
 
24
25
26
 
18
19
20
 
21
 
22
23
24
25
@@ -18,9 +18,8 @@
 import os  import threading  from mercurial import hg, ui, util, extensions -from mercurial.repo import RepoError  from dialog import error_dialog, question_dialog, info_dialog -from hglib import HgThread, toutf, rootpath +from hglib import HgThread, toutf, rootpath, RepoError  import shlib  import gtklib  import urllib
Change 1 of 1 Show Entire File hggtk/​tagadd.py Stacked
 
15
16
17
18
19
20
 
 
21
22
23
 
15
16
17
 
18
 
19
20
21
22
23
@@ -15,9 +15,9 @@
 import gtk  from dialog import question_dialog, error_dialog, info_dialog  from mercurial import hg, ui, cmdutil, util -from mercurial.repo import RepoError  from mercurial.i18n import _ -from mercurial.node import * +from mercurial.node import short +from hglib import RepoError    class TagAddDialog(gtk.Window):   """ Dialog to add tag to Mercurial repo """
Change 1 of 1 Show Entire File hggtk/​tags.py Stacked
 
14
15
16
17
18
 
19
20
21
 
14
15
16
 
17
18
19
20
21
@@ -14,8 +14,8 @@
 import gtk  import gobject  from mercurial import hg, ui, cmdutil, util, node -from mercurial.repo import RepoError  from mercurial.i18n import _ +from hglib import RepoError    def get_tag_list(path):   root = path
Change 1 of 1 Show Entire File hggtk/​thgconfig.py Stacked
 
10
11
12
13
14
 
15
16
17
 
10
11
12
 
13
14
15
16
17
@@ -10,8 +10,8 @@
 import os  import pango  from mercurial import hg, ui, cmdutil, util -from mercurial.repo import RepoError  from dialog import error_dialog, question_dialog +from hglib import RepoError  import shlib  import shelve  import iniparse
Change 1 of 1 Show Entire File hggtk/​update.py Stacked
 
11
12
13
 
14
15
16
17
18
 
19
20
21
 
11
12
13
14
15
 
 
16
 
17
18
19
20
@@ -11,11 +11,10 @@
 import sys  import gtk  from dialog import * +from mercurial import util, hg, ui  from mercurial.node import * -from mercurial import util, hg, ui -from mercurial.repo import RepoError  from shlib import shell_notify, set_tortoise_icon -from hglib import rootpath +from hglib import rootpath, RepoError    class UpdateDialog(gtk.Window):   """ Dialog to update Mercurial repo """