Gilles Moris <gilles.moris@free.fr> [Tue, 08 Jun 2010 22:30:44 +0200] rev 11318
commit: add tests for the 'created new head' message
Gilles Moris <gilles.moris@free.fr> [Tue, 08 Jun 2010 22:28:42 +0200] rev 11317
commit: fix display of 'created new head' message (issue2186)
To avoid recurrent fixes for the display of this message, a summary table with
all case combinations has been added to the code.
Basically, there is two condition for the message to be printed:
* this is not an initial (named branch or topo) root
* none of the parents are in the current branch heads
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Tue, 08 Jun 2010 18:01:07 +0200] rev 11316
rebase: --abort doesn't strip away the target changeset (issue2220)
When a changeset is skipped, rebase keeps the previous target as next
target and if the skipped cset is the first one, the recorded target is
actually the original target.
--abort did not detect this situation but simply stripped away the cset.
Jan Sorensen <js@aragost.com> [Wed, 09 Jun 2010 17:22:59 +0200] rev 11315
test-branch-option: Updated output to match rev 3f1409082720
Martin Geisler <mg@aragost.com> [Wed, 09 Jun 2010 17:50:45 +0200] rev 11314
Merge with mpm
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 09 Jun 2010 17:27:47 +0200] rev 11313
discovery: fix description line
Matt Mackall <mpm@selenic.com> [Tue, 08 Jun 2010 15:57:59 -0500] rev 11312
Merge with stable
Steve Borho <steve@borho.org> [Tue, 08 Jun 2010 15:52:56 -0500] rev 11311
Merge backout
Steve Borho <steve@borho.org> [Tue, 08 Jun 2010 15:52:41 -0500] rev 11310
Backed out changeset: e1dde7363601
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 08 Jun 2010 21:09:41 +0200] rev 11309
ui: handle leading newlines/spaces/commas in configlist
Thanks to Greg Ward for spotting the problem introduced in 0a548640e012
and for supplying the test case.
Steve Borho <steve@borho.org> [Tue, 08 Jun 2010 11:58:09 -0500] rev 11308
mergetools: add configuration for Ultra Compare (issue2226)
Initial config provided by Tim Pietzcker
Martin Geisler <mg@aragost.com> [Tue, 08 Jun 2010 14:12:46 +0200] rev 11307
mq: use hg reST role some more
Sune Foldager <cryo@cyanite.org> [Tue, 08 Jun 2010 13:19:22 +0200] rev 11306
fix encoding bug in 05ac42e56452
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 08 Jun 2010 09:30:45 +0200] rev 11305
cleanups: undefined variables
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 08 Jun 2010 09:30:33 +0200] rev 11304
cleanups: unused variables
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 07 Jun 2010 20:03:32 +0200] rev 11303
move working dir/dirstate methods from localrepo to workingctx
Steve Borho <steve@borho.org> [Thu, 03 Jun 2010 23:18:18 -0500] rev 11302
color: labeled text should be passed to ui.write() as ui.labeled
Some implementations of ui.label() (HTML versions in particular) must escape
the provided text and then markup the text with their tags. When this marked
up text is then passed to ui.write(), we must label the text as 'ui.labeled'
so the implementation knows not to escape it a second time (exposing the initial
markup).
This required the addition of a 'ui.plain' label for text that is purposefully
not marked up.
I was a little pedantic here, passing even ' ' strings to ui.label() when it
would be included with other labeled text in a ui.write() call. But it seemed
appropriate to lean to the side of caution.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 07 Jun 2010 18:35:54 +0200] rev 11301
move discovery methods from localrepo into new discovery module
Sune Foldager <cryo@cyanite.org> [Mon, 07 Jun 2010 16:29:06 +0200] rev 11300
merge with stable
Sune Foldager <cryo@cyanite.org> [Mon, 07 Jun 2010 16:28:23 +0200] rev 11299
push/pull: fix bug in "--branch ." handling
The branch wasn't expanded, so only the tip was operated on.
Pradeepkumar Gayam <in3xes@gmail.com> [Sun, 06 Jun 2010 22:39:32 +0530] rev 11298
shrink-repo: wrong variable name
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 06 Jun 2010 17:20:10 +0900] rev 11297
replace Python standard textwrap by MBCS sensitive one for i18n text
Mercurial has problem around text wrapping/filling in MBCS encoding
environment, because standard 'textwrap' module of Python can not
treat it correctly. It splits byte sequence for one character into two
lines.
According to unicode specification, "east asian width" classifies
characters into:
W(ide), N(arrow), F(ull-width), H(alf-width), A(mbiguous)
W/N/F/H can be always recognized as 2/1/2/1 bytes in byte sequence,
but 'A' can not. Size of 'A' depends on language in which it is used.
Unicode specification says:
If the context(= language) cannot be established reliably they
should be treated as narrow characters by default
but many of class 'A' characters are full-width, at least, in Japanese
environment.
So, this patch treats class 'A' characters as full-width always for
safety wrapping.
This patch focuses only on MBCS safe-ness, not on writing/printing
rule strict wrapping for each languages
MBCS sensitive textwrap class is originally implemented
by ITO Nobuaki <daydream.trippers@gmail.com>.
Christian Ebert <blacktrash@gmx.net> [Thu, 03 Jun 2010 10:37:31 +0100] rev 11296
keyword: use context to detect uncommitted merge
Adrian Buehlmann <adrian@cadifra.com> [Thu, 03 Jun 2010 13:58:00 +0200] rev 11295
tests: use --debug on test-clone
Greg Ward <greg-hg@gerg.ca> [Thu, 03 Jun 2010 10:18:33 -0400] rev 11294
shrink-revlog: use util.mktempcopy() to preserve mode of index file.
(There's still a chmod() call to manually preserve the mode of the
data file.)
Matt Mackall <mpm@selenic.com> [Sat, 05 Jun 2010 09:58:02 -0500] rev 11293
revset: delay import of hg to avoid start-up import loops
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 23:04:31 -0500] rev 11292
error: fix up test-hgrc
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 23:00:22 -0500] rev 11291
error: update test-trusted.py
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 22:54:43 -0500] rev 11290
revset: fix test failure with qfinish
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 20:57:52 -0500] rev 11289
revset: raise ParseError exceptions
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 20:57:26 -0500] rev 11288
error: add new ParseError for various parsing errors
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 20:19:53 -0500] rev 11287
error: change ParseError to CommandError
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 20:13:51 -0500] rev 11286
hgrc: improve docs for the trusted section
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 17:22:33 -0500] rev 11285
rebase: use usual util.abort rather than error.ParseError
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 10:27:23 -0500] rev 11284
revset: sort the predicate list
Matt Mackall <mpm@selenic.com> [Fri, 04 Jun 2010 10:26:55 -0500] rev 11283
revset: fix - handling in the optimizer
Matt Mackall <mpm@selenic.com> [Thu, 03 Jun 2010 20:32:41 -0500] rev 11282
revset: fix up tests
Matt Mackall <mpm@selenic.com> [Thu, 03 Jun 2010 18:00:15 -0500] rev 11281
walkchangerevs: allow empty query sets
Matt Mackall <mpm@selenic.com> [Thu, 03 Jun 2010 17:39:40 -0500] rev 11280
revset: add tagged predicate
Matt Mackall <mpm@selenic.com> [Thu, 03 Jun 2010 17:39:34 -0500] rev 11279
revset: optimize the parse tree directly
Rather than dynamically optimize in methods, we pre-optimize the parse tree
directly. This also lets us do some substitution on some of the
symbols like - and ::.
Matt Mackall <mpm@selenic.com> [Wed, 02 Jun 2010 14:07:46 -0500] rev 11278
revset: add support for prefix and suffix versions of : and ::
Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 11:18:57 -0500] rev 11277
revset: hook into revrange
Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 11:18:57 -0500] rev 11276
revset: add a debugrevspec command
Matt Mackall <mpm@selenic.com> [Tue, 01 Jun 2010 11:18:57 -0500] rev 11275
revset: introduce revset core
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.