Show More
@@ -30,6 +30,7 b' from mercurial import (' | |||
|
30 | 30 | localrepo, |
|
31 | 31 | lock, |
|
32 | 32 | node, |
|
33 | pycompat, | |
|
33 | 34 | registrar, |
|
34 | 35 | util, |
|
35 | 36 | ) |
@@ -133,7 +134,7 b' def _mergeentriesiter(*iterables, **kwar' | |||
|
133 | 134 | |
|
134 | 135 | Note that by default entries go from most recent to oldest. |
|
135 | 136 | """ |
|
136 | order = kwargs.pop('order', max) | |
|
137 | order = kwargs.pop(r'order', max) | |
|
137 | 138 | iterables = [iter(it) for it in iterables] |
|
138 | 139 | # this tracks still active iterables; iterables are deleted as they are |
|
139 | 140 | # exhausted, which is why this is a dictionary and why each entry also |
@@ -458,6 +459,7 b' def journal(ui, repo, *args, **opts):' | |||
|
458 | 459 | `hg journal -T json` can be used to produce machine readable output. |
|
459 | 460 | |
|
460 | 461 | """ |
|
462 | opts = pycompat.byteskwargs(opts) | |
|
461 | 463 | name = '.' |
|
462 | 464 | if opts.get('all'): |
|
463 | 465 | if args: |
General Comments 0
You need to be logged in to leave comments.
Login now