Mercurial > hg
comparison mercurial/commands.py @ 12167:d2c5b0927c28
diff: recurse into subrepositories with --subrepos/-S flag
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Fri, 03 Sep 2010 12:58:51 +0200 |
parents | 441a74b8def1 |
children | 5b849148b620 |
comparison
equal
deleted
inserted
replaced
12166:441a74b8def1 | 12167:d2c5b0927c28 |
---|---|
1469 if reverse: | 1469 if reverse: |
1470 node1, node2 = node2, node1 | 1470 node1, node2 = node2, node1 |
1471 | 1471 |
1472 diffopts = patch.diffopts(ui, opts) | 1472 diffopts = patch.diffopts(ui, opts) |
1473 m = cmdutil.match(repo, pats, opts) | 1473 m = cmdutil.match(repo, pats, opts) |
1474 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat) | 1474 cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat, |
1475 listsubrepos=opts.get('subrepos')) | |
1475 | 1476 |
1476 def export(ui, repo, *changesets, **opts): | 1477 def export(ui, repo, *changesets, **opts): |
1477 """dump the header and diffs for one or more changesets | 1478 """dump the header and diffs for one or more changesets |
1478 | 1479 |
1479 Print the changeset header and diffs for one or more revisions. | 1480 Print the changeset header and diffs for one or more revisions. |
4181 (diff, | 4182 (diff, |
4182 [('r', 'rev', [], | 4183 [('r', 'rev', [], |
4183 _('revision'), _('REV')), | 4184 _('revision'), _('REV')), |
4184 ('c', 'change', '', | 4185 ('c', 'change', '', |
4185 _('change made by revision'), _('REV')) | 4186 _('change made by revision'), _('REV')) |
4186 ] + diffopts + diffopts2 + walkopts, | 4187 ] + diffopts + diffopts2 + walkopts + subrepoopts, |
4187 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')), | 4188 _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')), |
4188 "^export": | 4189 "^export": |
4189 (export, | 4190 (export, |
4190 [('o', 'output', '', | 4191 [('o', 'output', '', |
4191 _('print output to file with formatted name'), _('FORMAT')), | 4192 _('print output to file with formatted name'), _('FORMAT')), |