Mercurial > hg

diff mercurial/commands.py @ 12167:d2c5b0927c28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Sep 03 12:58:51 2010 +0200
+++ b/mercurial/commands.py	Fri Sep 03 12:58:51 2010 +0200
@@ -1471,7 +1471,8 @@
 
     diffopts = patch.diffopts(ui, opts)
     m = cmdutil.match(repo, pats, opts)
-    cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat)
+    cmdutil.diffordiffstat(ui, repo, diffopts, node1, node2, m, stat=stat,
+                           listsubrepos=opts.get('subrepos'))
 
 def export(ui, repo, *changesets, **opts):
     """dump the header and diffs for one or more changesets
@@ -4183,7 +4184,7 @@
            _('revision'), _('REV')),
           ('c', 'change', '',
            _('change made by revision'), _('REV'))
-         ] + diffopts + diffopts2 + walkopts,
+         ] + diffopts + diffopts2 + walkopts + subrepoopts,
          _('[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...')),
     "^export":
         (export,