Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 2888:3848488244fc
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 | c2932ad5476a |
children | ef8ee4477019 addb58e3b41c |
comparison
equal
deleted
inserted
replaced
2887:05257fd28591 | 2888:3848488244fc |
---|---|
1335 node1, node2 = revpair(ui, repo, opts['rev']) | 1335 node1, node2 = revpair(ui, repo, opts['rev']) |
1336 | 1336 |
1337 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) | 1337 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) |
1338 | 1338 |
1339 patch.diff(repo, node1, node2, fns, match=matchfn, | 1339 patch.diff(repo, node1, node2, fns, match=matchfn, |
1340 opts=ui.diffopts(opts)) | 1340 opts=patch.diffopts(ui, opts)) |
1341 | 1341 |
1342 def export(ui, repo, *changesets, **opts): | 1342 def export(ui, repo, *changesets, **opts): |
1343 """dump the header and diffs for one or more changesets | 1343 """dump the header and diffs for one or more changesets |
1344 | 1344 |
1345 Print the changeset header and diffs for one or more revisions. | 1345 Print the changeset header and diffs for one or more revisions. |
1372 if len(revs) > 1: | 1372 if len(revs) > 1: |
1373 ui.note(_('exporting patches:\n')) | 1373 ui.note(_('exporting patches:\n')) |
1374 else: | 1374 else: |
1375 ui.note(_('exporting patch:\n')) | 1375 ui.note(_('exporting patch:\n')) |
1376 patch.export(repo, map(repo.lookup, revs), template=opts['output'], | 1376 patch.export(repo, map(repo.lookup, revs), template=opts['output'], |
1377 switch_parent=opts['switch_parent'], opts=ui.diffopts(opts)) | 1377 switch_parent=opts['switch_parent'], |
1378 opts=patch.diffopts(ui, opts)) | |
1378 | 1379 |
1379 def forget(ui, repo, *pats, **opts): | 1380 def forget(ui, repo, *pats, **opts): |
1380 """don't add the specified files on the next commit (DEPRECATED) | 1381 """don't add the specified files on the next commit (DEPRECATED) |
1381 | 1382 |
1382 (DEPRECATED) | 1383 (DEPRECATED) |