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