equal
deleted
inserted
replaced
86 """ |
86 """ |
87 datefunc = ui.quiet and util.shortdate or util.datestr |
87 datefunc = ui.quiet and util.shortdate or util.datestr |
88 getdate = util.cachefunc(lambda x: datefunc(x[0].date())) |
88 getdate = util.cachefunc(lambda x: datefunc(x[0].date())) |
89 |
89 |
90 if not pats: |
90 if not pats: |
91 raise util.Abort(_('at least one file name or pattern required')) |
91 raise util.Abort(_('at least one filename or pattern is required')) |
92 |
92 |
93 opmap = [('user', lambda x: ui.shortuser(x[0].user())), |
93 opmap = [('user', lambda x: ui.shortuser(x[0].user())), |
94 ('number', lambda x: str(x[0].rev())), |
94 ('number', lambda x: str(x[0].rev())), |
95 ('changeset', lambda x: short(x[0].node())), |
95 ('changeset', lambda x: short(x[0].node())), |
96 ('date', getdate), |
96 ('date', getdate), |
628 |
628 |
629 If a list of files is omitted, all changes reported by "hg status" |
629 If a list of files is omitted, all changes reported by "hg status" |
630 will be committed. |
630 will be committed. |
631 |
631 |
632 If you are committing the result of a merge, do not provide any |
632 If you are committing the result of a merge, do not provide any |
633 file names or -I/-X filters. |
633 filenames or -I/-X filters. |
634 |
634 |
635 If no commit message is specified, the configured editor is |
635 If no commit message is specified, the configured editor is |
636 started to prompt you for a message. |
636 started to prompt you for a message. |
637 |
637 |
638 See 'hg help dates' for a list of formats valid for -d/--date. |
638 See 'hg help dates' for a list of formats valid for -d/--date. |
1892 |
1892 |
1893 Print the revision history of the specified files or the entire |
1893 Print the revision history of the specified files or the entire |
1894 project. |
1894 project. |
1895 |
1895 |
1896 File history is shown without following rename or copy history of |
1896 File history is shown without following rename or copy history of |
1897 files. Use -f/--follow with a file name to follow history across |
1897 files. Use -f/--follow with a filename to follow history across |
1898 renames and copies. --follow without a file name will only show |
1898 renames and copies. --follow without a filename will only show |
1899 ancestors or descendants of the starting revision. --follow-first |
1899 ancestors or descendants of the starting revision. --follow-first |
1900 only follows the first parent of merge revisions. |
1900 only follows the first parent of merge revisions. |
1901 |
1901 |
1902 If no revision range is specified, the default is tip:0 unless |
1902 If no revision range is specified, the default is tip:0 unless |
1903 --follow is set, in which case the working directory parent is |
1903 --follow is set, in which case the working directory parent is |
2149 ctx = repo[None] |
2149 ctx = repo[None] |
2150 |
2150 |
2151 if file_: |
2151 if file_: |
2152 m = cmdutil.match(repo, (file_,), opts) |
2152 m = cmdutil.match(repo, (file_,), opts) |
2153 if m.anypats() or len(m.files()) != 1: |
2153 if m.anypats() or len(m.files()) != 1: |
2154 raise util.Abort(_('can only specify an explicit file name')) |
2154 raise util.Abort(_('can only specify an explicit filename')) |
2155 file_ = m.files()[0] |
2155 file_ = m.files()[0] |
2156 filenodes = [] |
2156 filenodes = [] |
2157 for cp in ctx.parents(): |
2157 for cp in ctx.parents(): |
2158 if not cp: |
2158 if not cp: |
2159 continue |
2159 continue |