Mercurial > hg
changeset 10309:0df9e63f0c07
Merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 01 Feb 2010 09:18:58 -0600 |
| parents | 00099580ca35 (diff) b0298eaaeaf7 (current diff) |
| children | 131a012aa878 |
| files | |
| diffstat | 11 files changed, 66 insertions(+), 60 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Mon Feb 01 11:11:30 2010 -0200 +++ b/mercurial/copies.py Mon Feb 01 09:18:58 2010 -0600 @@ -154,7 +154,7 @@ break # no merge needed, quit early c2 = ctx(of, m2[of]) cr = related(oc, c2, ca.rev()) - if cr and (cr.path() == f or cr.path == c2.path()): # non-divergent + if of == f or of == c2.path(): # non-divergent copy[f] = of of = None break
--- a/mercurial/subrepo.py Mon Feb 01 11:11:30 2010 -0200 +++ b/mercurial/subrepo.py Mon Feb 01 09:18:58 2010 -0600 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -import errno, os, re, xml.dom.minidom +import errno, os, re, xml.dom.minidom, shutil from i18n import _ import config, util, node, error hg = None @@ -153,7 +153,7 @@ util.path_auditor(ctx._repo.root)(path) state = ctx.substate.get(path, nullstate) if state[2] not in types: - raise util.Abort(_('unknown subrepo type %s') % t) + raise util.Abort(_('unknown subrepo type %s') % state[2]) return types[state[2]](ctx, path, state[:2]) # subrepo classes need to implement the following methods: @@ -332,10 +332,10 @@ def remove(self): if self.dirty(): - self._repo.ui.warn(_('not removing repo %s because ' - 'it has changes.\n' % self._path)) + self._ui.warn(_('not removing repo %s because ' + 'it has changes.\n' % self._path)) return - self._repo.ui.note('removing subrepo %s\n' % self._path) + self._ui.note('removing subrepo %s\n' % self._path) shutil.rmtree(self._ctx.repo.join(self._path)) def get(self, state):
--- a/mercurial/templates/gitweb/index.tmpl Mon Feb 01 11:11:30 2010 -0200 +++ b/mercurial/templates/gitweb/index.tmpl Mon Feb 01 09:18:58 2010 -0600 @@ -13,7 +13,7 @@ <td><a href="?sort={sort_name}">Name</a></td> <td><a href="?sort={sort_description}">Description</a></td> <td><a href="?sort={sort_contact}">Contact</a></td> - <td><a href="?sort={sort_lastchange}">Last change</a></td> + <td><a href="?sort={sort_lastchange}">Last modified</a></td> <td> </td> <td> </td> </tr>
--- a/mercurial/templates/monoblue/index.tmpl Mon Feb 01 11:11:30 2010 -0200 +++ b/mercurial/templates/monoblue/index.tmpl Mon Feb 01 09:18:58 2010 -0600 @@ -15,7 +15,7 @@ <td><a href="?sort={sort_name}">Name</a></td> <td><a href="?sort={sort_description}">Description</a></td> <td><a href="?sort={sort_contact}">Contact</a></td> - <td><a href="?sort={sort_lastchange}">Last change</a></td> + <td><a href="?sort={sort_lastchange}">Last modified</a></td> <td> </td> <td> </td> </tr>
--- a/mercurial/templates/paper/index.tmpl Mon Feb 01 11:11:30 2010 -0200 +++ b/mercurial/templates/paper/index.tmpl Mon Feb 01 09:18:58 2010 -0600 @@ -16,7 +16,7 @@ <th><a href="?sort={sort_name}">Name</a></th> <th><a href="?sort={sort_description}">Description</a></th> <th><a href="?sort={sort_contact}">Contact</a></th> - <th><a href="?sort={sort_lastchange}">Last change</a></th> + <th><a href="?sort={sort_lastchange}">Last modified</a></th> <th> </th> </tr> {entries%indexentry}
--- a/mercurial/templates/spartan/index.tmpl Mon Feb 01 11:11:30 2010 -0200 +++ b/mercurial/templates/spartan/index.tmpl Mon Feb 01 09:18:58 2010 -0600 @@ -10,7 +10,7 @@ <td><a href="?sort={sort_name}">Name</a></td> <td><a href="?sort={sort_description}">Description</a></td> <td><a href="?sort={sort_contact}">Contact</a></td> - <td><a href="?sort={sort_lastchange}">Last change</a></td> + <td><a href="?sort={sort_lastchange}">Last modified</a></td> <td> </td> </tr> {entries%indexentry}
--- a/tests/blacklist Mon Feb 01 11:11:30 2010 -0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -# ConfigParser format -# Definitions of blacklists for run-tests.py -# -# Identify in config sections a list of tests you want to be skipped. -# Section names are meant to be used as targets for run-tests.py --blacklist -# option. -# "test-" prefixes should be omitted from test names. Values are not used. -# -# e.g. if your file looks like: -## [example] -## hgrc = -## help = "this string is not used" -# then calling "run-tests.py --blacklist example" will exclude test-hgrc and -# test-help from the list of tests to run. - -[inotify-failures] -# When --inotify is activated, help output and config changes: -debugcomplete = -empty = -fncache = -globalopts = -help = -hgrc = -inherit-mode = -qrecord = -strict = - -# --inotify activates de facto the inotify extension. It does not play well -# with inotify-specific tests, which activate/desactivate inotify at will: -inotify = -inotify-debuginotify = -inotify-dirty-dirstate = -inotify-issue1208 = -inotify-issue1371 = -inotify-issue1542 = -inotify-issue1556 = -inotify-lookup =
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/blacklists/README Mon Feb 01 09:18:58 2010 -0600 @@ -0,0 +1,14 @@ +Put here definitions of blacklists for run-tests.py + +Create a file per blacklist. Each file should list the names of tests that you +want to be skipped. +File names are meant to be used as targets for run-tests.py --blacklist +option. +Lines starting with # are ignored. White spaces are stripped. + +e.g. if you create a blacklist/example file containing: + test-hgrc + # some comment + test-help +then calling "run-tests.py --blacklist blacklists/example" will exclude +test-hgrc and test-help from the list of tests to run.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/blacklists/inotify-failures Mon Feb 01 09:18:58 2010 -0600 @@ -0,0 +1,21 @@ +# When --inotify is activated, help output and config changes: +test-debugcomplete +test-empty +test-fncache +test-globalopts +test-help +test-hgrc +test-inherit-mode +test-qrecord +test-strict + +# --inotify activates de facto the inotify extension. It does not play well +# with inotify-specific tests, which activate/desactivate inotify at will: +test-inotify +test-inotify-debuginotify +test-inotify-dirty-dirstate +test-inotify-issue1208 +test-inotify-issue1371 +test-inotify-issue1542 +test-inotify-issue1556 +test-inotify-lookup
--- a/tests/run-tests.py Mon Feb 01 11:11:30 2010 -0200 +++ b/tests/run-tests.py Mon Feb 01 09:18:58 2010 -0600 @@ -41,7 +41,6 @@ # completes fairly quickly, includes both shell and Python scripts, and # includes some scripts that run daemon processes.) -from ConfigParser import ConfigParser import difflib import errno import optparse @@ -134,8 +133,7 @@ parser.add_option("--inotify", action="store_true", help="enable inotify extension when running tests") parser.add_option("--blacklist", action="append", - help="skip tests listed in the specified section of " - "the blacklist file") + help="skip tests listed in the specified blacklist file") for option, default in defaults.items(): defaults[option] = int(os.environ.get(*default)) @@ -202,12 +200,22 @@ if sys.version_info[:2] < (2, 6) or sys.version_info[:2] >= (3, 0): parser.error('--py3k-warnings can only be used on Python 2.6+') if options.blacklist: - configparser = ConfigParser() - configparser.read("blacklist") blacklist = dict() - for section in options.blacklist: - for (item, value) in configparser.items(section): - blacklist["test-" + item] = section + for filename in options.blacklist: + try: + path = os.path.expanduser(os.path.expandvars(filename)) + f = open(path, "r") + except IOError, err: + if err.errno != errno.ENOENT: + raise + print "warning: no such blacklist file: %s" % filename + continue + + for line in f.readlines(): + line = line.strip() + if line and not line.startswith('#'): + blacklist[line] = filename + options.blacklist = blacklist return (options, args) @@ -744,9 +752,9 @@ for test in tests: if options.blacklist: - section = options.blacklist.get(test) - if section is not None: - skips.append((test, "blacklisted (%s section)" % section)) + filename = options.blacklist.get(test) + if filename is not None: + skips.append((test, "blacklisted (%s)" % filename)) skipped += 1 continue
--- a/tests/test-hgwebdir.out Mon Feb 01 11:11:30 2010 -0200 +++ b/tests/test-hgwebdir.out Mon Feb 01 09:18:58 2010 -0600 @@ -67,7 +67,7 @@ <th><a href="?sort=name">Name</a></th> <th><a href="?sort=description">Description</a></th> <th><a href="?sort=contact">Contact</a></th> - <th><a href="?sort=lastchange">Last change</a></th> + <th><a href="?sort=lastchange">Last modified</a></th> <th> </th> </tr> @@ -203,7 +203,7 @@ <th><a href="?sort=name">Name</a></th> <th><a href="?sort=description">Description</a></th> <th><a href="?sort=contact">Contact</a></th> - <th><a href="?sort=lastchange">Last change</a></th> + <th><a href="?sort=lastchange">Last modified</a></th> <th> </th> </tr>