Index: gcl.py |
=================================================================== |
--- gcl.py (revision 30888) |
+++ gcl.py (working copy) |
@@ -157,8 +157,12 @@ |
while True: |
# First, look for a locally modified version of the file. |
local_path = os.path.join(local_dir, local_base) |
- content, rc = RunShellWithReturnCode(["svn", "status", local_path]) |
- if not rc and content.startswith('M'): |
+ r = gclient_scm.CaptureSVNStatus((local_path,)) |
+ rc = -1 |
+ if r: |
+ (status, file) = r[0] |
+ rc = 0 |
+ if not rc and (status.startswith('A') or status.startswith('M')): |
M-A Ruel
2009/11/04 00:38:19
you can do status[0] in ('A', 'M') since it's guar
Dirk Pranke
2009/11/04 01:05:18
Done.
|
content = ReadFile(local_path) |
rc = 0 |
else: |