Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

hglib: extensions.enable and disable no longer return a tuple

Changeset 043e8034e9a9…

Parent 5ca25358fa57…

by Steve Borho

Changes to one file · Browse files at 043e8034e9a9 Showing diff from parent 5ca25358fa57 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​util/​hglib.py Stacked
 
298
299
300
301
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
302
303
304
 
306
307
308
309
 
310
311
312
 
298
299
300
 
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
 
321
322
323
 
324
325
326
327
@@ -298,7 +298,22 @@
    shortdesc is in local encoding.   """ - return extensions.enabled()[0] + ret = extensions.enabled() + if type(ret) is tuple: + # hg <= 1.8 + return ret[0] + else: + # hg <= 1.9 + return ret + +def disabledextensions(): + ret = extensions.disabled() + if type(ret) is tuple: + # hg <= 1.8 + return ret[0] or {} + else: + # hg <= 1.9 + return ret or {}    def allextensions():   """Return the {name: shortdesc} dict of known extensions @@ -306,7 +321,7 @@
  shortdesc is in local encoding.   """   enabledexts = enabledextensions() - disabledexts = extensions.disabled()[0] + disabledexts = disabledextensions()   exts = (disabledexts or {}).copy()   exts.update(enabledexts)   return exts