equal
deleted
inserted
replaced
103 if node2: |
103 if node2: |
104 dir2 = snapshot_node(modified + added, node2) |
104 dir2 = snapshot_node(modified + added, node2) |
105 else: |
105 else: |
106 dir2 = snapshot_wdir(modified + added) |
106 dir2 = snapshot_wdir(modified + added) |
107 cmdline = ('%s %s %s %s' % |
107 cmdline = ('%s %s %s %s' % |
108 (util.shellquote(diffcmd), |
108 (util.shellquote(diffcmd), ' '.join(diffopts), |
109 ' '.join(map(util.shellquote, diffopts)), |
|
110 util.shellquote(dir1), util.shellquote(dir2))) |
109 util.shellquote(dir1), util.shellquote(dir2))) |
111 ui.debug('running %r in %s\n' % (cmdline, tmproot)) |
110 ui.debug('running %r in %s\n' % (cmdline, tmproot)) |
112 util.system(cmdline, cwd=tmproot) |
111 util.system(cmdline, cwd=tmproot) |
113 return 1 |
112 return 1 |
114 finally: |
113 finally: |