Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 11:18:57 -0500] rev 11274
revset: introduce basic parser
Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 11:18:57 -0500] rev 11273
remoteui: move from cmdutil to hg
Henrik Stuart <hg@hstuart.dk> [Thu, 03 Jun 2010 21:38:30 +0200] rev 11272
mq: better qqueue test for troublesome names
Cédric Duval <cedricduval@free.fr> [Thu, 03 Jun 2010 20:40:23 +0200] rev 11271
mq: prevent the creation of a queue whose name is already taken
Each check is moved under the code handling the relevant option, and
a new one is added for --create. This fixes duplicated entries being
added to the queues list.
Henrik Stuart <hg@hstuart.dk> [Wed, 02 Jun 2010 19:39:45 +0200] rev 11270
mq: fix naming issues for qqueue directories
Martin Geisler <mg@aragost.com> [Wed, 02 Jun 2010 14:54:25 +0200] rev 11269
win32text: mark this extension as deprecated
Martin Geisler <mg@aragost.com> [Wed, 02 Jun 2010 14:40:31 +0200] rev 11268
Merge with stable
Greg Ward <greg-hg@gerg.ca> [Tue, 01 Jun 2010 18:29:52 -0400] rev 11267
shrink-revlog: preserve mode of the shrunken index and data file.
Otherwise, the shrunken index file always has mode 0600 thanks to
mkstemp(). This is annoying on a server, where multiple users may need
to read/write the manifest. chmod()ing the data file is not strictly
necessary, but it's nice for consistency.
Javi Merino <cibervicho@gmail.com> [Wed, 19 May 2010 18:06:35 +0200] rev 11266
Fixed a bashism with the use of $RANDOM in hgeditor.
The variable $RANDOM is not POSIX so a portable /bin/sh may not define
it. When creating a directory with a random name it's better to use
mktemp, which, even though is not POSIX, exists in common Unixes
including Linux, OpenBSD, FreeBSD and MacOS X.
Alexander Solovyov <piranha@piranha.org.ua> [Thu, 27 May 2010 22:50:23 +0300] rev 11265
churn: add possibility to include/exclude paths
Alexander Solovyov <piranha@piranha.org.ua> [Wed, 02 Jun 2010 14:28:45 +0200] rev 11264
churn: support spaces in aliases (
issue2222)
Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 10:55:11 -0500] rev 11263
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 10:54:57 -0500] rev 11262
Merge with i18n
Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 10:54:03 -0500] rev 11261
Added signature for changeset
24fe2629c6fd
Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 10:54:03 -0500] rev 11260
Added tag 1.5.4 for changeset
24fe2629c6fd
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().
Sune Foldager <cryo@cyanite.org> [Fri, 21 May 2010 15:22:29 +0200] rev 11211
push: add --new-branch option to allow intial push of new branches
Compare this to --force which allows anything to be pushed. With --new-branch,
only changesets to named branches not present on the and changesets not
introducing additional heads on existing branches are allowed.
Developed by
Henrik Stuart <henrik.stuart@edlund.dk>
Sune Foldager <cryo@cyanite.org>
Yuya Nishihara <yuya@tcha.org> [Fri, 21 May 2010 22:53:57 +0900] rev 11210
check-code: add check for 'source'
Martin Geisler <mg@aragost.com> [Fri, 21 May 2010 14:21:27 +0200] rev 11209
Merge with stable
Yuya Nishihara <yuya@tcha.org> [Fri, 21 May 2010 20:55:18 +0900] rev 11208
tests: fix bashism to load helpers.sh
`source` isn't available at POSIX sh.
Yuya Nishihara <yuya@tcha.org> [Tue, 18 May 2010 18:55:14 +0900] rev 11207
color: bring back colors with pager
It's introduced by
3c368a1c962d, but missing in merge changeset
at
a890cc501501.
Martin Geisler <mg@aragost.com> [Fri, 21 May 2010 13:40:59 +0200] rev 11206
dispatch: include Python version in traceback
Matt Mackall <mpm@selenic.com> [Thu, 20 May 2010 15:58:16 -0500] rev 11205
rebase: add error codes
Suggested by Dirk Hasselbalch
Matt Mackall <mpm@selenic.com> [Thu, 20 May 2010 15:20:25 -0500] rev 11204
rebase: improve --abort failure message
Matt Mackall <mpm@selenic.com> [Thu, 20 May 2010 15:15:11 -0500] rev 11203
rebase: only show "rebase completed" message with -v
Matt Mackall <mpm@selenic.com> [Thu, 20 May 2010 13:27:28 -0500] rev 11202
strip: hide unbundle messages by default
Unbundling is an internal implementation detail for strip, only show
them with --verbose.
Matt Mackall <mpm@selenic.com> [Thu, 20 May 2010 12:21:35 -0500] rev 11201
Fix up rebase's handling of strip backups
Matt Mackall <mpm@selenic.com> [Thu, 20 May 2010 12:15:44 -0500] rev 11200
strip: improve full backup message
Matt Mackall <mpm@selenic.com> [Wed, 19 May 2010 20:20:16 -0500] rev 11199
strip: drop deprecated -b from synopsis
Matt Mackall <mpm@selenic.com> [Wed, 19 May 2010 20:20:12 -0500] rev 11198
rebase: use helpers.sh in tests
Matt Mackall <mpm@selenic.com> [Wed, 19 May 2010 19:46:39 -0500] rev 11197
strip: be quiet about temporary internal bundle
Patrick Mezard <pmezard@gmail.com> [Wed, 19 May 2010 22:32:40 +0200] rev 11196
Merge with crew-stable
Aaron Digulla <digulla@hepe.com> [Wed, 19 May 2010 22:09:58 +0200] rev 11195
convert/svn: close gettags() log stream (
issue2196)
Patrick Mezard <pmezard@gmail.com> [Wed, 19 May 2010 22:04:41 +0200] rev 11194
convert/svn: remove useless try/catch
While the try/catch was reintroduced in
2f0f9528e77b, it was made useless by
the tags/ existence check in getheads().
Martin Geisler <mg@aragost.com> [Tue, 18 May 2010 16:31:10 +0200] rev 11193
Use our custom hg reStructuredText role some more
I missed these occurrences on my first scan through the source.
Martin Geisler <mg@aragost.com> [Tue, 18 May 2010 16:24:14 +0200] rev 11192
minirst: handle line breaks in hg role
Martin Geisler <mg@lazybytes.net> [Mon, 17 May 2010 23:11:27 +0200] rev 11191
extdiff: fix reST syntax in module docstring
Javi Merino <cibervicho@gmail.com> [Tue, 11 May 2010 12:06:30 +0200] rev 11190
Fixed a bashism with trap numbers in hgeditor.
When using trap in a shell script, it's more portable to use signal
names, instead of numbers. Signal names (INT, KILL,...) are defined in
POSIX, whereas its corresponding numbers aren't.
Martin Geisler <mg@lazybytes.net> [Mon, 17 May 2010 21:30:00 +0200] rev 11189
Merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 17 May 2010 21:16:35 +0200] rev 11188
rebase: stress that only local changesets should be rebased
Martin Geisler <mg@lazybytes.net> [Mon, 17 May 2010 20:42:28 +0200] rev 11187
minirst: fix debug code
Matt Mackall <mpm@selenic.com> [Sun, 16 May 2010 14:38:32 -0500] rev 11186
Merge with stable
Steve Losh <steve@stevelosh.com> [Sat, 15 May 2010 23:33:22 -0400] rev 11185
tag: add -e/--edit option for modifying the commit message
Steve Borho <steve@borho.org> [Thu, 07 Jan 2010 22:19:05 -0600] rev 11184
extdiff: add labels, read diff arguments from [merge-tools]
hgtk has been using these same configs since Feb. Users only have to name the
tools they would like to use, ex:
[extdiff]
kdiff3 =
meld =
Yuya Nishihara <yuya@tcha.org> [Sun, 16 May 2010 22:23:14 +0900] rev 11183
patchbomb: respect HGPLAIN when piping --test output to PAGER
It makes easy to use `hg email --test` from another tool.
Brodie Rao <brodie@bitheap.org> [Mon, 03 May 2010 14:00:34 -0500] rev 11182
pager: fork and exec pager as parent process
With the pager as the child process instead of the parent process, the
termination of the parent Mercurial process can cause the terminal to return
before the pager exits. Inverting the relationship prevents that issue.
Platforms without fork() will continue to use util.popen().
Matt Mackall <mpm@selenic.com> [Sat, 15 May 2010 21:24:23 -0500] rev 11181
commit: fix complaint about branch merge creating new heads (
issue2186)
Ori Avtalion <ori@avtalion.name> [Sat, 15 May 2010 00:34:07 +0300] rev 11180
Fix hg heads -r flag documentation
The command arguments are "[-ac] [-r STARTREV] [REV]..."
Ori Avtalion <ori@avtalion.name> [Fri, 14 May 2010 22:29:15 +0300] rev 11179
Fix wording in hg pull documentation