mercurial-scm/hg: comparison mercurial/commands.py

equal deleted inserted replaced

-:6d0cf2a2acad
+:bd8f44638847
 Schedule files to be version controlled and added to the repository.
 The files will be added to the repository at the next commit. To
 undo an add before that, see hg revert.
-If no names are given, add all files in the repository.
+If no names are given, add all files to the repository.
 """
 rejected = None
 exacts = {}
 names = []
 backout changeset with another head (current one by default).
 The --merge option remembers the parent of the working directory
 before starting the backout, then merges the new head with that
 changeset afterwards. This saves you from doing the merge by
-hand. The result of this merge is not committed, as for a normal
+hand. The result of this merge is not committed, as with a normal
 merge.
 See \'hg help dates\' for a list of formats valid for -d/--date.
 '''
 if rev and node:
 revision as good or bad without checking it out first.
 If you supply a command it will be used for automatic bisection. Its exit
 status will be used as flag to mark revision as bad or good. In case exit
 status is 0 the revision is marked as good, 125 - skipped, 127 (command not
-found) - bisection will be aborted and any other status bigger than 0 will
+found) - bisection will be aborted; any other status bigger than 0 will
 mark revision as bad.
 """
 def print_result(nodes, good):
 displayer = cmdutil.show_changeset(ui, repo, {})
 transition = (good and "good" or "bad")
 def bundle(ui, repo, fname, dest=None, **opts):
 """create a changegroup file
 Generate a compressed changegroup file collecting changesets not
-found in the other repository.
+known to be in another repository.
 If no destination repository is specified the destination is
 assumed to have all the nodes specified by one or more --base
 parameters. To create a bundle containing all changesets, use
 --all (or --base null). To change the compression method applied,
 If you are committing the result of a merge, do not provide any
 file names or -I/-X filters.
 If no commit message is specified, the configured editor is started to
-enter a message.
+prompt you for a message.
 See 'hg help dates' for a list of formats valid for -d/--date.
 """
 extra = {}
 if opts.get('close_branch'):
 def copy(ui, repo, *pats, **opts):
 """mark files as copied for the next commit
 Mark dest as having copies of source files. If dest is a
 directory, copies are put in that directory. If dest is a file,
-there can only be one source.
+the source must be a single file.
 By default, this command copies the contents of files as they
 stand in the working directory. If invoked with --after, the
 operation is recorded, but no copying is performed.
-This command takes effect in the next commit. To undo a copy
+This command takes effect with the next commit. To undo a copy
 before that, see hg revert.
 """
 wlock = repo.wlock(False)
 try:
 return cmdutil.copy(ui, repo, pats, opts)
 Without the -a option, diff will avoid generating diffs of files
 it detects as binary. With -a, diff will generate a diff anyway,
 probably with undesirable results.
 Use the --git option to generate diffs in the git extended diff
-format. Read the diffs help topic for more information.
+format. For more information, read hg help diffs.
 """
 revs = opts.get('rev')
 change = opts.get('change')
 non-trivial parents, user, date and time, and a summary for each
 commit. When the -v/--verbose switch is used, the list of changed
 files and full commit message is shown.
 NOTE: log -p may generate unexpected diff output for merge
-changesets, as it will compare the merge changeset against its
+changesets, as it will only compare the merge changeset against
-first parent only. Also, the files: list will only reflect files
+its first parent. Also, the files: list will only reflect files
 that are different from BOTH parents.
 """
 get = util.cachefunc(lambda r: repo[r].changeset())
 Mark dest as copies of sources; mark sources for deletion. If
 dest is a directory, copies are put in that directory. If dest is
 a file, there can only be one source.
 By default, this command copies the contents of files as they
-stand in the working directory. If invoked with --after, the
+exist in the working directory. If invoked with --after, the
 operation is recorded, but no copying is performed.
-This command takes effect in the next commit. To undo a rename
+This command takes effect at the next commit. To undo a rename
 before that, see hg revert.
 """
 wlock = repo.wlock(False)
 try:
 return cmdutil.copy(ui, repo, pats, opts, rename=True)

changeset 7807	bd8f44638847
parent 7765	da9acc68b1dd
child 7829	b61e918ea767