commit ad3193a0e587073dee0edef46bdf24f6c6e09779
author Shawn O. Pearce <sop@google.com> Sat Apr 18 09:54:51 2009 -0700
committer Shawn O. Pearce <sop@google.com> Sat Apr 18 09:54:51 2009 -0700
tree 84ed1894e6f590455ee361beb049c1c271c4e0e7
parent b81ac9e65444d0f54d2b6dd24d20b74945c9a36a

Fix `repo --trace` to show ref and config loads

The value of the varible TRACE was copied during the import, which
happens before the --trace option can be processed.  So instead we
now use a function to determine if the value is set, as the function
can be safely copied early during import.

Signed-off-by: Shawn O. Pearce <sop@google.com>

git_command.py

diff --git a/git_command.py b/git_command.py
index a3bd919..b6a4a34 100644
--- a/git_command.py
+++ b/git_command.py
@@ -17,18 +17,14 @@
 import sys
 import subprocess
 from error import GitError
+from trace import REPO_TRACE, IsTrace, Trace
 
 GIT = 'git'
 MIN_GIT_VERSION = (1, 5, 4)
 GIT_DIR = 'GIT_DIR'
-REPO_TRACE = 'REPO_TRACE'
 
 LAST_GITDIR = None
 LAST_CWD = None
-try:
-  TRACE = os.environ[REPO_TRACE] == '1'
-except KeyError:
-  TRACE = False
 
 
 class _GitCall(object):
@@ -101,7 +97,7 @@
     else:
       stderr = None
 
-    if TRACE:
+    if IsTrace():
       global LAST_CWD
       global LAST_GITDIR
 
@@ -127,7 +123,7 @@
         dbg += ' 1>|'
       if stderr == subprocess.PIPE:
         dbg += ' 2>|'
-      print >>sys.stderr, dbg
+      Trace('%s', dbg)
 
     try:
       p = subprocess.Popen(command,