Show More
@@ -401,13 +401,14 b' def dodiff(ui, repo, cmdline, pats, opts' | |||
|
401 | 401 | if node2 is None: |
|
402 | 402 | raise error.Abort(_(b'--patch requires two revisions')) |
|
403 | 403 | else: |
|
404 | mod_a, add_a, rem_a = map( | |
|
405 | set, repo.status(node1a, node2, matcher, listsubrepos=subrepos)[:3] | |
|
406 | ) | |
|
404 | st = repo.status(node1a, node2, matcher, listsubrepos=subrepos) | |
|
405 | mod_a, add_a, rem_a = set(st.modified), set(st.added), set(st.removed) | |
|
407 | 406 | if do3way: |
|
408 | mod_b, add_b, rem_b = map( | |
|
409 | set, | |
|
410 | repo.status(node1b, node2, matcher, listsubrepos=subrepos)[:3], | |
|
407 | stb = repo.status(node1b, node2, matcher, listsubrepos=subrepos) | |
|
408 | mod_b, add_b, rem_b = ( | |
|
409 | set(stb.modified), | |
|
410 | set(stb.added), | |
|
411 | set(stb.removed), | |
|
411 | 412 | ) |
|
412 | 413 | else: |
|
413 | 414 | mod_b, add_b, rem_b = set(), set(), set() |
General Comments 0
You need to be logged in to leave comments.
Login now