diff --git a/mercurial/commands.py b/mercurial/commands.py index b3ec0b5fd7771b401392a83f47e0c2360e7f6d90_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..e689b0d9154605b8b04989c4fdd36e76d6cf26b8_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644 --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -4495,7 +4495,7 @@ else: ui.write("%s = %s\n" % (name, util.hidepassword(path))) -@command('^phase', +@command('phase', [('p', 'public', False, _('set changeset phase to public')), ('d', 'draft', False, _('set changeset phase to draft')), ('s', 'secret', False, _('set changeset phase to secret')), diff --git a/tests/test-alias.t b/tests/test-alias.t index b3ec0b5fd7771b401392a83f47e0c2360e7f6d90_dGVzdHMvdGVzdC1hbGlhcy50..e689b0d9154605b8b04989c4fdd36e76d6cf26b8_dGVzdHMvdGVzdC1hbGlhcy50 100644 --- a/tests/test-alias.t +++ b/tests/test-alias.t @@ -350,7 +350,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -377,7 +376,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -404,7 +402,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit diff --git a/tests/test-commandserver.py.out b/tests/test-commandserver.py.out index b3ec0b5fd7771b401392a83f47e0c2360e7f6d90_dGVzdHMvdGVzdC1jb21tYW5kc2VydmVyLnB5Lm91dA==..e689b0d9154605b8b04989c4fdd36e76d6cf26b8_dGVzdHMvdGVzdC1jb21tYW5kc2VydmVyLnB5Lm91dA== 100644 --- a/tests/test-commandserver.py.out +++ b/tests/test-commandserver.py.out @@ -26,7 +26,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit diff --git a/tests/test-debugcomplete.t b/tests/test-debugcomplete.t index b3ec0b5fd7771b401392a83f47e0c2360e7f6d90_dGVzdHMvdGVzdC1kZWJ1Z2NvbXBsZXRlLnQ=..e689b0d9154605b8b04989c4fdd36e76d6cf26b8_dGVzdHMvdGVzdC1kZWJ1Z2NvbXBsZXRlLnQ= 100644 --- a/tests/test-debugcomplete.t +++ b/tests/test-debugcomplete.t @@ -201,7 +201,6 @@ init: ssh, remotecmd, insecure log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, hidden, patch, git, limit, no-merges, stat, graph, style, template, include, exclude merge: force, rev, preview, tool - phase: public, draft, secret, force, rev pull: update, force, rev, bookmark, branch, ssh, remotecmd, insecure push: force, rev, bookmark, branch, new-branch, ssh, remotecmd, insecure remove: after, force, include, exclude @@ -261,6 +260,7 @@ outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, graph, style, template, ssh, remotecmd, insecure, subrepos parents: rev, style, template paths: + phase: public, draft, secret, force, rev recover: rename: after, force, include, exclude, dry-run resolve: all, list, mark, unmark, no-status, tool, include, exclude diff --git a/tests/test-help.t b/tests/test-help.t index b3ec0b5fd7771b401392a83f47e0c2360e7f6d90_dGVzdHMvdGVzdC1oZWxwLnQ=..e689b0d9154605b8b04989c4fdd36e76d6cf26b8_dGVzdHMvdGVzdC1oZWxwLnQ= 100644 --- a/tests/test-help.t +++ b/tests/test-help.t @@ -15,7 +15,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -37,7 +36,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -222,7 +220,6 @@ init create a new repository in the given directory log, history show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove, rm remove the specified files on the next commit @@ -536,7 +533,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -564,7 +560,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit diff --git a/tests/test-strict.t b/tests/test-strict.t index b3ec0b5fd7771b401392a83f47e0c2360e7f6d90_dGVzdHMvdGVzdC1zdHJpY3QudA==..e689b0d9154605b8b04989c4fdd36e76d6cf26b8_dGVzdHMvdGVzdC1zdHJpY3QudA== 100644 --- a/tests/test-strict.t +++ b/tests/test-strict.t @@ -29,7 +29,6 @@ init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision - phase set or show the current phase name pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit