##// END OF EJS Templates
patch: support diff data loss detection and upgrade...
patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.

File last commit:

r10135:9a4034b6 stable
r10189:e451e599 default
Show More
test-patch-offset
67 lines | 1.2 KiB | text/plain | TextLexer
#!/bin/sh
cat > writepatterns.py <<EOF
import sys
path = sys.argv[1]
patterns = sys.argv[2:]
fp = file(path, 'wb')
for pattern in patterns:
count = int(pattern[0:-1])
char = pattern[-1] + '\n'
fp.write(char*count)
fp.close()
EOF
echo % prepare repo
hg init a
cd a
# These initial lines of Xs were not in the original file used to generate
# the patch. So all the patch hunks need to be applied to a constant offset
# within this file. If the offset isn't tracked then the hunks can be
# applied to the wrong lines of this file.
python ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A
hg commit -Am adda
# This is a cleaner patch generated via diff
# In this case it reproduces the problem when
# the output of hg export does not
echo % import patch
hg import -v -m 'b' -d '2 0' - <<EOF
--- a/a 2009-12-08 19:26:17.000000000 -0800
+++ b/a 2009-12-08 19:26:17.000000000 -0800
@@ -9,7 +9,7 @@
A
A
B
-A
+a
A
A
A
@@ -53,7 +53,7 @@
A
A
B
-A
+a
A
A
A
@@ -75,7 +75,7 @@
A
A
B
-A
+a
A
A
A
EOF
echo % compare imported changes against reference file
python ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A
diff -u aref a