Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.1, 0.8.2, and 0.8.3

hglib, hgthread: disable [defaults] configurations

Fixes #407 and similar as yet unreported bugs

Changeset f663d3dc2675…

Parent c1dcbb8f95e4…

by Steve Borho

Changes to 2 files · Browse files at f663d3dc2675 Showing diff from parent c1dcbb8f95e4 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​hgthread.py Stacked
 
157
158
159
 
 
160
161
162
 
157
158
159
160
161
162
163
164
@@ -157,6 +157,8 @@
  ret = None   if hasattr(self.ui, 'copy'):   # Mercurial 1.3 + for k, v in self.ui.configitems('defaults'): + self.ui.setconfig('defaults', k, '')   ret = hglib.dispatch._dispatch(self.ui, self.args)   else:   # Mercurial 1.2
Change 1 of 1 Show Changes Only thgutil/​hglib.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
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
 """  hglib.py   Copyright (C) 2007 Steve Borho <steve@borho.org>    This software may be used and distributed according to the terms  of the GNU General Public License, incorporated herein by reference.  """    import os  import sys  import traceback  import shlib  import time  from mercurial import hg, ui, util, extensions, commands, hook    from i18n import _  import paths    try:   from mercurial.error import RepoError, ParseError, LookupError   from mercurial.error import UnknownCommand, AmbiguousCommand  except ImportError:   from mercurial.cmdutil import UnknownCommand, AmbiguousCommand   from mercurial.repo import RepoError   from mercurial.dispatch import ParseError   from mercurial.revlog import LookupError    from mercurial import dispatch    try:   from mercurial import encoding   _encoding = encoding.encoding   _encodingmode = encoding.encodingmode   _fallbackencoding = encoding.fallbackencoding  except ImportError:   _encoding = util._encoding   _encodingmode = util._encodingmode   _fallbackencoding = util._fallbackencoding    try:   # post 1.1.2   from mercurial import util   hgversion = util.version()  except AttributeError:   # <= 1.1.2   from mercurial import version   hgversion = version.get_version()    try:   from mercurial.util import WinIOError  except:   class WinIOError(Exception):   'WinIOError stub'    def toutf(s):   """   Convert a string to UTF-8 encoding     Based on mercurial.util.tolocal()   """   for e in ('utf-8', _encoding):   try:   return s.decode(e, 'strict').encode('utf-8')   except UnicodeDecodeError:   pass   return s.decode(_fallbackencoding, 'replace').encode('utf-8')    def fromutf(s):   """   Convert UTF-8 encoded string to local.     It's primarily used on strings converted to UTF-8 by toutf().   """   try:   return s.decode('utf-8').encode(_encoding)   except UnicodeDecodeError:   pass   except UnicodeEncodeError:   pass   return s.decode('utf-8').encode(_fallbackencoding)    _tabwidth = None  def gettabwidth(ui):   global _tabwidth   if _tabwidth is not None:   return _tabwidth   tabwidth = ui.config('tortoisehg', 'tabwidth')   try:   tabwidth = int(tabwidth)   if tabwidth < 1 or tabwidth > 16:   tabwidth = 0   except (ValueError, TypeError):   tabwidth = 0   _tabwidth = tabwidth   return tabwidth    _maxdiff = None  def getmaxdiffsize(ui):   global _maxdiff   if _maxdiff is not None:   return _maxdiff   maxdiff = ui.config('tortoisehg', 'maxdiff')   try:   maxdiff = int(maxdiff)   if maxdiff < 1:   maxdiff = sys.maxint   except (ValueError, TypeError):   maxdiff = 1024 # 1MB by default   _maxdiff = maxdiff * 1024   return _maxdiff    def diffexpand(line):   'Expand tabs in a line of diff/patch text'   if _tabwidth is None:   gettabwidth(ui.ui())   if not _tabwidth or len(line) < 2:   return line   return line[0] + line[1:].expandtabs(_tabwidth)    def uiwrite(u, args):   '''   write args if there are buffers   returns True if the caller shall handle writing   '''   buffers = getattr(u, '_buffers', None)   if buffers == None:   buffers = u.buffers   if buffers:   ui.ui.write(u, *args)   return False   return True    def calliffunc(f):   return hasattr(f, '__call__') and f() or f      def invalidaterepo(repo):   repo.invalidate()   repo.dirstate.invalidate()   if 'mq' in repo.__dict__: #do not create if it did not exist   mq = repo.mq   if hasattr(mq, 'invalidate'):   #Mercurial 1.3   mq.invalidate()   else:   #Mercurial 1.2   mqclass = mq.__class__   repo.mq = mqclass(mq.ui, mq.basepath, mq.path)      def hgcmd_toq(path, q, *args):   '''   Run an hg command in a background thread, pipe all output to a Queue   object. Assumes command is completely noninteractive.   '''   class Qui(ui.ui):   def __init__(self, src=None):   super(Qui, self).__init__(src)   self.setconfig('ui', 'interactive', 'off')     def write(self, *args):   if uiwrite(self, args):   for a in args:   q.put(str(a))   u = Qui()   if hasattr(ui.ui, 'copy'):   # Mercurial 1.3 + for k, v in u.configitems('defaults'): + u.setconfig('defaults', k, '')   return dispatch._dispatch(u, list(args))   else:   return thgdispatch(u, path, list(args))      def displaytime(date):   return util.datestr(date, '%Y-%m-%d %H:%M:%S %1%2')    def utctime(date):   return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(date[0]))    # the remaining functions are only needed for Mercurial versions < 1.3  def _earlygetopt(aliases, args):   """Return list of values for an option (or aliases).     The values are listed in the order they appear in args.   The options and values are removed from args.   """   try:   argcount = args.index("--")   except ValueError:   argcount = len(args)   shortopts = [opt for opt in aliases if len(opt) == 2]   values = []   pos = 0   while pos < argcount:   if args[pos] in aliases:   if pos + 1 >= argcount:   # ignore and let getopt report an error if there is no value   break   del args[pos]   values.append(args.pop(pos))   argcount -= 2   elif args[pos][:2] in shortopts:   # short option can have no following space, e.g. hg log -Rfoo   values.append(args.pop(pos)[2:])   argcount -= 1   else:   pos += 1   return values    _loaded = {}  def thgdispatch(ui, path=None, args=[], nodefaults=True):   '''   Replicate functionality of mercurial dispatch but force the use   of the passed in ui for all purposes   '''     # clear all user-defined command defaults   if nodefaults:   for k, v in ui.configitems('defaults'):   ui.setconfig('defaults', k, '')     # read --config before doing anything else   # (e.g. to change trust settings for reading .hg/hgrc)   config = _earlygetopt(['--config'], args)   if config:   for section, name, value in dispatch._parseconfig(config):   ui.setconfig(section, name, value)     # check for cwd   cwd = _earlygetopt(['--cwd'], args)   if cwd:   os.chdir(cwd[-1])     # read the local repository .hgrc into a local ui object   path = paths.find_root(path) or ""   if path:   try:   ui.readconfig(os.path.join(path, ".hg", "hgrc"))   except IOError:   pass     # now we can expand paths, even ones in .hg/hgrc   rpath = _earlygetopt(["-R", "--repository", "--repo"], args)   if rpath:   path = ui.expandpath(rpath[-1])     extensions.loadall(ui)   if not hasattr(extensions, 'extensions'):   extensions.extensions = lambda: () # pre-0.9.5, loadall did below   for name, module in extensions.extensions():   if name in _loaded:   continue     # setup extensions   extsetup = getattr(module, 'extsetup', None)   if extsetup:   extsetup()     cmdtable = getattr(module, 'cmdtable', {})   overrides = [cmd for cmd in cmdtable if cmd in commands.table]   if overrides:   ui.warn(_("extension '%s' overrides commands: %s\n") %   (name, " ".join(overrides)))   commands.table.update(cmdtable)   _loaded[name] = 1     # check for fallback encoding   fallback = ui.config('ui', 'fallbackencoding')   if fallback:   _fallbackencoding = fallback     fullargs = args   cmd, func, args, options, cmdoptions = dispatch._parse(ui, args)     if options["encoding"]:   _encoding = options["encoding"]   if options["encodingmode"]:   _encodingmode = options["encodingmode"]   if options['verbose'] or options['debug'] or options['quiet']:   ui.setconfig('ui', 'verbose', str(bool(options['verbose'])))   ui.setconfig('ui', 'debug', str(bool(options['debug'])))   ui.setconfig('ui', 'quiet', str(bool(options['quiet'])))   if options['traceback']:   ui.setconfig('ui', 'traceback', 'on')   if options['noninteractive']:   ui.setconfig('ui', 'interactive', 'off')     if options['help']:   return commands.help_(ui, cmd, options['version'])   elif options['version']:   return commands.version_(ui)   elif not cmd:   return commands.help_(ui, 'shortlist')     repo = None   if cmd not in commands.norepo.split():   try:   repo = hg.repository(ui, path=path)   repo.ui = ui   ui.setconfig("bundle", "mainreporoot", repo.root)   if not repo.local():   raise util.Abort(_("repository '%s' is not local") % path)   except RepoError:   if cmd not in commands.optionalrepo.split():   if not path:   raise RepoError(_('There is no Mercurial repository here'   ' (.hg not found)'))   raise   d = lambda: func(ui, repo, *args, **cmdoptions)   else:   d = lambda: func(ui, *args, **cmdoptions)     # run pre-hook, and abort if it fails   ret = hook.hook(ui, repo, "pre-%s" % cmd, False, args=" ".join(fullargs))   if ret:   return ret     # Run actual command   try:   ret = d()   except TypeError:   # was this an argument error?   tb = traceback.extract_tb(sys.exc_info()[2])   if len(tb) != 2: # no   raise   raise ParseError(cmd, _('invalid arguments'))     # run post-hook, passing command result   hook.hook(ui, repo, "post-%s" % cmd, False, args=" ".join(fullargs),   result = ret)     if repo:   shlib.update_thgstatus(repo.ui, repo.root, wait=True)     return ret