Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/subrepo.py @ 20869:9658a79968c6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: fix "% inside _()" problems Before this patch, "contrib/check-code.py" can't detect these problems, because the regexp pattern to detect "% inside _()" doesn't suppose the case that format string consists of multiple string components concatenated implicitly or explicitly, This patch does below for that regexp pattern to detect "% inside _()" problems in such case. - put "+" into separator part ("[ \t\n]") for explicit concatenation ("...." + "...." style) - enclose "component and separator" part by "(?:....)+" for concatenation itself ("...." "...." or "...." + "....")
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 01 Apr 2014 02:46:03 +0900
parents 5db105f216c3
children 6500a2eebee8
comparison
equal deleted inserted replaced
20868:5db105f216c3 20869:9658a79968c6
1019 1019
1020 @annotatesubrepoerror 1020 @annotatesubrepoerror
1021 def remove(self): 1021 def remove(self):
1022 if self.dirty(): 1022 if self.dirty():
1023 self._ui.warn(_('not removing repo %s because ' 1023 self._ui.warn(_('not removing repo %s because '
1024 'it has changes.\n' % self._path)) 1024 'it has changes.\n') % self._path)
1025 return 1025 return
1026 self._ui.note(_('removing subrepo %s\n') % self._path) 1026 self._ui.note(_('removing subrepo %s\n') % self._path)
1027 1027
1028 def onerror(function, path, excinfo): 1028 def onerror(function, path, excinfo):
1029 if function is not os.remove: 1029 if function is not os.remove: