Skip to content
Snippets Groups Projects
Commit fa5079771bbe authored by Marcin Kasperski's avatar Marcin Kasperski
Browse files

merge

No related branches found
No related tags found
No related merge requests found
......@@ -196,10 +196,10 @@
ui, "path_pattern", re.compile(rgxp_prefix + "local")):
if prefix not in self.patterns:
self.patterns[prefix] = PatternPair(prefix)
ui.debug(_("path_pattern: Parsing local side of path pattern %s") % prefix)
ui.debug(_("path_pattern: Parsing local side of path pattern %s\n") % prefix)
self.patterns[prefix].learn_local(value, ui)
# Read «sth».remote
for prefix, value in meu.rgxp_config_items(
ui, "path_pattern", re.compile(rgxp_prefix + "remote")):
if prefix not in self.patterns:
self.patterns[prefix] = PatternPair(prefix)
......@@ -200,10 +200,10 @@
self.patterns[prefix].learn_local(value, ui)
# Read «sth».remote
for prefix, value in meu.rgxp_config_items(
ui, "path_pattern", re.compile(rgxp_prefix + "remote")):
if prefix not in self.patterns:
self.patterns[prefix] = PatternPair(prefix)
ui.debug(_("path_pattern: Parsing remote side of path pattern %s") % prefix)
ui.debug(_("path_pattern: Parsing remote side of path pattern %s\n") % prefix)
self.patterns[prefix].learn_remote(value, ui)
# Read «sth».enforce
for prefix, value in meu.rgxp_configbool_items(
......@@ -266,7 +266,7 @@
"\n".join(
self.patterns[pname].describe()
for pname in sorted(self.patterns.keys())),
_("[*]-marked patterns are enforced over .hg/hgrc") if has_enforced else "",
_("[*]-marked patterns are enforced over .hg/hgrc\n") if has_enforced else "",
))
else:
ui.status(_("No path patterns defined. Add [path_pattern] section to ~/.hgrc\n"))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment