1333 patchproblems += 1 |
1333 patchproblems += 1 |
1334 |
1334 |
1335 if patchproblems: |
1335 if patchproblems: |
1336 if ui.config('ui', 'patch'): |
1336 if ui.config('ui', 'patch'): |
1337 ui.write(_(" (Current patch tool may be incompatible with patch," |
1337 ui.write(_(" (Current patch tool may be incompatible with patch," |
1338 " or misconfigured. Please check your .hgrc file)\n")) |
1338 " or misconfigured. Please check your configuration" |
|
1339 " file)\n")) |
1339 else: |
1340 else: |
1340 ui.write(_(" Internal patcher failure, please report this error" |
1341 ui.write(_(" Internal patcher failure, please report this error" |
1341 " to http://mercurial.selenic.com/bts/\n")) |
1342 " to http://mercurial.selenic.com/bts/\n")) |
1342 problems += patchproblems |
1343 problems += patchproblems |
1343 |
1344 |
1349 editor = ui.geteditor() |
1350 editor = ui.geteditor() |
1350 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0]) |
1351 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0]) |
1351 if not cmdpath: |
1352 if not cmdpath: |
1352 if editor == 'vi': |
1353 if editor == 'vi': |
1353 ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
1354 ui.write(_(" No commit editor set and can't find vi in PATH\n")) |
1354 ui.write(_(" (specify a commit editor in your .hgrc file)\n")) |
1355 ui.write(_(" (specify a commit editor in your configuration" |
|
1356 " file)\n")) |
1355 else: |
1357 else: |
1356 ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
1358 ui.write(_(" Can't find editor '%s' in PATH\n") % editor) |
1357 ui.write(_(" (specify a commit editor in your .hgrc file)\n")) |
1359 ui.write(_(" (specify a commit editor in your configuration" |
|
1360 " file)\n")) |
1358 problems += 1 |
1361 problems += 1 |
1359 |
1362 |
1360 # check username |
1363 # check username |
1361 ui.status(_("Checking username...\n")) |
1364 ui.status(_("Checking username...\n")) |
1362 try: |
1365 try: |
1363 ui.username() |
1366 ui.username() |
1364 except util.Abort, e: |
1367 except util.Abort, e: |
1365 ui.write(" %s\n" % e) |
1368 ui.write(" %s\n" % e) |
1366 ui.write(_(" (specify a username in your .hgrc file)\n")) |
1369 ui.write(_(" (specify a username in your configuration file)\n")) |
1367 problems += 1 |
1370 problems += 1 |
1368 |
1371 |
1369 if not problems: |
1372 if not problems: |
1370 ui.status(_("No problems detected\n")) |
1373 ui.status(_("No problems detected\n")) |
1371 else: |
1374 else: |
2722 """show aliases for remote repositories |
2725 """show aliases for remote repositories |
2723 |
2726 |
2724 Show definition of symbolic path name NAME. If no name is given, |
2727 Show definition of symbolic path name NAME. If no name is given, |
2725 show definition of all available names. |
2728 show definition of all available names. |
2726 |
2729 |
2727 Path names are defined in the [paths] section of |
2730 Path names are defined in the [paths] section of your |
2728 ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a |
2731 configuration file and in ``/etc/mercurial/hgrc``. If run inside a |
2729 repository, ``.hg/hgrc`` is used, too. |
2732 repository, ``.hg/hgrc`` is used, too. |
2730 |
2733 |
2731 The path names ``default`` and ``default-push`` have a special |
2734 The path names ``default`` and ``default-push`` have a special |
2732 meaning. When performing a push or pull operation, they are used |
2735 meaning. When performing a push or pull operation, they are used |
2733 as fallbacks if no location is specified on the command-line. |
2736 as fallbacks if no location is specified on the command-line. |
2958 |
2961 |
2959 def resolve(ui, repo, *pats, **opts): |
2962 def resolve(ui, repo, *pats, **opts): |
2960 """redo merges or set/view the merge status of files |
2963 """redo merges or set/view the merge status of files |
2961 |
2964 |
2962 Merges with unresolved conflicts are often the result of |
2965 Merges with unresolved conflicts are often the result of |
2963 non-interactive merging using the ``internal:merge`` hgrc setting, |
2966 non-interactive merging using the ``internal:merge`` configuration |
2964 or a command-line merge tool like ``diff3``. The resolve command |
2967 setting, or a command-line merge tool like ``diff3``. The resolve |
2965 is used to manage the files involved in a merge, after :hg:`merge` |
2968 command is used to manage the files involved in a merge, after |
2966 has been run, and before :hg:`commit` is run (i.e. the working |
2969 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the |
2967 directory must have two parents). |
2970 working directory must have two parents). |
2968 |
2971 |
2969 The resolve command can be used in the following ways: |
2972 The resolve command can be used in the following ways: |
2970 |
2973 |
2971 - :hg:`resolve FILE...`: attempt to re-merge the specified files, |
2974 - :hg:`resolve FILE...`: attempt to re-merge the specified files, |
2972 discarding any previous merge attempts. Re-merging is not |
2975 discarding any previous merge attempts. Re-merging is not |