Merged in lep/coverage.py (pull request #48)

Fix #363: crash when annotating non-ascii characters in python 2.

1 files changed, 7 insertions, 3 deletions

diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 2be3294..66a76fa 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -249,10 +249,13 @@ 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."
+            "file representing the union of the data. The positional "
+            "arguments are directories from which the data files should be "
+            "combined. By default, only data files in the current directory "
+            "are combined."
         ),
 
     'debug': CmdOptionParser("debug", GLOBAL_ARGS,
@@ -430,7 +433,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.