Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 8277:b9403042968a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
write options in "-r/--rev" style in help texts
author Martin Geisler <mg@lazybytes.net>
date Sat, 02 May 2009 19:13:29 +0200
parents 46293a0c7e9f
children 602ed4982f36
comparison
equal deleted inserted replaced
8276:dd50067c2329 8277:b9403042968a
2665 """export the repository via HTTP 2665 """export the repository via HTTP
2666 2666
2667 Start a local HTTP repository browser and pull server. 2667 Start a local HTTP repository browser and pull server.
2668 2668
2669 By default, the server logs accesses to stdout and errors to 2669 By default, the server logs accesses to stdout and errors to
2670 stderr. Use the -A and -E options to log to files. 2670 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
2671 files.
2671 """ 2672 """
2672 2673
2673 if opts["stdio"]: 2674 if opts["stdio"]:
2674 if repo is None: 2675 if repo is None:
2675 raise error.RepoError(_("There is no Mercurial repository here" 2676 raise error.RepoError(_("There is no Mercurial repository here"
2937 will be replaced by the state of the requested revision from the 2938 will be replaced by the state of the requested revision from the
2938 repository. When the requested revision is on a different branch, 2939 repository. When the requested revision is on a different branch,
2939 the working directory will additionally be switched to that 2940 the working directory will additionally be switched to that
2940 branch. 2941 branch.
2941 2942
2942 When there are uncommitted changes, use option -C to discard them, 2943 When there are uncommitted changes, use option -C/--clean to
2943 forcibly replacing the state of the working directory with the 2944 discard them, forcibly replacing the state of the working
2944 requested revision. 2945 directory with the requested revision.
2945 2946
2946 When there are uncommitted changes and option -C is not used, and 2947 When there are uncommitted changes and option -C/--clean is not
2947 the parent revision and requested revision are on the same branch, 2948 used, and the parent revision and requested revision are on the
2948 and one of them is an ancestor of the other, then the new working 2949 same branch, and one of them is an ancestor of the other, then the
2949 directory will contain the requested revision merged with the 2950 new working directory will contain the requested revision merged
2950 uncommitted changes. Otherwise, the update will fail with a 2951 with the uncommitted changes. Otherwise, the update will fail with
2951 suggestion to use 'merge' or 'update -C' instead. 2952 a suggestion to use 'merge' or 'update -C' instead.
2952 2953
2953 If you want to update just one file to an older revision, use 2954 If you want to update just one file to an older revision, use
2954 revert. 2955 revert.
2955 2956
2956 See 'hg help dates' for a list of formats valid for -d/--date. 2957 See 'hg help dates' for a list of formats valid for -d/--date.