Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 18:14:45 +0100] rev 10200
Minor svn conversion tests cleanup
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 16:42:00 +0100] rev 10199
subrepo: force en_US.UTF-8 locale when calling svn
Parser only knows about en_US output. Forcing the encoding to UTF-8 might not
be the best thing to do since the caller may receive some of the subversion
output, but at least it should prevent conversion errors from svn client.
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 16:03:29 +0100] rev 10198
test-subrepo-svn: normalize OS specific path separator
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 16:03:25 +0100] rev 10197
subrepo: normalize svn output line-endings
Patrick Mezard <pmezard@gmail.com> [Sat, 02 Jan 2010 15:48:05 +0100] rev 10196
test-subrepo-svn: avoid pushd/popd
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 18:10:10 -0600] rev 10195
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 17:58:35 -0600] rev 10194
Added signature for changeset 296a0b14a686
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 17:58:34 -0600] rev 10193
Added tag 1.4.2 for changeset 296a0b14a686
Matt Mackall <mpm@selenic.com> [Fri, 01 Jan 2010 15:45:48 -0600] rev 10192
Merge with crew
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
Patrick Mezard <pmezard@gmail.com> [Fri, 01 Jan 2010 13:58:30 +0100] rev 10179
copies: don't report copies with unrelated branch
Augie Fackler <durin42@gmail.com> [Thu, 31 Dec 2009 13:16:03 -0600] rev 10178
subrepo: Subversion support
Augie Fackler <durin42@gmail.com> [Thu, 31 Dec 2009 17:10:03 -0600] rev 10177
subrepo: add table-based dispatch for subrepo types
Augie Fackler <durin42@gmail.com> [Thu, 31 Dec 2009 17:19:30 -0600] rev 10176
dirstate: don't check state of subrepo directories
Augie Fackler <durin42@gmail.com> [Thu, 31 Dec 2009 16:30:34 -0600] rev 10175
subrepo: load from a context where the subrepo exists
Matt Mackall <mpm@selenic.com> [Thu, 31 Dec 2009 17:25:46 -0600] rev 10174
subrepo: fix includes support in .hgsub
Martin Geisler <mg@lazybytes.net> [Thu, 31 Dec 2009 00:03:19 +0100] rev 10173
Merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 30 Dec 2009 20:39:59 -0200] rev 10172
i18n: update po files for 703db37d186b and 0ddbc0299742
Matt Mackall <mpm@selenic.com> [Wed, 30 Dec 2009 14:32:37 -0600] rev 10171
Merge with i18n
Martin Geisler <mg@lazybytes.net> [Wed, 30 Dec 2009 20:59:23 +0100] rev 10170
Merge with stable
Martin Geisler <mg@lazybytes.net> [Wed, 30 Dec 2009 20:37:53 +0100] rev 10169
Merge with i18n.