Brendan Cully <brendan@kublai.com> [Mon, 03 May 2010 15:27:05 -0700] rev 11090
Merge with stable
Brendan Cully <brendan@kublai.com> [Mon, 03 May 2010 15:22:47 -0700] rev 11089
grep: clarify help for -r
Matt Mackall <mpm@selenic.com> [Mon, 03 May 2010 17:05:23 -0500] rev 11088
summary: add subrepo status
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 23:59:39 +0200] rev 11087
keyword: simplify record switch in kwtemplater.overwrite
1) use kwtemplater.record attribute for clarity
2) drop optional context argument; consider the speed loss by
duplicating the dictionary lookup repo['.'] as negligible
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 May 2010 09:15:17 +0200] rev 11086
Adjusted output of test-subrepo for issue1977 to 05856e682521
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 02 May 2010 00:48:33 +0200] rev 11085
fix coding style
Steve Borho <steve@borho.org> [Sat, 01 May 2010 16:57:02 -0500] rev 11084
color: fix typo in w32effect for bold_background
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 16:03:45 -0500] rev 11083
Merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 16:02:51 -0500] rev 11082
Added signature for changeset 39f725929f0c
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 16:02:51 -0500] rev 11081
Added tag 1.5.2 for changeset 39f725929f0c
Wagner Bruna <wbruna@yahoo.com> [Sat, 01 May 2010 17:56:54 -0300] rev 11080
merge with i18n stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 01 May 2010 17:55:44 -0300] rev 11079
i18n-pt_BR: synchronized with ee5b112aa529
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 15:15:35 -0500] rev 11078
Merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 15:14:22 -0500] rev 11077
Merge with i18n
Matt Mackall <mpm@selenic.com> [Sat, 01 May 2010 15:08:30 -0500] rev 11076
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 30 Apr 2010 17:41:09 -0300] rev 11075
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 30 Apr 2010 17:39:56 -0300] rev 11074
i18n-pt_BR: synchronized with 3b89899934a6
Faheem Mitha <faheem@email.unc.edu> [Sat, 01 May 2010 23:04:49 +0530] rev 11073
mq: rewrite strip docstrings
This patch is joint work with ilowe.
Mads Kiilerich <mads@kiilerich.com> [Sat, 01 May 2010 19:24:51 +0200] rev 11072
test-issue2137: don't use $PWD; use `pwd` instead
This fixes test failure on Solaris, as described on
http://mercurial.selenic.com/wiki/WritingTests
Mads Kiilerich <mads@kiilerich.com> [Sat, 01 May 2010 19:24:49 +0200] rev 11071
test-mq-merge: quote ^
^ is magic on Solaris and must be quoted
Mads Kiilerich <mads@kiilerich.com> [Sat, 01 May 2010 19:24:46 +0200] rev 11070
test-extension: changed environment variables must be exported again
This fixes failure on Solaris because HGRCPATH wasn't unset.
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 30 Apr 2010 19:50:37 -0300] rev 11069
subrepo: add test for issue1977
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 30 Apr 2010 19:49:35 -0300] rev 11068
subrepo: update test output for issue1977 fix
Matt Mackall <mpm@selenic.com> [Fri, 30 Apr 2010 18:32:18 -0500] rev 11067
subrepo: propagate and catch push failures
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 26 Apr 2010 20:13:14 +0900] rev 11066
static-http: mimic more closely localrepo (issue2164: allow clone -r )
* httprangereader: name, __iter__ and close are needed to mimic file object
* static-http opener:
- disallow write/append modes
- add (unused) atomictemp parameter
* static-http repo:
- root attribute is needed for localrepo.dirstate()
- _branch* attributes are required for commitctx and branchmap calls
* tags: force repo.opener.__iter__ call earlier to force httprangereader
to try to read the cache early, to avoid raising IOError later.
Christian Ebert <blacktrash@gmx.net> [Sat, 01 May 2010 20:49:40 +0200] rev 11065
keyword: cleanup test and make it portable
- replace sed call with python command
- no need to back up hgrc before record
Mads Kiilerich <mads@kiilerich.com> [Fri, 30 Apr 2010 15:05:51 +0200] rev 11064
mq: qpush --move, reorder patch series and apply only the patch
This makes it less necessary to edit .hg/patches/series manually.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 19 Apr 2010 17:41:12 +0900] rev 11063
tag: warn users about tag/branch possible name conflicts
As reported recently, Mercurial users can easily find confusion when
using a common name for a tag and a branch. It seems reasonable to warn
them about this potential outcome, to avoid that "surprise".
* Explain briefly the issue in "hg help tag"
* Warn when tagging a revision
Mads Kiilerich <mads@kiilerich.com> [Mon, 19 Apr 2010 11:31:19 +0200] rev 11062
contrib/mercurial.spec: Use DESTDIR variable and 'make install'
Yuya Nishihara <yuya@tcha.org> [Thu, 01 Apr 2010 00:35:12 +0900] rev 11061
log: add --stat for diffstat output
log --stat shows diffstat in place of patch output.