diff options
| author | Mike Frysinger <vapier@google.com> | 2019-08-27 00:26:15 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2019-08-27 07:08:52 +0000 |
| commit | 8a11f6f24cecac28e7cdb3f5d0d7c83aec0df017 (patch) | |
| tree | dc1e4815412030e99566be30a4b2a6c2ee6d03ea /main.py | |
| parent | 898f4e6217ff6d848091f69ef64a10269c9da1cd (diff) | |
| download | git-repo-8a11f6f24cecac28e7cdb3f5d0d7c83aec0df017.tar.gz | |
rename local trace module
There is a standard Python "trace" module, so having a local trace.py
prevents us being able to import that. Rename the module to avoid.
Change-Id: I23e29ec95a2204bb168a641323d05e76968d9b57
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/234832
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'main.py')
| -rwxr-xr-x | main.py | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -45,7 +45,7 @@ except ImportError: | |||
| 45 | 45 | ||
| 46 | from color import SetDefaultColoring | 46 | from color import SetDefaultColoring |
| 47 | import event_log | 47 | import event_log |
| 48 | from trace import SetTrace | 48 | from repo_trace import SetTrace |
| 49 | from git_command import git, GitCommand | 49 | from git_command import git, GitCommand |
| 50 | from git_config import init_ssh, close_ssh | 50 | from git_config import init_ssh, close_ssh |
| 51 | from command import InteractiveCommand | 51 | from command import InteractiveCommand |
| @@ -84,7 +84,7 @@ global_options.add_option('--color', | |||
| 84 | help='control color usage: auto, always, never') | 84 | help='control color usage: auto, always, never') |
| 85 | global_options.add_option('--trace', | 85 | global_options.add_option('--trace', |
| 86 | dest='trace', action='store_true', | 86 | dest='trace', action='store_true', |
| 87 | help='trace git command execution') | 87 | help='trace git command execution (REPO_TRACE=1)') |
| 88 | global_options.add_option('--time', | 88 | global_options.add_option('--time', |
| 89 | dest='time', action='store_true', | 89 | dest='time', action='store_true', |
| 90 | help='time repo command execution') | 90 | help='time repo command execution') |
