[meld] Extract regexes to parse status command output to class members
- From: Vincent Legoll <vincele src gnome org>
- To: svn-commits-list gnome org
- Subject: [meld] Extract regexes to parse status command output to class members
- Date: Wed, 22 Apr 2009 18:26:04 -0400 (EDT)
commit fce626b5e463e0feeab071917284410169847b23
Author: Vincent Legoll <vincent legoll gmail com>
Date: Wed Apr 22 23:50:50 2009 +0200
Extract regexes to parse status command output to class members
---
vc/svn.py | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/vc/svn.py b/vc/svn.py
index 0e9b6dc..8626bed 100644
--- a/vc/svn.py
+++ b/vc/svn.py
@@ -44,6 +44,11 @@ class Vc(_vc.Vc):
"C": _vc.STATE_CONFLICT,
}
+ re_status_moved = re.compile(r'^(A) +[+] +- +([?]) +[?] +([^ ].*)$')
+ re_status_vc = re.compile(r'^(.) +\d+ +(\?|(?:\d+)) +[^ ]+ +([^ ].*)$')
+ re_status_non_vc = re.compile(r'^([?]) +([^ ].*)$')
+ re_status_tree_conflict = re.compile(r'^ +> +.*')
+
def commit_command(self, message):
return [self.CMD,"commit","-m",message]
def diff_command(self):
@@ -70,31 +75,26 @@ class Vc(_vc.Vc):
matches = []
- re_status_moved = re.compile(r'^(A) +[+] +- +([?]) +[?] +([^ ].*)$')
- re_status_vc = re.compile(r'^(.) +\d+ +(\?|(?:\d+)) +[^ ]+ +([^ ].*)$')
- re_status_non_vc = re.compile(r'^([?]) +([^ ].*)$')
- re_status_tree_conflict = re.compile(r'^ +> +.*')
-
for line in entries:
# svn-1.6.x changed 'status' command output
# adding tree-conflict lines, c.f.:
# http://subversion.tigris.org/svn_1.6_releasenotes.html
- m = re_status_tree_conflict.match(line)
+ m = self.re_status_tree_conflict.match(line)
if m:
# skip this line
continue
# A svn moved file
- m = re_status_moved.match(line)
+ m = self.re_status_moved.match(line)
if m:
matches.append((m.group(3), m.group(1), m.group(2)))
continue
# A svn controlled file
- m = re_status_vc.match(line)
+ m = self.re_status_vc.match(line)
if m:
matches.append((m.group(3), m.group(1), m.group(2)))
continue
# A new file, unknown to svn
- m = re_status_non_vc.match(line)
+ m = self.re_status_non_vc.match(line)
if m:
matches.append((m.group(2), m.group(1), ""))
continue
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]