Show More
@@ -1588,7 +1588,7 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1588 | else: |
|
1588 | else: | |
1589 | header.append('deleted file mode %s\n' % |
|
1589 | header.append('deleted file mode %s\n' % | |
1590 | gitmode[man1.flags(f)]) |
|
1590 | gitmode[man1.flags(f)]) | |
1591 | elif not to: |
|
1591 | elif not to or util.binary(to): | |
1592 | # regular diffs cannot represent empty file deletion |
|
1592 | # regular diffs cannot represent empty file deletion | |
1593 | losedatafn(f) |
|
1593 | losedatafn(f) | |
1594 | else: |
|
1594 | else: |
@@ -43,10 +43,10 b' hg autodiff --git=no' | |||||
43 | echo '% git=no: git diff for single regular file' |
|
43 | echo '% git=no: git diff for single regular file' | |
44 | hg autodiff --git=yes regular |
|
44 | hg autodiff --git=yes regular | |
45 |
|
45 | |||
46 | echo '% git=auto: regular diff for regular files and removals' |
|
46 | echo '% git=auto: regular diff for regular files and non-binary removals' | |
47 |
hg autodiff --git=auto regular newregular rmregular rm |
|
47 | hg autodiff --git=auto regular newregular rmregular rmexec | |
48 |
|
48 | |||
49 | for f in exec newexec setexec unsetexec binary newbinary newempty rmempty; do |
|
49 | for f in exec newexec setexec unsetexec binary newbinary newempty rmempty rmbinary; do | |
50 | echo '% git=auto: git diff for' $f |
|
50 | echo '% git=auto: git diff for' $f | |
51 | hg autodiff --git=auto $f |
|
51 | hg autodiff --git=auto $f | |
52 | done |
|
52 | done |
@@ -62,7 +62,7 b' diff --git a/regular b/regular' | |||||
62 | @@ -1,1 +1,2 @@ |
|
62 | @@ -1,1 +1,2 @@ | |
63 | regular |
|
63 | regular | |
64 | +regular |
|
64 | +regular | |
65 | % git=auto: regular diff for regular files and removals |
|
65 | % git=auto: regular diff for regular files and non-binary removals | |
66 | diff -r b3f053cd7c7f newregular |
|
66 | diff -r b3f053cd7c7f newregular | |
67 | --- /dev/null |
|
67 | --- /dev/null | |
68 | +++ b/newregular |
|
68 | +++ b/newregular | |
@@ -74,8 +74,6 b' diff -r b3f053cd7c7f regular' | |||||
74 | @@ -1,1 +1,2 @@ |
|
74 | @@ -1,1 +1,2 @@ | |
75 | regular |
|
75 | regular | |
76 | +regular |
|
76 | +regular | |
77 | diff -r b3f053cd7c7f rmbinary |
|
|||
78 | Binary file rmbinary has changed |
|
|||
79 | diff -r b3f053cd7c7f rmexec |
|
77 | diff -r b3f053cd7c7f rmexec | |
80 | --- a/rmexec |
|
78 | --- a/rmexec | |
81 | +++ /dev/null |
|
79 | +++ /dev/null | |
@@ -129,6 +127,10 b' new file mode 100644' | |||||
129 | % git=auto: git diff for rmempty |
|
127 | % git=auto: git diff for rmempty | |
130 | diff --git a/rmempty b/rmempty |
|
128 | diff --git a/rmempty b/rmempty | |
131 | deleted file mode 100644 |
|
129 | deleted file mode 100644 | |
|
130 | % git=auto: git diff for rmbinary | |||
|
131 | diff --git a/rmbinary b/rmbinary | |||
|
132 | deleted file mode 100644 | |||
|
133 | Binary file rmbinary has changed | |||
132 | % git=warn: regular diff with data loss warnings |
|
134 | % git=warn: regular diff with data loss warnings | |
133 | diff -r b3f053cd7c7f binary |
|
135 | diff -r b3f053cd7c7f binary | |
134 | Binary file binary has changed |
|
136 | Binary file binary has changed | |
@@ -172,6 +174,7 b' data lost for: binary' | |||||
172 | data lost for: newbinary |
|
174 | data lost for: newbinary | |
173 | data lost for: newempty |
|
175 | data lost for: newempty | |
174 | data lost for: newexec |
|
176 | data lost for: newexec | |
|
177 | data lost for: rmbinary | |||
175 | data lost for: rmempty |
|
178 | data lost for: rmempty | |
176 | data lost for: setexec |
|
179 | data lost for: setexec | |
177 | data lost for: unsetexec |
|
180 | data lost for: unsetexec |
General Comments 0
You need to be logged in to leave comments.
Login now