summaryrefslogtreecommitdiffstats
path: root/main.py
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2019-08-27 00:26:15 -0400
committerMike Frysinger <vapier@google.com>2019-08-27 07:08:52 +0000
commit8a11f6f24cecac28e7cdb3f5d0d7c83aec0df017 (patch)
treedc1e4815412030e99566be30a4b2a6c2ee6d03ea /main.py
parent898f4e6217ff6d848091f69ef64a10269c9da1cd (diff)
downloadgit-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-xmain.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/main.py b/main.py
index 5c546e82..35023d52 100755
--- a/main.py
+++ b/main.py
@@ -45,7 +45,7 @@ except ImportError:
45 45
46from color import SetDefaultColoring 46from color import SetDefaultColoring
47import event_log 47import event_log
48from trace import SetTrace 48from repo_trace import SetTrace
49from git_command import git, GitCommand 49from git_command import git, GitCommand
50from git_config import init_ssh, close_ssh 50from git_config import init_ssh, close_ssh
51from command import InteractiveCommand 51from 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')
85global_options.add_option('--trace', 85global_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)')
88global_options.add_option('--time', 88global_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')