# HG changeset patch # User Thomas Arendsen Hein # Date 1166304819 -3600 # Node ID 283ee89715701948d1d3c35e386bb57bcdcb58ec # Parent dbd82816738484e4c366ddd490eb1d1724414a9c doc string fix: hg cat and manifest default to current parent revision. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -339,7 +339,7 @@ def bundle(ui, repo, fname, dest=None, * changegroup.writebundle(cg, fname, "HG10BZ") def cat(ui, repo, file1, *pats, **opts): - """output the latest or given revisions of files + """output the current or given revision of files Print the specified files as they were at the given revision. If no revision is given then working dir parent is used, or tip @@ -1741,9 +1741,11 @@ def log(ui, repo, *pats, **opts): count += 1 def manifest(ui, repo, rev=None): - """output the latest or given revision of the project manifest + """output the current or given revision of the project manifest Print a list of version controlled files for the given revision. + If no revision is given then working dir parent is used, or tip + if no revision is checked out. The manifest is the list of files being version controlled. If no revision is given then the first parent of the working directory is used. diff --git a/tests/test-globalopts.out b/tests/test-globalopts.out --- a/tests/test-globalopts.out +++ b/tests/test-globalopts.out @@ -125,7 +125,7 @@ list of commands (use "hg help -v" to sh branch set or show the current branch name branches list repository named branches bundle create a changegroup file - cat output the latest or given revisions of files + cat output the current or given revision of files clone make a copy of an existing repository commit commit the specified files or all outstanding changes copy mark files as copied for the next commit @@ -140,7 +140,7 @@ list of commands (use "hg help -v" to sh init create a new repository in the given directory locate locate files matching specific patterns log show revision history of entire repository or files - manifest output the latest or given revision of the project manifest + manifest output the current or given revision of the project manifest merge Merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision @@ -175,7 +175,7 @@ list of commands (use "hg help -v" to sh branch set or show the current branch name branches list repository named branches bundle create a changegroup file - cat output the latest or given revisions of files + cat output the current or given revision of files clone make a copy of an existing repository commit commit the specified files or all outstanding changes copy mark files as copied for the next commit @@ -190,7 +190,7 @@ list of commands (use "hg help -v" to sh init create a new repository in the given directory locate locate files matching specific patterns log show revision history of entire repository or files - manifest output the latest or given revision of the project manifest + manifest output the current or given revision of the project manifest merge Merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision diff --git a/tests/test-help.out b/tests/test-help.out --- a/tests/test-help.out +++ b/tests/test-help.out @@ -46,7 +46,7 @@ list of commands (use "hg help -v" to sh branch set or show the current branch name branches list repository named branches bundle create a changegroup file - cat output the latest or given revisions of files + cat output the current or given revision of files clone make a copy of an existing repository commit commit the specified files or all outstanding changes copy mark files as copied for the next commit @@ -61,7 +61,7 @@ list of commands (use "hg help -v" to sh init create a new repository in the given directory locate locate files matching specific patterns log show revision history of entire repository or files - manifest output the latest or given revision of the project manifest + manifest output the current or given revision of the project manifest merge Merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision @@ -92,7 +92,7 @@ list of commands (use "hg help -v" to sh branch set or show the current branch name branches list repository named branches bundle create a changegroup file - cat output the latest or given revisions of files + cat output the current or given revision of files clone make a copy of an existing repository commit commit the specified files or all outstanding changes copy mark files as copied for the next commit @@ -107,7 +107,7 @@ list of commands (use "hg help -v" to sh init create a new repository in the given directory locate locate files matching specific patterns log show revision history of entire repository or files - manifest output the latest or given revision of the project manifest + manifest output the current or given revision of the project manifest merge Merge working directory with another revision outgoing show changesets not found in destination parents show the parents of the working dir or revision