Mercurial > hg
changeset 10579:f142fa3c0a8c stable
Make annotate --follow an alias for -f/--file to behave like in older versions
Since 98a0421b9e52 annotate follows copies/renames by default, but the output
of e.g. "annotate --follow --number" should not change without some
deprecation time.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 03 Mar 2010 22:04:59 +0100 |
| parents | d5bd1beff794 |
| children | 612c142b7a82 |
| files | mercurial/commands.py tests/test-annotate.out |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Mar 03 14:50:35 2010 +0100 +++ b/mercurial/commands.py Wed Mar 03 22:04:59 2010 +0100 @@ -99,6 +99,11 @@ anyway, although the results will probably be neither useful nor desirable. """ + if opts.get('follow'): + # --follow is deprecated and now just an alias for -f/--file + # to mimic the behavior of Mercurial before version 1.5 + opts['file'] = 1 + datefunc = ui.quiet and util.shortdate or util.datestr getdate = util.cachefunc(lambda x: datefunc(x[0].date())) @@ -3422,7 +3427,8 @@ "^annotate|blame": (annotate, [('r', 'rev', '', _('annotate the specified revision')), - ('', 'follow', None, _('follow copies and renames (DEPRECATED)')), + ('', 'follow', None, + _('follow copies/renames and list the filename (DEPRECATED)')), ('', 'no-follow', None, _("don't follow copies and renames")), ('a', 'text', None, _('treat all files as text')), ('u', 'user', None, _('list the author (long with -v)')),