From 47c11f0ac1f484062420fc5b45318d98d8c81d76 Mon Sep 17 00:00:00 2001 From: Julian Foad Date: Mon, 22 Sep 2008 23:10:34 +0000 Subject: [PATCH] Add a blank column to the "svn status" output after the first six columns, to make way for a tree-conflict status indication. * subversion/svn/status.c (print_status): Print an extra blank. * subversion/tests/cmdline/depth_tests.py, subversion/tests/cmdline/revert_tests.py, subversion/tests/cmdline/special_tests.py, subversion/tests/cmdline/stat_tests.py, subversion/tests/cmdline/svnadmin_tests.py Wherever a particular status output is expected: Expect an extra blank. * subversion/tests/cmdline/svntest/tree.py (build_tree_from_status): Expect an extra blank. git-svn-id: http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/cmdline@873321 13f79535-47bb-0310-9956-ffa450edef68 --- svntest/tree.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/svntest/tree.py b/svntest/tree.py index 44f7474..29a3dc9 100644 --- a/svntest/tree.py +++ b/svntest/tree.py @@ -756,7 +756,7 @@ def build_tree_from_status(lines): # 'status -v' output looks like this: # - # "%c%c%c%c%c%c %c %6s %6s %-12s %s\n" + # "%c%c%c%c%c%c %c %6s %6s %-12s %s\n" # # (Taken from 'print_status' in subversion/svn/status.c.) # @@ -770,7 +770,7 @@ def build_tree_from_status(lines): # - switched flag (4) (single letter: "S" or " ") # - repos lock status (5) (single letter: "K", "O", "B", "T", " ") # - # [one space] + # [two spaces] # # - out-of-date flag (6) (single letter: "*" or " ") # @@ -791,7 +791,7 @@ def build_tree_from_status(lines): # - path (10) (string of characters until newline) # Try http://www.wordsmith.org/anagram/anagram.cgi?anagram=ACDRMGU - rm = re.compile('^([!MACDRUG_ ][MACDRUG_ ])([L ])([+ ])([S ])([KOBT ]) ([* ]) [^0-9-]*(\d+|-|\?) +(\d|-|\?)+ +(\S+) +(.+)') + rm = re.compile('^([!MACDRUG_ ][MACDRUG_ ])([L ])([+ ])([S ])([KOBT ]) ([* ]) [^0-9-]*(\d+|-|\?) +(\d|-|\?)+ +(\S+) +(.+)') for line in lines: # Quit when we hit an externals status announcement (### someday we can fix -- 2.11.4.GIT