Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 21:49:05 +0100] rev 10191
mq: qdiff with the same diff options than qrefresh (issue1350)
Specifically, if current patch is a git patch and mq.git=keep, diff in git
mode.
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 21:21:34 +0100] rev 10190
mq: upgrade to git patch when necessary (issue767)
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 20:54:05 +0100] rev 10189
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.
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 20:52:05 +0100] rev 10188
Merge with crew-stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 15:33:51 -0600] rev 10187
Merge with stable
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 19:53:05 +0100] rev 10186
mq: preserve --git flag when folding patches
Without this, folding a git patch into a regular one downgrades the resulting
patch to a regular patch.
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 19:53:05 +0100] rev 10185
mq: preserve --git flag when merging patches
Without this, merging a patch queue without diff.git=1 downgrades all git
patches to regular patches, losing data in the process.
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 19:53:05 +0100] rev 10184
mq: stop caching and sharing diff options
Several mq commands mutate the shared options which causes hard to track bugs
when multiple calls are combined.
Martin Geisler <mg@lazybytes.net> [Fri, 01 Jan 2010 18:46:24 +0100] rev 10183
subrepo: mark string for translation and fix case
Pascal Quantin <pascal.quantin@gmail.com> [Fri, 01 Jan 2010 15:30:21 +0100] rev 10182
Add RelaxNG schema to win32 installer
Martin Geisler <mg@lazybytes.net> [Fri, 01 Jan 2010 17:11:48 +0100] rev 10181
Merge with mpm
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 14:29:36 +0100] rev 10180
Merge with crew-stable