cf97ccb00abb86e63f732e4ca0a7de0faacc7f8f max Fri May 13 03:07:05 2022 -0700 fixing hgBeacon bug when hg.conf contains equal signs, refs #29419 diff --git src/hg/hgBeacon/hgBeacon src/hg/hgBeacon/hgBeacon index fbb4af8..3ba0977 100755 --- src/hg/hgBeacon/hgBeacon +++ src/hg/hgBeacon/hgBeacon @@ -65,31 +65,31 @@ def parseConf(fname): " parse a hg.conf style file, return as dict key -> value (both are strings) " conf = {} for line in open(fname): line = line.strip() if line.startswith("#"): continue elif line.startswith("include "): inclFname = line.split()[1] inclPath = join(dirname(fname), inclFname) if isfile(inclPath): inclDict = parseConf(inclPath) conf.update(inclDict) elif "=" in line: # string search for "=" - key, value = line.split("=") + key, value = line.split("=", 1) conf[key] = value return conf def parseHgConf(confDir="."): """ return hg.conf as dict key:value """ global hgConf if hgConf is not None: return hgConf hgConf = dict() # python dict = hash table currDir = dirname(__file__) fname = join(currDir, confDir, "hg.conf") if not isfile(fname): fname = join(currDir, "hg.conf")