# HG changeset patch
# User Robin Farine <[EMAIL PROTECTED]>
# Node ID 4583592a4ec5ff5de2140e216f668aec530c7362
# Parent ce0cb34694652a1b11886ad28cdbe092f997261c
tla: fix update's output parsing
The 'tla update' command generates some warning messages when it
performs a tree lint (e.g. in presence of symbolic links which
point to non-existent files). This interferes with the parsing of
the changes so we stop to parse the command's output when we see
"* reapplying local changes" since there must be no local changes.
diff -r ce0cb3469465 -r 4583592a4ec5 vcpx/tla.py
--- a/vcpx/tla.py Wed Nov 2 23:16:05 2005 +0000
+++ b/vcpx/tla.py Thu Nov 3 13:52:52 2005 +0100
@@ -243,19 +243,16 @@
conflicts = []
skip = True
for line in output:
- # skip comment lines
+ # skip comment lines, detect beginning and end of change list
if line[0] == '*':
if line.startswith("* applying changeset"):
skip = False
+ elif line.startswith("* reapplying local changes"):
+ break
continue
if skip:
continue
l = line.split()
-
- # if there is an empty line, we are done
- if not l:
- break
-
l1 = self.__normalize_path(l[1])
l2 = None
if len(l) > 2:
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
