Show More
@@ -335,7 +335,7 b' def _runcatch(req):' | |||||
335 | compare = myver.split('+')[0] |
|
335 | compare = myver.split('+')[0] | |
336 | ct = tuplever(compare) |
|
336 | ct = tuplever(compare) | |
337 | worst = None, ct, '' |
|
337 | worst = None, ct, '' | |
338 | if True: |
|
338 | if ui.config('ui', 'supportcontact', None) is None: | |
339 | for name, mod in extensions.extensions(): |
|
339 | for name, mod in extensions.extensions(): | |
340 | testedwith = getattr(mod, 'testedwith', '') |
|
340 | testedwith = getattr(mod, 'testedwith', '') | |
341 | report = getattr(mod, 'buglink', _('the extension author.')) |
|
341 | report = getattr(mod, 'buglink', _('the extension author.')) | |
@@ -367,9 +367,11 b' def _runcatch(req):' | |||||
367 | '** If that fixes the bug please report it to %s\n') |
|
367 | '** If that fixes the bug please report it to %s\n') | |
368 | % (name, testedwith, name, report)) |
|
368 | % (name, testedwith, name, report)) | |
369 | else: |
|
369 | else: | |
|
370 | bugtracker = ui.config('ui', 'supportcontact', None) | |||
|
371 | if bugtracker is None: | |||
|
372 | bugtracker = _("http://mercurial.selenic.com/wiki/BugTracker") | |||
370 | warning = (_("** unknown exception encountered, " |
|
373 | warning = (_("** unknown exception encountered, " | |
371 | "please report by visiting\n") + |
|
374 | "please report by visiting\n** ") + bugtracker + '\n') | |
372 | _("** http://mercurial.selenic.com/wiki/BugTracker\n")) |
|
|||
373 | warning += ((_("** Python %s\n") % sys.version.replace('\n', '')) + |
|
375 | warning += ((_("** Python %s\n") % sys.version.replace('\n', '')) + | |
374 | (_("** Mercurial Distributed SCM (version %s)\n") % myver) + |
|
376 | (_("** Mercurial Distributed SCM (version %s)\n") % myver) + | |
375 | (_("** Extensions loaded: %s\n") % |
|
377 | (_("** Extensions loaded: %s\n") % |
@@ -1511,6 +1511,11 b' User interface controls.' | |||||
1511 | ``style`` |
|
1511 | ``style`` | |
1512 | Name of style to use for command output. |
|
1512 | Name of style to use for command output. | |
1513 |
|
1513 | |||
|
1514 | ``supportcontact`` | |||
|
1515 | Location pointed at in Mercurial traceback for reporting crash. Use this if | |||
|
1516 | you are a large organisation with it's own Mercurial deployement process and | |||
|
1517 | crash reports should be addressed to your internal support. | |||
|
1518 | ||||
1514 | ``timeout`` |
|
1519 | ``timeout`` | |
1515 | The timeout used when a lock is held (in seconds), a negative value |
|
1520 | The timeout used when a lock is held (in seconds), a negative value | |
1516 | means no timeout. (default: 600) |
|
1521 | means no timeout. (default: 600) |
@@ -943,6 +943,15 b' Older extension is tested with current v' | |||||
943 | ** Mercurial Distributed SCM (version 1.9.3) |
|
943 | ** Mercurial Distributed SCM (version 1.9.3) | |
944 | ** Extensions loaded: throw, older |
|
944 | ** Extensions loaded: throw, older | |
945 |
|
945 | |||
|
946 | Ability to point to a different point | |||
|
947 | $ hg --config extensions.throw=throw.py --config extensions.older=older.py \ | |||
|
948 | > --config ui.supportcontact='Your Local Goat Lenders' throw 2>&1 | egrep '^\*\*' | |||
|
949 | ** unknown exception encountered, please report by visiting | |||
|
950 | ** Your Local Goat Lenders | |||
|
951 | ** Python * (glob) | |||
|
952 | ** Mercurial Distributed SCM (*) (glob) | |||
|
953 | ** Extensions loaded: throw, older | |||
|
954 | ||||
946 | Declare the version as supporting this hg version, show regular bts link: |
|
955 | Declare the version as supporting this hg version, show regular bts link: | |
947 | $ hgver=`$PYTHON -c 'from mercurial import util; print util.version().split("+")[0]'` |
|
956 | $ hgver=`$PYTHON -c 'from mercurial import util; print util.version().split("+")[0]'` | |
948 | $ echo 'testedwith = """'"$hgver"'"""' >> throw.py |
|
957 | $ echo 'testedwith = """'"$hgver"'"""' >> throw.py |
General Comments 0
You need to be logged in to leave comments.
Login now