equal
deleted
inserted
replaced
3343 _('BRANCH')), |
3343 _('BRANCH')), |
3344 ('b', 'branch', [], |
3344 ('b', 'branch', [], |
3345 _('show changesets within the given named branch'), _('BRANCH')), |
3345 _('show changesets within the given named branch'), _('BRANCH')), |
3346 ('P', 'prune', [], |
3346 ('P', 'prune', [], |
3347 _('do not display revision or any of its ancestors'), _('REV')), |
3347 _('do not display revision or any of its ancestors'), _('REV')), |
|
3348 ('h', 'hidden', False, _('show hidden changesets')), |
3348 ] + logopts + walkopts, |
3349 ] + logopts + walkopts, |
3349 _('[OPTION]... [FILE]')) |
3350 _('[OPTION]... [FILE]')) |
3350 def log(ui, repo, *pats, **opts): |
3351 def log(ui, repo, *pats, **opts): |
3351 """show revision history of entire repository or files |
3352 """show revision history of entire repository or files |
3352 |
3353 |
3403 if opts.get('no_merges') and len(parents) == 2: |
3404 if opts.get('no_merges') and len(parents) == 2: |
3404 return |
3405 return |
3405 if opts.get('only_merges') and len(parents) != 2: |
3406 if opts.get('only_merges') and len(parents) != 2: |
3406 return |
3407 return |
3407 if opts.get('branch') and ctx.branch() not in opts['branch']: |
3408 if opts.get('branch') and ctx.branch() not in opts['branch']: |
|
3409 return |
|
3410 if not opts.get('hidden') and ctx.hidden(): |
3408 return |
3411 return |
3409 if df and not df(ctx.date()[0]): |
3412 if df and not df(ctx.date()[0]): |
3410 return |
3413 return |
3411 if opts['user'] and not [k for k in opts['user'] |
3414 if opts['user'] and not [k for k in opts['user'] |
3412 if k.lower() in ctx.user().lower()]: |
3415 if k.lower() in ctx.user().lower()]: |