Mercurial > hg
comparison mercurial/util.py @ 1015:22571b8d35d3
Add automatic binary file detection to diff and export
Based on a patch by Fuming Wang
- add util.binary which decides whether a file is binary if it has any NUL
characters in the first 1K.
- teach mdiff.unidiff to print "binary file <x> has changed" for binary files
- add text flag to cause unidiff and dodiff to treat all files as text
- add -a and --text flags (like diff(1)) to hg diff and export
- update docs
author | mpm@selenic.com |
---|---|
date | Tue, 23 Aug 2005 19:58:46 -0700 |
parents | 7f3f55903496 |
children | 503aaf19a040 |
comparison
equal
deleted
inserted
replaced
1014:e37cd99fa909 | 1015:22571b8d35d3 |
---|---|
6 # of the GNU General Public License, incorporated herein by reference. | 6 # of the GNU General Public License, incorporated herein by reference. |
7 | 7 |
8 import os, errno | 8 import os, errno |
9 from demandload import * | 9 from demandload import * |
10 demandload(globals(), "re") | 10 demandload(globals(), "re") |
11 | |
12 def binary(s): | |
13 if s and '\0' in s[:4096]: | |
14 return True | |
15 return False | |
11 | 16 |
12 def unique(g): | 17 def unique(g): |
13 seen = {} | 18 seen = {} |
14 for f in g: | 19 for f in g: |
15 if f not in seen: | 20 if f not in seen: |