| yuja |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| cmdutil, | cmdutil, | ||||
| dispatch, | dispatch, | ||||
| error, | error, | ||||
| extensions, | extensions, | ||||
| hg, | hg, | ||||
| localrepo, | localrepo, | ||||
| lock, | lock, | ||||
| node, | node, | ||||
| pycompat, | |||||
| registrar, | registrar, | ||||
| util, | util, | ||||
| ) | ) | ||||
| from . import share | from . import share | ||||
| cmdtable = {} | cmdtable = {} | ||||
| command = registrar.command(cmdtable) | command = registrar.command(cmdtable) | ||||
| raise | raise | ||||
| return set() | return set() | ||||
| def _mergeentriesiter(*iterables, **kwargs): | def _mergeentriesiter(*iterables, **kwargs): | ||||
| """Given a set of sorted iterables, yield the next entry in merged order | """Given a set of sorted iterables, yield the next entry in merged order | ||||
| Note that by default entries go from most recent to oldest. | Note that by default entries go from most recent to oldest. | ||||
| """ | """ | ||||
| order = kwargs.pop('order', max) | order = kwargs.pop(r'order', max) | ||||
| iterables = [iter(it) for it in iterables] | iterables = [iter(it) for it in iterables] | ||||
| # this tracks still active iterables; iterables are deleted as they are | # this tracks still active iterables; iterables are deleted as they are | ||||
| # exhausted, which is why this is a dictionary and why each entry also | # exhausted, which is why this is a dictionary and why each entry also | ||||
| # stores the key. Entries are mutable so we can store the next value each | # stores the key. Entries are mutable so we can store the next value each | ||||
| # time. | # time. | ||||
| iterable_map = {} | iterable_map = {} | ||||
| for key, it in enumerate(iterables): | for key, it in enumerate(iterables): | ||||
| try: | try: | ||||
| Use -c/--commits to output log information on each commit hash; at this | Use -c/--commits to output log information on each commit hash; at this | ||||
| point you can use the usual `--patch`, `--git`, `--stat` and `--template` | point you can use the usual `--patch`, `--git`, `--stat` and `--template` | ||||
| switches to alter the log output for these. | switches to alter the log output for these. | ||||
| `hg journal -T json` can be used to produce machine readable output. | `hg journal -T json` can be used to produce machine readable output. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | |||||
| name = '.' | name = '.' | ||||
| if opts.get('all'): | if opts.get('all'): | ||||
| if args: | if args: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _("You can't combine --all and filtering on a name")) | _("You can't combine --all and filtering on a name")) | ||||
| name = None | name = None | ||||
| if args: | if args: | ||||
| name = args[0] | name = args[0] | ||||