Show More
@@ -276,6 +276,13 b' def make_file(repo, r, pat, node=None,' | |||
|
276 | 276 | |
|
277 | 277 | def dodiff(fp, ui, repo, node1, node2, files=None, match=util.always, |
|
278 | 278 | changes=None, text=False, opts={}): |
|
279 | if node1: | |
|
280 | # reading the data for node1 early allows it to play nicely | |
|
281 | # with repo.changes and the revlog cache. | |
|
282 | change = repo.changelog.read(node1) | |
|
283 | mmap = repo.manifest.read(change[0]) | |
|
284 | date1 = util.datestr(change[2]) | |
|
285 | ||
|
279 | 286 | if not changes: |
|
280 | 287 | changes = repo.changes(node1, node2, files, match=match) |
|
281 | 288 | modified, added, removed, deleted, unknown = changes |
@@ -296,6 +303,9 b' def dodiff(fp, ui, repo, node1, node2, f' | |||
|
296 | 303 | date2 = util.datestr() |
|
297 | 304 | if not node1: |
|
298 | 305 | node1 = repo.dirstate.parents()[0] |
|
306 | change = repo.changelog.read(node1) | |
|
307 | mmap = repo.manifest.read(change[0]) | |
|
308 | date1 = util.datestr(change[2]) | |
|
299 | 309 | def read(f): |
|
300 | 310 | return repo.wread(f) |
|
301 | 311 | |
@@ -305,10 +315,6 b' def dodiff(fp, ui, repo, node1, node2, f' | |||
|
305 | 315 | hexfunc = ui.verbose and hex or short |
|
306 | 316 | r = [hexfunc(node) for node in [node1, node2] if node] |
|
307 | 317 | |
|
308 | change = repo.changelog.read(node1) | |
|
309 | mmap = repo.manifest.read(change[0]) | |
|
310 | date1 = util.datestr(change[2]) | |
|
311 | ||
|
312 | 318 | diffopts = ui.diffopts() |
|
313 | 319 | showfunc = opts.get('show_function') or diffopts['showfunc'] |
|
314 | 320 | ignorews = opts.get('ignore_all_space') or diffopts['ignorews'] |
General Comments 0
You need to be logged in to leave comments.
Login now