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
Gilles Moris <gilles.moris@free.fr> [Tue, 04 May 2010 09:57:16 +0200] rev 11178
merge: avoid to break the dirstate copy status on moved files
In the case a file is locally tracked as copied in dirstate, and that a merge
affects this file, this file should not be marked as modified in dirstate, as
this will break the current copy state.
Note: only affect working directory merge, not branch merge.
Matt Mackall <mpm@selenic.com> [Sat, 15 May 2010 17:48:49 -0500] rev 11177
commands: initial audit of exit codes
bisect: clarify None return
bundle: return 1 on no changes
clone: return result code
copy: limit errors to 0/1
commit: return 1 on no changes
forget: return 1 on errors
grep: return 1 if no match found
remove: return 1 on errors
resolve: return 1 if something fails to resolve
rollback: return 1 if no rollback data
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 12:57:24 -0500] rev 11176
hgweb: fix race in refreshing repo list (issue2188)
Matt Mackall <mpm@selenic.com> [Fri, 14 May 2010 10:01:09 -0500] rev 11175
rollback: fix up tests
Matt Mackall <mpm@selenic.com> [Thu, 13 May 2010 17:36:45 -0500] rev 11174
rollback: fix off-by-one in message
Matt Mackall <mpm@selenic.com> [Thu, 13 May 2010 17:24:21 -0500] rev 11173
commit: note new branch heads rather than topological heads
Move to using contexts while we're at it.
Matt Mackall <mpm@selenic.com> [Thu, 13 May 2010 11:33:11 -0500] rev 11172
Merge with 1.5.3
Matt Mackall <mpm@selenic.com> [Thu, 13 May 2010 11:30:50 -0500] rev 11171
Added signature for changeset fdcf80f26604
Matt Mackall <mpm@selenic.com> [Thu, 13 May 2010 11:30:49 -0500] rev 11170
Added tag 1.5.3 for changeset fdcf80f26604
Matt Mackall <mpm@selenic.com> [Wed, 12 May 2010 15:40:58 -0500] rev 11169
tag: strip whitespace from tag names (issue2174)
Christian Ebert <blacktrash@gmx.net> [Sun, 09 May 2010 11:14:43 +0200] rev 11168
keyword: support extensions using dorecord, e.g. crecord
Provide extendable keyword.recordextensions variable, so other
extensions beside hgext.record which provide the dorecord function
can cooperate with hgext.keyword like so (example from crecord):
def extsetup():
try:
keyword = extensions.find('keyword')
keyword.restricted += ' crecord qcrecord'
try:
# use record support in keyword.py if present
keyword.recordcommands += ' crecord qcrecord'
keyword.recordextensions += ' crecord'
except AttributeError:
pass
except KeyError:
pass
Matt Mackall <mpm@selenic.com> [Wed, 12 May 2010 14:49:46 -0500] rev 11167
convert/svn: fix long line
Matt Mackall <mpm@selenic.com> [Wed, 12 May 2010 11:53:09 -0500] rev 11166
i18n: fix up bad merge
Gilles Moris <gilles.moris@free.fr> [Mon, 10 May 2010 22:44:06 +0200] rev 11165
summary: show if commit will be from a closed head
Gilles Moris <gilles.moris@free.fr> [Mon, 10 May 2010 08:53:06 +0200] rev 11164
commit: inform the commiter when resurrecting a closed changeset
Gilles Moris <gilles.moris@free.fr> [Mon, 10 May 2010 08:43:36 +0200] rev 11163
commit: prevent closing non-head changesets
Matt Mackall <mpm@selenic.com> [Tue, 11 May 2010 17:13:35 -0500] rev 11162
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 11 May 2010 17:12:10 -0500] rev 11161
Merge with i18n