Mercurial > public > mercurial-scm > hg
diff mercurial/mdiff.py @ 10189:e451e599fbcf
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.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 01 Jan 2010 20:54:05 +0100 |
| parents | 7637fe4f525d |
| children | d6512b3e9ac0 |
line wrap: on
line diff
--- a/mercurial/mdiff.py Fri Jan 01 20:52:05 2010 +0100 +++ b/mercurial/mdiff.py Fri Jan 01 20:54:05 2010 +0100 @@ -27,7 +27,9 @@ nodates removes dates from diff headers ignorews ignores all whitespace changes in the diff ignorewsamount ignores changes in the amount of whitespace - ignoreblanklines ignores changes whose lines are all blank''' + ignoreblanklines ignores changes whose lines are all blank + upgrade generates git diffs to avoid data loss + ''' defaults = { 'context': 3, @@ -38,6 +40,7 @@ 'ignorews': False, 'ignorewsamount': False, 'ignoreblanklines': False, + 'upgrade': False, } __slots__ = defaults.keys()