Mercurial > hg-stable
comparison hgext/hgk.py @ 23451:5fb1fc2e1281
hgk: don't honor whitespace and format-changing diffopts
The diff-tree command is a plumbing command in Git, which means it is expected
to have a stable output format. Ensure that our output is stable too.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Tue, 18 Nov 2014 21:38:19 -0800 |
parents | 41c03b7592ed |
children | 0ecc1e42ff3f |
comparison
equal
deleted
inserted
replaced
23450:a074eeeabe32 | 23451:5fb1fc2e1281 |
---|---|
93 node1 = repo.changelog.parents(node1)[0] | 93 node1 = repo.changelog.parents(node1)[0] |
94 if opts['patch']: | 94 if opts['patch']: |
95 if opts['pretty']: | 95 if opts['pretty']: |
96 catcommit(ui, repo, node2, "") | 96 catcommit(ui, repo, node2, "") |
97 m = scmutil.match(repo[node1], files) | 97 m = scmutil.match(repo[node1], files) |
98 diffopts = patch.difffeatureopts(ui) | |
99 diffopts.git = True | |
98 chunks = patch.diff(repo, node1, node2, match=m, | 100 chunks = patch.diff(repo, node1, node2, match=m, |
99 opts=patch.diffopts(ui, {'git': True})) | 101 opts=diffopts) |
100 for chunk in chunks: | 102 for chunk in chunks: |
101 ui.write(chunk) | 103 ui.write(chunk) |
102 else: | 104 else: |
103 __difftree(repo, node1, node2, files=files) | 105 __difftree(repo, node1, node2, files=files) |
104 if not opts['stdin']: | 106 if not opts['stdin']: |