author | Drew Fisher <drew.fisher@oracle.com> |
Fri, 15 Jul 2016 08:40:02 -0700 | |
changeset 6418 | 2a0fae99277a |
parent 5481 | 5e30cd0645e7 |
permissions | -rw-r--r-- |
5481
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
1 |
Use GNU diff instead of Solaris diff. |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
2 |
|
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
3 |
Solaris diff doesn't understand the -N option, which is part of the default |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
4 |
option set. |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
5 |
|
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
6 |
This is a very Solaris-specific patch, and should not be passed upstream. |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
7 |
|
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
8 |
diff --git a/hgext/extdiff.py b/hgext/extdiff.py |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
9 |
--- a/hgext/extdiff.py |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
10 |
+++ b/hgext/extdiff.py |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
11 |
@@ -282,7 +282,7 @@ def extdiff(ui, repo, *pats, **opts): |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
12 |
program = opts.get('program') |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
13 |
option = opts.get('option') |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
14 |
if not program: |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
15 |
- program = 'diff' |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
16 |
+ program = 'gdiff' |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
17 |
option = option or ['-Npru'] |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
18 |
cmdline = ' '.join(map(util.shellquote, [program] + option)) |
5e30cd0645e7
21549200 mercurial 3.7.1
Danek Duvall <danek.duvall@oracle.com>
parents:
diff
changeset
|
19 |
return dodiff(ui, repo, cmdline, pats, opts) |