Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 10:44:03 -0500] rev 11259
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 01 Jun 2010 12:25:43 -0300] rev 11258
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 01 Jun 2010 12:23:44 -0300] rev 11257
i18n-pt_BR: synchronized with
0bb67503ad4b
Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 10:12:07 -0500] rev 11256
Merge with stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 28 May 2010 17:28:34 +0200] rev 11255
clone: save hardlink state of util.copyfiles()
When trying to do hardlink-cloning, the os_link() call of the
first file tried already fails on Windows, if the source is on a
UNC path.
This change avoids calling os_link() for the rest of files, leaving
us with a *single* failed os_link() call per clone operation, if the
source can't do hardlinks.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 28 May 2010 17:28:34 +0200] rev 11254
util.copyfiles: don't try os_link() again if it failed before
If the os_link() call on the first file in the directory fails [1],
we switch mode to using shutil.copy() for all remaining files.
[1] happens for example on Windows for every file when cloning from a UNC
path without specifying --pull.
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jun 2010 03:45:10 +0200] rev 11253
keyword: retrieve added and modified files from commitctx
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Jun 2010 01:05:45 +0200] rev 11252
keyword: force dirstate normal when all changes in a file are recorded
Before this bugfix a file whose changes were entirely recorded was still
considered modified by "hg status".
Note: the test must use hg record -l/--logfile, because this is not
reproducible with hg record -m/--message.
Adrian Buehlmann <adrian@cadifra.com> [Mon, 31 May 2010 13:47:51 +0200] rev 11251
clone: print number of linked/copied files on --debug
Martin Geisler <mg@lazybytes.net> [Mon, 31 May 2010 21:43:03 +0200] rev 11250
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 31 May 2010 21:37:01 +0200] rev 11249
eol: extension for managing file EOLs
Matt Mackall <mpm@selenic.com> [Mon, 31 May 2010 12:57:47 -0500] rev 11248
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 31 May 2010 12:57:34 -0500] rev 11247
Merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 31 May 2010 12:57:24 -0500] rev 11246
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 25 May 2010 13:24:49 -0300] rev 11245
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 25 May 2010 13:20:33 -0300] rev 11244
i18n-pt_BR: added message from
1b8aa9ffa7dc
Wagner Bruna <wbruna@yahoo.com> [Sat, 22 May 2010 11:23:47 -0300] rev 11243
merge with i18n stable
Wagner Bruna <wbruna@yahoo.com> [Sat, 22 May 2010 11:22:36 -0300] rev 11242
i18n-pt_BR: synchronized with
ed71cb07d7b2
Matt Mackall <mpm@selenic.com> [Mon, 31 May 2010 12:34:47 -0500] rev 11241
Merge with stable
Brodie Rao <brodie@bitheap.org> [Wed, 19 May 2010 09:54:12 -0500] rev 11240
pager: exec pager using /bin/sh -c
This mimics the behavior of popen() and ensures setting the pager to something
like "LESS=FSRX less" will work.
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 12:57:24 -0500] rev 11239
hgweb: fix race in refreshing repo list (
issue2188)
Martin Geisler <mg@aragost.com> [Mon, 31 May 2010 13:55:47 +0200] rev 11238
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 31 May 2010 17:13:15 +0900] rev 11237
record: check that we are not committing a merge before patch selection
It might sound like a good idea to use record to filter changes when merging.
If someone attemps this, it's better to tell her "no" right ahead, before the
patch generation/line selection, so she does not spend time doing it just to
receive a red light after that (sometimes rather long) process.
Martin Geisler <mg@aragost.com> [Mon, 31 May 2010 13:43:03 +0200] rev 11236
record: better way to find help in docstring
This outputs only the lines in the verbatim block without relying on
the translator to have translated the little 'y - record this change'
string.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 31 May 2010 14:48:26 +0900] rev 11235
record: docstring typo
Martin Geisler <mg@lazybytes.net> [Sun, 30 May 2010 23:24:10 +0200] rev 11234
mq: mention qqueue in module docstring
Adrian Buehlmann <adrian@cadifra.com> [Fri, 28 May 2010 17:28:34 +0200] rev 11233
clone: save hardlink state of util.copyfiles()
When trying to do hardlink-cloning, the os_link() call of the
first file tried already fails on Windows, if the source is on a
UNC path.
This change avoids calling os_link() for the rest of files, leaving
us with a *single* failed os_link() call per clone operation, if the
source can't do hardlinks.
Adrian Buehlmann <adrian@cadifra.com> [Fri, 28 May 2010 17:28:34 +0200] rev 11232
util.copyfiles: don't try os_link() again if it failed before
If the os_link() call on the first file in the directory fails [1],
we switch mode to using shutil.copy() for all remaining files.
[1] happens for example on Windows for every file when cloning from a UNC
path without specifying --pull.
Alexander Solovyov <piranha@piranha.org.ua> [Thu, 27 May 2010 22:50:04 +0300] rev 11231
cmdutil: cleanup imports
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> [Thu, 27 May 2010 17:47:40 +0200] rev 11230
make transactions work on non-refcounted python implementations
Henrik Stuart <hg@hstuart.dk> [Sat, 29 May 2010 20:32:39 +0200] rev 11229
mq: support multiple patch queues using qqueue
Matt Mackall <mpm@selenic.com> [Fri, 28 May 2010 16:01:57 -0500] rev 11228
Merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 28 May 2010 14:41:11 -0500] rev 11227
status: avoid performance regression when no .hgsub is present
(introduced by
24ce8f0c0a39)
Martin Geisler <mg@aragost.com> [Thu, 27 May 2010 10:37:14 +0200] rev 11226
doc: document expansion of %include and ui.username
Chad Dombrova <chadrik@gmail.com> [Wed, 26 May 2010 14:03:29 -0700] rev 11225
ui.username(): expand environment variables in username configuration value.
note: expansion of config variables must be handled on a case-by-case basis
because they can contain arbitrary data that may not be desirable to expand.
Chad Dombrova <chadrik@gmail.com> [Wed, 26 May 2010 14:03:29 -0700] rev 11224
config: expand hgrc %include paths
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 26 May 2010 16:16:47 +0200] rev 11223
rename: make --after work if source is already in R state
I routinely want to use `hg addrem` and then fix up missed renames
manually using `hg mv -A`. This patch allows me to record such
renames from a source in state R to a target in state A.
Martin Geisler <mg@lazybytes.net> [Tue, 25 May 2010 18:45:44 +0200] rev 11222
Merge with stable
Angel Ezquerra [Tue, 25 May 2010 18:19:40 +0200] rev 11221
doc: clarify that sections can be split
Angel Ezquerra [Tue, 25 May 2010 18:19:16 +0200] rev 11220
doc: clarify that keys can be overridden
Martin Geisler <mg@aragost.com> [Tue, 25 May 2010 09:57:19 +0200] rev 11219
commands: document --new-branch flag for push
Martin Geisler <mg@aragost.com> [Tue, 25 May 2010 09:56:26 +0200] rev 11218
Merge with stable
Faheem Mitha <faheem@email.unc.edu> [Mon, 24 May 2010 21:52:33 +0530] rev 11217
commands: updates to push docstring.
With contributions from mg, hstuart, timeless, and vsh.
Martin Geisler <mg@lazybytes.net> [Mon, 24 May 2010 00:55:42 +0200] rev 11216
mq: remove unneeded local variable in delete
Brodie Rao <brodie@bitheap.org> [Wed, 19 May 2010 09:54:12 -0500] rev 11215
pager: exec pager using /bin/sh -c
This mimics the behavior of popen() and ensures setting the pager to something
like "LESS=FSRX less" will work.
Christian Ebert <blacktrash@gmx.net> [Wed, 19 May 2010 00:45:50 +0200] rev 11214
keyword: offer svn-like default keywordmaps
svn-like default keywords can be set in a new configuration section
called [keywordset] -- thanks to timeless for the name.
Move setup of default keywordmaps into dedicated function used by
kwtemplater.__init__ and demo.
HeadURL/URL is not supported (by default).
Christian Ebert <blacktrash@gmx.net> [Tue, 18 May 2010 22:16:38 +0200] rev 11213
keyword: add 2 svn-like date filters
svnisodate yields the format the date in svn's Id keyword expands to.
svnutcdate yields the format svn's Date/LastChangedDate expands to.
http://svnbook.red-bean.com/en/1.5/svn.advanced.props.special.keywords.html
Yuya Nishihara <yuya@tcha.org> [Fri, 21 May 2010 19:54:40 +0900] rev 11212
util: give appropriate default args to atomictempfile()
mode='w+b' is the default of python's TemporaryFile().