Show More
@@ -18,7 +18,7 b' def difftree(args, ui, repo):' | |||
|
18 | 18 | if node2: |
|
19 | 19 | change = repo.changelog.read(node2) |
|
20 | 20 | mmap2 = repo.manifest.read(change[0]) |
|
21 |
(c, a, d) = repo. |
|
|
21 | (c, a, d, u) = repo.changes(node1, node2) | |
|
22 | 22 | def read(f): return repo.file(f).read(mmap2[f]) |
|
23 | 23 | date2 = date(change) |
|
24 | 24 | else: |
@@ -51,8 +51,7 b' def difftree(args, ui, repo):' | |||
|
51 | 51 | doptions = {} |
|
52 | 52 | opts = [('p', 'patch', None, 'patch'), |
|
53 | 53 | ('r', 'recursive', None, 'recursive')] |
|
54 |
args = fancyopts.fancyopts(args, opts, doptions |
|
|
55 | 'hg diff-tree [options] sha1 sha1') | |
|
54 | args = fancyopts.fancyopts(args, opts, doptions) | |
|
56 | 55 | |
|
57 | 56 | if len(args) < 2: |
|
58 | 57 | help() |
@@ -61,7 +60,7 b' def difftree(args, ui, repo):' | |||
|
61 | 60 | revs.append(repo.lookup(args[1])) |
|
62 | 61 | args = args[2:] |
|
63 | 62 | if doptions['patch']: |
|
64 |
commands.dodiff(ui, repo |
|
|
63 | commands.dodiff(sys.stdout, ui, repo, args, *revs) | |
|
65 | 64 | else: |
|
66 | 65 | __difftree(repo, args, *revs) |
|
67 | 66 | |
@@ -87,8 +86,7 b' def catcommit(repo, n, prefix):' | |||
|
87 | 86 | def catfile(args, ui, repo): |
|
88 | 87 | doptions = {} |
|
89 | 88 | opts = [('s', 'stdin', None, 'stdin')] |
|
90 |
args = fancyopts.fancyopts(args, opts, doptions |
|
|
91 | 'hg cat-file type sha1') | |
|
89 | args = fancyopts.fancyopts(args, opts, doptions) | |
|
92 | 90 | |
|
93 | 91 | # in stdin mode, every line except the commit is prefixed with two |
|
94 | 92 | # spaces. This way the our caller can find the commit without magic |
@@ -209,8 +207,7 b' def revlist(args, repo):' | |||
|
209 | 207 | doptions = {} |
|
210 | 208 | opts = [('c', 'commit', None, 'commit'), |
|
211 | 209 | ('n', 'max-nr', 0, 'max-nr')] |
|
212 |
args = fancyopts.fancyopts(args, opts, doptions |
|
|
213 | 'hg rev-list') | |
|
210 | args = fancyopts.fancyopts(args, opts, doptions) | |
|
214 | 211 | if doptions['commit']: |
|
215 | 212 | full = "commit" |
|
216 | 213 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now