Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 2921:addb58e3b41c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
redo merge with mpm. previous merge at ef8ee4477019 was bad.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 16 Aug 2006 10:52:19 -0700
parents b70740aefa4d 3848488244fc
children 773c5b82d052
comparison
equal deleted inserted replaced
2907:b70740aefa4d 2921:addb58e3b41c
1345 node1, node2 = revpair(ui, repo, opts['rev']) 1345 node1, node2 = revpair(ui, repo, opts['rev'])
1346 1346
1347 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts) 1347 fns, matchfn, anypats = cmdutil.matchpats(repo, pats, opts)
1348 1348
1349 patch.diff(repo, node1, node2, fns, match=matchfn, 1349 patch.diff(repo, node1, node2, fns, match=matchfn,
1350 opts=ui.diffopts(opts)) 1350 opts=patch.diffopts(ui, opts))
1351 1351
1352 def export(ui, repo, *changesets, **opts): 1352 def export(ui, repo, *changesets, **opts):
1353 """dump the header and diffs for one or more changesets 1353 """dump the header and diffs for one or more changesets
1354 1354
1355 Print the changeset header and diffs for one or more revisions. 1355 Print the changeset header and diffs for one or more revisions.
1382 if len(revs) > 1: 1382 if len(revs) > 1:
1383 ui.note(_('exporting patches:\n')) 1383 ui.note(_('exporting patches:\n'))
1384 else: 1384 else:
1385 ui.note(_('exporting patch:\n')) 1385 ui.note(_('exporting patch:\n'))
1386 patch.export(repo, map(repo.lookup, revs), template=opts['output'], 1386 patch.export(repo, map(repo.lookup, revs), template=opts['output'],
1387 switch_parent=opts['switch_parent'], opts=ui.diffopts(opts)) 1387 switch_parent=opts['switch_parent'],
1388 opts=patch.diffopts(ui, opts))
1388 1389
1389 def forget(ui, repo, *pats, **opts): 1390 def forget(ui, repo, *pats, **opts):
1390 """don't add the specified files on the next commit (DEPRECATED) 1391 """don't add the specified files on the next commit (DEPRECATED)
1391 1392
1392 (DEPRECATED) 1393 (DEPRECATED)