Mercurial > public > mercurial-scm > hg-stable

diff mercurial/config.py @ 10295:44c923eeb81d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: handle short continuations (issue1999) Thanks to Greg Ward for spotting and testing
author Matt Mackall <mpm@selenic.com>
date Thu, 28 Jan 2010 23:07:28 -0600
parents 25e572394f5c
children f23f87462c18
line wrap: on
line diff
--- a/mercurial/config.py	Thu Jan 28 22:45:46 2010 -0600
+++ b/mercurial/config.py	Thu Jan 28 23:07:28 2010 -0600
@@ -73,10 +73,10 @@
     def parse(self, src, data, sections=None, remap=None, include=None):
         sectionre = re.compile(r'\[([^\[]+)\]')
         itemre = re.compile(r'([^=\s][^=]*?)\s*=\s*(.*\S|)')
-        contre = re.compile(r'\s+(\S.*\S)')
+        contre = re.compile(r'\s+(\S|\S.*\S)\s*$')
         emptyre = re.compile(r'(;|#|\s*$)')
         unsetre = re.compile(r'%unset\s+(\S+)')
-        includere = re.compile(r'%include\s+(\S.*\S)')
+        includere = re.compile(r'%include\s+(\S|\S.*\S)\s*$')
         section = ""
         item = None
         line = 0