Mercurial > hg
changeset 9617:fafd653134d0
Merge with crew
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 19 Oct 2009 23:53:25 -0500 |
| parents | 69f8ac71ded1 (diff) 0fedf8233b21 (current diff) |
| children | d75a309a24b1 |
| files | mercurial/commands.py |
| diffstat | 5 files changed, 11 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue Oct 20 00:30:36 2009 +0200 +++ b/mercurial/commands.py Mon Oct 19 23:53:25 2009 -0500 @@ -2921,7 +2921,10 @@ elif pnode not in bheads: t += _(' (new branch head)') - ui.write(_('commit: %s\n') % t.strip()) + if 'clean' in t: + ui.status(_('commit: %s\n') % t.strip()) + else: + ui.write(_('commit: %s\n') % t.strip()) # all ancestors of branch heads - all ancestors of parent = new csets new = [0] * len(repo) @@ -2933,7 +2936,7 @@ new = sum(new) if new == 0: - ui.write(_('update: (current)\n')) + ui.status(_('update: (current)\n')) elif pnode not in bheads: ui.write(_('update: %d new changesets (update)\n') % new) else: @@ -3331,7 +3334,7 @@ ] + walkopts + dryrunopts, _('[OPTION]... [SOURCE]... DEST')), "debugancestor": (debugancestor, [], _('[INDEX] REV1 REV2')), - "debugcheckstate": (debugcheckstate, []), + "debugcheckstate": (debugcheckstate, [], ''), "debugcommands": (debugcommands, [], _('[COMMAND]')), "debugcomplete": (debugcomplete, @@ -3345,7 +3348,7 @@ "debugfsinfo": (debugfsinfo, [], _('[PATH]')), "debugindex": (debugindex, [], _('FILE')), "debugindexdot": (debugindexdot, [], _('FILE')), - "debuginstall": (debuginstall, []), + "debuginstall": (debuginstall, [], ''), "debugrebuildstate": (debugrebuildstate, [('r', 'rev', '', _('revision to rebuild to'))], @@ -3491,7 +3494,7 @@ ('n', 'newest-first', None, _('show newest record first')), ] + logopts + remoteopts, _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')), - "^parents": + "parents": (parents, [('r', 'rev', '', _('show parents from the specified revision')), ] + templateopts, @@ -3572,7 +3575,7 @@ [('u', 'untrusted', None, _('show untrusted configuration options'))], _('[-u] [NAME]...')), "^summary|sum": - (summary, []), + (summary, [], ''), "^status|st": (status, [('A', 'all', None, _('show status of all files')), @@ -3600,7 +3603,7 @@ ('m', 'message', '', _('use <text> as commit message')), ] + commitopts2, _('[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')), - "tags": (tags, []), + "tags": (tags, [], ''), "tip": (tip, [('p', 'patch', None, _('show patch')),
--- a/tests/test-debugcomplete.out Tue Oct 20 00:30:36 2009 +0200 +++ b/tests/test-debugcomplete.out Mon Oct 19 23:53:25 2009 -0500 @@ -173,7 +173,6 @@ init: ssh, remotecmd log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, prune, patch, git, limit, no-merges, style, template, include, exclude merge: force, rev, preview -parents: rev, style, template pull: update, force, rev, ssh, remotecmd push: force, rev, ssh, remotecmd remove: after, force, include, exclude @@ -215,6 +214,7 @@ locate: rev, print0, fullpath, include, exclude manifest: rev outgoing: force, rev, newest-first, patch, git, limit, no-merges, style, template, ssh, remotecmd +parents: rev, style, template paths: recover: rename: after, force, include, exclude, dry-run
--- a/tests/test-help.out Tue Oct 20 00:30:36 2009 +0200 +++ b/tests/test-help.out Mon Oct 19 23:53:25 2009 -0500 @@ -12,7 +12,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 - parents show the parents of the working directory or revision pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -32,7 +31,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 - parents show the parents of the working directory or revision pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -317,7 +315,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 - parents show the parents of the working directory or revision pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit @@ -342,7 +339,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 - parents show the parents of the working directory or revision pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit
--- a/tests/test-qrecord.out Tue Oct 20 00:30:36 2009 +0200 +++ b/tests/test-qrecord.out Mon Oct 19 23:53:25 2009 -0500 @@ -14,7 +14,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 - parents show the parents of the working directory or revision pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit
--- a/tests/test-strict.out Tue Oct 20 00:30:36 2009 +0200 +++ b/tests/test-strict.out Mon Oct 19 23:53:25 2009 -0500 @@ -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 - parents show the parents of the working directory or revision pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit