Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 12083:ebfc46929f3e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: refer to user configuration file more consistently Currently, a number of commands and help topics mention the user hgrc file in different ways. Among these are following: 1. .hgrc - "please specify your commit editor/username in your .hgrc file", bookmarks, color, hgk, pager, hg help environment 2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1) 3. ~/.hgrc - hgrc(5) In addition to being inconsistent, none of these make sense on Windows. This patch replaces the above with a more general term of "[your] configuration file".
author Brodie Rao <brodie@bitheap.org>
date Fri, 27 Aug 2010 22:36:35 -0400
parents a4fbbe0fbc38
children ff7c1118a83a 090dc5eef746
comparison
equal deleted inserted replaced
12081:787a5a71e524 12083:ebfc46929f3e
1339 patchproblems += 1 1339 patchproblems += 1
1340 1340
1341 if patchproblems: 1341 if patchproblems:
1342 if ui.config('ui', 'patch'): 1342 if ui.config('ui', 'patch'):
1343 ui.write(_(" (Current patch tool may be incompatible with patch," 1343 ui.write(_(" (Current patch tool may be incompatible with patch,"
1344 " or misconfigured. Please check your .hgrc file)\n")) 1344 " or misconfigured. Please check your configuration"
1345 " file)\n"))
1345 else: 1346 else:
1346 ui.write(_(" Internal patcher failure, please report this error" 1347 ui.write(_(" Internal patcher failure, please report this error"
1347 " to http://mercurial.selenic.com/bts/\n")) 1348 " to http://mercurial.selenic.com/bts/\n"))
1348 problems += patchproblems 1349 problems += patchproblems
1349 1350
1355 editor = ui.geteditor() 1356 editor = ui.geteditor()
1356 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0]) 1357 cmdpath = util.find_exe(editor) or util.find_exe(editor.split()[0])
1357 if not cmdpath: 1358 if not cmdpath:
1358 if editor == 'vi': 1359 if editor == 'vi':
1359 ui.write(_(" No commit editor set and can't find vi in PATH\n")) 1360 ui.write(_(" No commit editor set and can't find vi in PATH\n"))
1360 ui.write(_(" (specify a commit editor in your .hgrc file)\n")) 1361 ui.write(_(" (specify a commit editor in your configuration"
1362 " file)\n"))
1361 else: 1363 else:
1362 ui.write(_(" Can't find editor '%s' in PATH\n") % editor) 1364 ui.write(_(" Can't find editor '%s' in PATH\n") % editor)
1363 ui.write(_(" (specify a commit editor in your .hgrc file)\n")) 1365 ui.write(_(" (specify a commit editor in your configuration"
1366 " file)\n"))
1364 problems += 1 1367 problems += 1
1365 1368
1366 # check username 1369 # check username
1367 ui.status(_("Checking username...\n")) 1370 ui.status(_("Checking username...\n"))
1368 try: 1371 try:
1369 user = ui.username() 1372 user = ui.username()
1370 except util.Abort, e: 1373 except util.Abort, e:
1371 ui.write(" %s\n" % e) 1374 ui.write(" %s\n" % e)
1372 ui.write(_(" (specify a username in your .hgrc file)\n")) 1375 ui.write(_(" (specify a username in your configuration file)\n"))
1373 problems += 1 1376 problems += 1
1374 1377
1375 if not problems: 1378 if not problems:
1376 ui.status(_("No problems detected\n")) 1379 ui.status(_("No problems detected\n"))
1377 else: 1380 else:
2725 """show aliases for remote repositories 2728 """show aliases for remote repositories
2726 2729
2727 Show definition of symbolic path name NAME. If no name is given, 2730 Show definition of symbolic path name NAME. If no name is given,
2728 show definition of all available names. 2731 show definition of all available names.
2729 2732
2730 Path names are defined in the [paths] section of 2733 Path names are defined in the [paths] section of your
2731 ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a 2734 configuration file and in ``/etc/mercurial/hgrc``. If run inside a
2732 repository, ``.hg/hgrc`` is used, too. 2735 repository, ``.hg/hgrc`` is used, too.
2733 2736
2734 The path names ``default`` and ``default-push`` have a special 2737 The path names ``default`` and ``default-push`` have a special
2735 meaning. When performing a push or pull operation, they are used 2738 meaning. When performing a push or pull operation, they are used
2736 as fallbacks if no location is specified on the command-line. 2739 as fallbacks if no location is specified on the command-line.
2961 2964
2962 def resolve(ui, repo, *pats, **opts): 2965 def resolve(ui, repo, *pats, **opts):
2963 """redo merges or set/view the merge status of files 2966 """redo merges or set/view the merge status of files
2964 2967
2965 Merges with unresolved conflicts are often the result of 2968 Merges with unresolved conflicts are often the result of
2966 non-interactive merging using the ``internal:merge`` hgrc setting, 2969 non-interactive merging using the ``internal:merge`` configuration
2967 or a command-line merge tool like ``diff3``. The resolve command 2970 setting, or a command-line merge tool like ``diff3``. The resolve
2968 is used to manage the files involved in a merge, after :hg:`merge` 2971 command is used to manage the files involved in a merge, after
2969 has been run, and before :hg:`commit` is run (i.e. the working 2972 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
2970 directory must have two parents). 2973 working directory must have two parents).
2971 2974
2972 The resolve command can be used in the following ways: 2975 The resolve command can be used in the following ways:
2973 2976
2974 - :hg:`resolve FILE...`: attempt to re-merge the specified files, 2977 - :hg:`resolve FILE...`: attempt to re-merge the specified files,
2975 discarding any previous merge attempts. Re-merging is not 2978 discarding any previous merge attempts. Re-merging is not