1868 elif st == 'iter': |
1868 elif st == 'iter': |
1869 if count == limit: break |
1869 if count == limit: break |
1870 if displayer.flush(rev): |
1870 if displayer.flush(rev): |
1871 count += 1 |
1871 count += 1 |
1872 |
1872 |
1873 def manifest(ui, repo, rev=None): |
1873 def manifest(ui, repo, node=None, rev=None): |
1874 """output the current or given revision of the project manifest |
1874 """output the current or given revision of the project manifest |
1875 |
1875 |
1876 Print a list of version controlled files for the given revision. |
1876 Print a list of version controlled files for the given revision. |
1877 If no revision is given, the parent of the working directory is used, |
1877 If no revision is given, the parent of the working directory is used, |
1878 or tip if no revision is checked out. |
1878 or tip if no revision is checked out. |
2977 ('p', 'patch', None, _('show patch')), |
2982 ('p', 'patch', None, _('show patch')), |
2978 ('P', 'prune', [], _('do not display revision or any of its ancestors')), |
2983 ('P', 'prune', [], _('do not display revision or any of its ancestors')), |
2979 ('', 'template', '', _('display with template')), |
2984 ('', 'template', '', _('display with template')), |
2980 ] + walkopts, |
2985 ] + walkopts, |
2981 _('hg log [OPTION]... [FILE]')), |
2986 _('hg log [OPTION]... [FILE]')), |
2982 "manifest": (manifest, [], _('hg manifest [REV]')), |
2987 "manifest": (manifest, [('r', 'rev', '', _('revision to display'))], |
|
2988 _('hg manifest [-r REV]')), |
2983 "^merge": |
2989 "^merge": |
2984 (merge, |
2990 (merge, |
2985 [('f', 'force', None, _('force a merge with outstanding changes')), |
2991 [('f', 'force', None, _('force a merge with outstanding changes')), |
2986 ('r', 'rev', '', _('revision to merge')), |
2992 ('r', 'rev', '', _('revision to merge')), |
2987 ], |
2993 ], |