equal
deleted
inserted
replaced
90 dir1 = snapshot_node(modified + removed, node1) |
90 dir1 = snapshot_node(modified + removed, node1) |
91 if node2: |
91 if node2: |
92 dir2 = snapshot_node(modified + added, node2) |
92 dir2 = snapshot_node(modified + added, node2) |
93 else: |
93 else: |
94 dir2 = snapshot_wdir(modified + added) |
94 dir2 = snapshot_wdir(modified + added) |
95 util.system('%s %s "%s" "%s"' % |
95 util.system('%s %s %s %s' % |
96 (diffcmd, ' '.join(opts['option']), dir1, dir2), |
96 (util.shellquote(diffcmd), ' '.join(opts['option']), |
|
97 util.shellquote(dir1), util.shellquote(dir2)), |
97 cwd=tmproot) |
98 cwd=tmproot) |
98 return 1 |
99 return 1 |
99 finally: |
100 finally: |
100 ui.note(_('cleaning up temp directory\n')) |
101 ui.note(_('cleaning up temp directory\n')) |
101 shutil.rmtree(tmproot) |
102 shutil.rmtree(tmproot) |