equal
deleted
inserted
replaced
1556 fp.close() |
1556 fp.close() |
1557 |
1557 |
1558 class GitDiffRequired(Exception): |
1558 class GitDiffRequired(Exception): |
1559 pass |
1559 pass |
1560 |
1560 |
1561 def diffopts(ui, opts=None, untrusted=False, section='diff'): |
1561 def diffallopts(ui, opts=None, untrusted=False, section='diff'): |
1562 '''return diffopts with all features supported and parsed''' |
1562 '''return diffopts with all features supported and parsed''' |
1563 return difffeatureopts(ui, opts=opts, untrusted=untrusted, section=section) |
1563 return difffeatureopts(ui, opts=opts, untrusted=untrusted, section=section) |
|
1564 |
|
1565 diffopts = diffallopts |
1564 |
1566 |
1565 def difffeatureopts(ui, opts=None, untrusted=False, section='diff'): |
1567 def difffeatureopts(ui, opts=None, untrusted=False, section='diff'): |
1566 '''return diffopts with only opted-in features parsed''' |
1568 '''return diffopts with only opted-in features parsed''' |
1567 def get(key, name=None, getter=ui.configbool, forceplain=None): |
1569 def get(key, name=None, getter=ui.configbool, forceplain=None): |
1568 if opts: |
1570 if opts: |