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

hglib: ignore mercurial commands defaults

Changeset 6ab1df0a7b5e…

Parent 8c2e626f703a…

by TK Soh

Changes to 2 files · Browse files at 6ab1df0a7b5e Showing diff from parent 8c2e626f703a Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​datamine.py Stacked
 
281
282
283
284
 
285
286
287
 
562
563
564
565
566
 
 
567
568
569
 
281
282
283
 
284
285
286
287
 
562
563
564
 
 
565
566
567
568
569
@@ -281,7 +281,7 @@
  return     q = Queue.Queue() - args = [self.repo.root, q, 'grep', '--config', 'defaults.grep='] + args = [self.repo.root, q, 'grep']   if follow.get_active(): args.append('--follow')   if ignorecase.get_active(): args.append('--ignore-case')   if linenum.get_active(): args.append('--line-number') @@ -562,8 +562,8 @@
  '''   (frame, model, path) = objs   q = Queue.Queue() - args = [self.repo.root, q, '--config', 'defaults.annotate=', - 'annotate', '--follow', '--number', '--rev', str(rev), path] + args = [self.repo.root, q, 'annotate', '--follow', '--number', + '--rev', str(rev), path]   thread = threading.Thread(target=hgcmd_toq, args=args)   thread.start()   frame._mythread = thread
Change 1 of 1 Show Entire File hggtk/​hglib.py Stacked
 
243
244
245
246
 
247
248
249
250
 
 
 
 
 
 
251
252
253
 
243
244
245
 
246
247
248
249
250
251
252
253
254
255
256
257
258
259
@@ -243,11 +243,17 @@
  return values    _loaded = {} -def thgdispatch(ui, path=None, args=[]): +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)