diff options
| author | Christine Lytwynec <chris.lytwynec@gmail.com> | 2015-04-22 11:45:55 -0400 |
|---|---|---|
| committer | Christine Lytwynec <chris.lytwynec@gmail.com> | 2015-04-22 11:45:55 -0400 |
| commit | 161556f47ec6b8f7c0232c21fdbdd7cc25bd3d8e (patch) | |
| tree | 8c0c64a1431b02f0ed276d463fd0208e3b0f2138 | |
| parent | 7efd4f50062f750df145102fc07c87fc49599bbe (diff) | |
| download | python-coveragepy-161556f47ec6b8f7c0232c21fdbdd7cc25bd3d8e.tar.gz | |
Update docstring and command line help text.
| -rw-r--r-- | coverage/cmdline.py | 5 | ||||
| -rw-r--r-- | coverage/control.py | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index c611e03..66a76fa 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -252,7 +252,10 @@ CMDS = { 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, diff --git a/coverage/control.py b/coverage/control.py index 4a9ac72..2c8d384 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -724,6 +724,10 @@ class Coverage(object): coverage() constructor) will be read, and combined together into the current measurements. + `data_dirs` is a list of directories from which data files should be + combined. If no list is passed, then the data files from the current + directory will be combined. + """ self._init() aliases = None |