# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2009-04-26 21:50:43
# Node ID 5fd8e60a935d396b485388d382b3e30362623ad1
# Parent  35604226d71291ee2485c9eabc2235bc053fbef5

config: deal with spaces at end of line more carefully

diff --git a/mercurial/config.py b/mercurial/config.py
--- a/mercurial/config.py
+++ b/mercurial/config.py
@@ -69,11 +69,11 @@ class config(object):
 
     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