Show More
@@ -969,17 +969,17 b' def _getmergerevs(repo, opts):' | |||
|
969 | 969 | input: options dictionnary with `rev`, `from` and `bse` |
|
970 | 970 | output: (localctx, otherctx, basectx) |
|
971 | 971 | """ |
|
972 | if opts['from']: | |
|
973 | fromrev = scmutil.revsingle(repo, opts['from']) | |
|
972 | if opts[b'from']: | |
|
973 | fromrev = scmutil.revsingle(repo, opts[b'from']) | |
|
974 | 974 | wctx = repo[fromrev] |
|
975 | 975 | else: |
|
976 | 976 | wctx = repo[None] |
|
977 | 977 | # we don't want working dir files to be stat'd in the benchmark, so |
|
978 | 978 | # prime that cache |
|
979 | 979 | wctx.dirty() |
|
980 | rctx = scmutil.revsingle(repo, opts['rev'], opts['rev']) | |
|
981 | if opts['base']: | |
|
982 | fromrev = scmutil.revsingle(repo, opts['base']) | |
|
980 | rctx = scmutil.revsingle(repo, opts[b'rev'], opts[b'rev']) | |
|
981 | if opts[b'base']: | |
|
982 | fromrev = scmutil.revsingle(repo, opts[b'base']) | |
|
983 | 983 | ancestor = repo[fromrev] |
|
984 | 984 | else: |
|
985 | 985 | ancestor = wctx.ancestor(rctx) |
General Comments 0
You need to be logged in to leave comments.
Login now