# HG changeset patch # User Bryan O'Sullivan # Date 1124915205 25200 # Node ID 8dbbea5bc844b853f1acc1ac87d84727e629699c # Parent 5426c8248df688a4205c35cd71a35d60985d5418 Fix help output, and a few broken tests. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -896,6 +896,8 @@ def log(ui, repo, *pats, **opts): def bump(self, rev): self.rev = rev self.hunk[rev] = [] + def note(self, *args): + if self.verbose: self.write(*args) def status(self, *args): if not self.quiet: self.write(*args) def write(self, *args): diff --git a/tests/test-help.out b/tests/test-help.out --- a/tests/test-help.out +++ b/tests/test-help.out @@ -9,7 +9,7 @@ basic commands (use "hg help" for the fu diff diff working directory (or selected files) export dump the header and diffs for one or more changesets init create a new repository in the given directory - log show the revision history of the repository or a single file + log show revision history of entire repository or files pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -24,7 +24,7 @@ basic commands (use "hg help" for the fu diff diff working directory (or selected files) export dump the header and diffs for one or more changesets init create a new repository in the given directory - log show the revision history of the repository or a single file + log show revision history of entire repository or files pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -53,7 +53,7 @@ list of commands (use "hg help -v" to sh incoming show new changesets found in source init create a new repository in the given directory locate locate files matching specific patterns - log show the revision history of the repository or a single file + log show revision history of entire repository or files manifest output the latest or given revision of the project manifest outgoing show changesets not found in destination parents show the parents of the working dir or revision @@ -91,7 +91,7 @@ list of commands (use "hg help -v" to sh incoming show new changesets found in source init create a new repository in the given directory locate locate files matching specific patterns - log show the revision history of the repository or a single file + log show revision history of entire repository or files manifest output the latest or given revision of the project manifest outgoing show changesets not found in destination parents show the parents of the working dir or revision @@ -186,7 +186,7 @@ basic commands (use "hg help" for the fu diff diff working directory (or selected files) export dump the header and diffs for one or more changesets init create a new repository in the given directory - log show the revision history of the repository or a single file + log show revision history of entire repository or files pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -206,7 +206,7 @@ basic commands (use "hg help" for the fu diff diff working directory (or selected files) export dump the header and diffs for one or more changesets init create a new repository in the given directory - log show the revision history of the repository or a single file + log show revision history of entire repository or files pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit