Show More
@@ -145,11 +145,14 b' def make_file(repo, r, pat, node=None,' | |||||
145 | return open(make_filename(repo, r, pat, node, total, seqno, revwidth), |
|
145 | return open(make_filename(repo, r, pat, node, total, seqno, revwidth), | |
146 | mode) |
|
146 | mode) | |
147 |
|
147 | |||
148 | def dodiff(fp, ui, repo, files=None, node1=None, node2=None, match=util.always): |
|
148 | def dodiff(fp, ui, repo, files=None, node1=None, node2=None, match=util.always, changes=None): | |
149 | def date(c): |
|
149 | def date(c): | |
150 | return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) |
|
150 | return time.asctime(time.gmtime(float(c[2].split(' ')[0]))) | |
151 |
|
151 | |||
152 | (c, a, d, u) = repo.changes(node1, node2, files, match = match) |
|
152 | if not changes: | |
|
153 | (c, a, d, u) = repo.changes(node1, node2, files, match = match) | |||
|
154 | else: | |||
|
155 | (c, a, d, u) = changes | |||
153 | if files: |
|
156 | if files: | |
154 | c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) |
|
157 | c, a, d = map(lambda x: filterfiles(files, x), (c, a, d)) | |
155 |
|
158 |
General Comments 0
You need to be logged in to leave comments.
Login now