# HG changeset patch # User Matt Mackall # Date 1240782643 18000 # Node ID 5fd8e60a935d396b485388d382b3e30362623ad1 # Parent 35604226d71291ee2485c9eabc2235bc053fbef5 config: deal with spaces at end of line more carefully diff -r 35604226d712 -r 5fd8e60a935d mercurial/config.py --- a/mercurial/config.py Sun Apr 26 16:50:43 2009 -0500 +++ b/mercurial/config.py Sun Apr 26 16:50:43 2009 -0500 @@ -69,11 +69,11 @@ def read(self, path, fp=None): sectionre = re.compile(r'\[([^\[]+)\]') - itemre = re.compile(r'([^=\s]+)\s*=\s*(.*)') - contre = re.compile(r'\s+(\S.*)') + itemre = re.compile(r'([^=\s]+)\s*=\s*(.*\S|)') + contre = re.compile(r'\s+(\S.*\S)') emptyre = re.compile(r'(;|#|\s*$)') - unsetre = re.compile(r'%unset\s+(\S.*)') - includere = re.compile(r'%include\s+(\S.*)') + unsetre = re.compile(r'%unset\s+(\S+)') + includere = re.compile(r'%include\s+(\S.*\S)') section = "" item = None line = 0