Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/patch.py @ 2908:3848488244fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move ui.diffopts to patch.diffopts where it belongs
author Matt Mackall <mpm@selenic.com>
date Tue, 15 Aug 2006 11:34:08 -0500
parents eab07a7b7491
children ef8ee4477019 addb58e3b41c
comparison
equal deleted inserted replaced
2900:05257fd28591 2908:3848488244fc
249 for gp in gitpatches: 249 for gp in gitpatches:
250 files[gp.path] = (gp.op, gp) 250 files[gp.path] = (gp.op, gp)
251 251
252 return files 252 return files
253 253
254 def diffopts(ui, opts={}):
255 return mdiff.diffopts(
256 text=opts.get('text'),
257 showfunc=(opts.get('show_function') or
258 ui.configbool('diff', 'showfunc', None)),
259 ignorews=(opts.get('ignore_all_space') or
260 ui.configbool('diff', 'ignorews', None)),
261 ignorewsamount=(opts.get('ignore_space_change') or
262 ui.configbool('diff', 'ignorewsamount', None)),
263 ignoreblanklines=(opts.get('ignore_blank_lines') or
264 ui.configbool('diff', 'ignoreblanklines', None)))
265
254 def diff(repo, node1=None, node2=None, files=None, match=util.always, 266 def diff(repo, node1=None, node2=None, files=None, match=util.always,
255 fp=None, changes=None, opts=None): 267 fp=None, changes=None, opts=None):
256 '''print diff of changes to files between two nodes, or node and 268 '''print diff of changes to files between two nodes, or node and
257 working directory. 269 working directory.
258 270