mercurial-crew-with-dirclash: comparison mercurial/commands.py

equal deleted inserted replaced

-:67afecb8d6cc
+:13d23d66a6cd
 elif st == 'iter':
 if count == limit: break
 if displayer.flush(rev):
 count += 1
-def manifest(ui, repo, rev=None):
+def manifest(ui, repo, node=None, rev=None):
 """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, the parent of the working directory is used,
 or tip if no revision is checked out.
 With -v flag, print file permissions. With --debug flag, print
 file revision hashes.
 """
-m = repo.changectx(rev).manifest()
+if rev and node:
+raise util.Abort(_("please specify just one revision"))
+if not node:
+node = rev
+m = repo.changectx(node).manifest()
 files = m.keys()
 files.sort()
 for f in files:
 if ui.debugflag:
 revision to merge with must be provided.
 """
 if rev and node:
 raise util.Abort(_("please specify just one revision"))
 if not node:
 node = rev
 if not node:
 heads = repo.heads()
 ('p', 'patch', None, _('show patch')),
 ('P', 'prune', [], _('do not display revision or any of its ancestors')),
 ('', 'template', '', _('display with template')),
 ] + walkopts,
 _('hg log [OPTION]... [FILE]')),
-"manifest": (manifest, [], _('hg manifest [REV]')),
+"manifest": (manifest, [('r', 'rev', '', _('revision to display'))],
+_('hg manifest [-r REV]')),
 "^merge":
 (merge,
 [('f', 'force', None, _('force a merge with outstanding changes')),
 ('r', 'rev', '', _('revision to merge')),
 ],