hgext/journal.py
changeset 39704 aa647457df14
parent 39703 2fb88fa2b337
child 40293 c303d65d2e34
equal deleted inserted replaced
39703:2fb88fa2b337 39704:aa647457df14
   506         fm.condwrite(ui.verbose, 'date', ' %s',
   506         fm.condwrite(ui.verbose, 'date', ' %s',
   507                      fm.formatdate(entry.timestamp, '%Y-%m-%d %H:%M %1%2'))
   507                      fm.formatdate(entry.timestamp, '%Y-%m-%d %H:%M %1%2'))
   508         fm.write('command', '  %s\n', entry.command)
   508         fm.write('command', '  %s\n', entry.command)
   509 
   509 
   510         if opts.get("commits"):
   510         if opts.get("commits"):
   511             displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
   511             if fm.isplain():
       
   512                 displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
       
   513             else:
       
   514                 displayer = logcmdutil.changesetformatter(
       
   515                     ui, repo, fm.nested('changesets'), diffopts=opts)
   512             for hash in entry.newhashes:
   516             for hash in entry.newhashes:
   513                 try:
   517                 try:
   514                     ctx = repo[hash]
   518                     ctx = repo[hash]
   515                     displayer.show(ctx)
   519                     displayer.show(ctx)
   516                 except error.RepoLookupError as e:
   520                 except error.RepoLookupError as e: