Mercurial > hg-stable
changeset 31798:2b130e26c3a4
commands: update help for "unbundle"
Similar to the recent change to "bundle," this command no longer
just deals with "changegroup" data.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sat, 01 Apr 2017 13:43:52 -0700 |
| parents | 54b1af732415 |
| children | e0dc40530c5a |
| files | mercurial/commands.py tests/test-globalopts.t tests/test-help.t tests/test-hgweb-json.t |
| diffstat | 4 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Apr 01 13:43:43 2017 -0700 +++ b/mercurial/commands.py Sat Apr 01 13:43:52 2017 -0700 @@ -5249,10 +5249,9 @@ _('update to new branch head if changesets were unbundled'))], _('[-u] FILE...')) def unbundle(ui, repo, fname1, *fnames, **opts): - """apply one or more changegroup files - - Apply one or more compressed changegroup files generated by the - bundle command. + """apply one or more bundle files + + Apply one or more bundle files generated by :hg:`bundle`. Returns 0 on success, 1 if an update has unresolved files. """
--- a/tests/test-globalopts.t Sat Apr 01 13:43:43 2017 -0700 +++ b/tests/test-globalopts.t Sat Apr 01 13:43:52 2017 -0700 @@ -333,7 +333,7 @@ summary summarize working directory state tag add one or more tags for the current or given revision tags list repository tags - unbundle apply one or more changegroup files + unbundle apply one or more bundle files update update working directory (or switch revisions) verify verify the integrity of the repository version output version and copyright information @@ -417,7 +417,7 @@ summary summarize working directory state tag add one or more tags for the current or given revision tags list repository tags - unbundle apply one or more changegroup files + unbundle apply one or more bundle files update update working directory (or switch revisions) verify verify the integrity of the repository version output version and copyright information
--- a/tests/test-help.t Sat Apr 01 13:43:43 2017 -0700 +++ b/tests/test-help.t Sat Apr 01 13:43:52 2017 -0700 @@ -95,7 +95,7 @@ summary summarize working directory state tag add one or more tags for the current or given revision tags list repository tags - unbundle apply one or more changegroup files + unbundle apply one or more bundle files update update working directory (or switch revisions) verify verify the integrity of the repository version output version and copyright information @@ -173,7 +173,7 @@ summary summarize working directory state tag add one or more tags for the current or given revision tags list repository tags - unbundle apply one or more changegroup files + unbundle apply one or more bundle files update update working directory (or switch revisions) verify verify the integrity of the repository version output version and copyright information @@ -818,7 +818,7 @@ summary summarize working directory state tag add one or more tags for the current or given revision tags list repository tags - unbundle apply one or more changegroup files + unbundle apply one or more bundle files update update working directory (or switch revisions) verify verify the integrity of the repository version output version and copyright information @@ -2428,7 +2428,7 @@ unbundle </a> </td><td> - apply one or more changegroup files + apply one or more bundle files </td></tr> <tr><td> <a href="/help/verify">