# HG changeset patch # User Gregory Szorc # Date 2017-04-01 20:43:52 # Node ID 2b130e26c3a4f99ffc0921740dbc4761750bc34b # Parent 54b1af7324152ec795e40cedfaa590bfbc55e91f commands: update help for "unbundle" Similar to the recent change to "bundle," this command no longer just deals with "changegroup" data. diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -5249,10 +5249,9 @@ def tip(ui, repo, **opts): _('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. """ diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t --- a/tests/test-globalopts.t +++ b/tests/test-globalopts.t @@ -333,7 +333,7 @@ Testing -h/--help: 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 @@ Testing -h/--help: 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 diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -95,7 +95,7 @@ Short help: 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 @@ Short help: 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 @@ Test that default list of commands omits 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 @@ Dish up an empty repo; serve it cold. unbundle - apply one or more changegroup files + apply one or more bundle files diff --git a/tests/test-hgweb-json.t b/tests/test-hgweb-json.t --- a/tests/test-hgweb-json.t +++ b/tests/test-hgweb-json.t @@ -1535,7 +1535,7 @@ help/ shows help topics "topic": "tags" }, { - "summary": "apply one or more changegroup files", + "summary": "apply one or more bundle files", "topic": "unbundle" }, {