Added ability to combine coverage data files from multiple directories into one file via command line args.

--HG--
branch : combine-from-multiple-dirs

1 files changed, 3 insertions, 2 deletions

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 2be32947..c611e037 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -249,7 +249,7 @@ CMDS = {
         ),
 
     'combine': CmdOptionParser("combine", GLOBAL_ARGS,
-        usage = " ",
+        usage = "<dir1> <dir2> ... <dirN>",
         description = "Combine data from multiple coverage files collected "
             "with 'run -p'.  The combined results are written to a single "
             "file representing the union of the data."
@@ -430,7 +430,8 @@ class CoverageScript(object):
             self.do_run(options, args)
 
         if options.action == "combine":
-            self.coverage.combine()
+            data_dirs = argv if argv else None
+            self.coverage.combine(data_dirs)
             self.coverage.save()
 
         # Remaining actions are reporting, with some common options.