Christian Ebert <blacktrash@gmx.net> [Wed, 03 Feb 2010 16:09:19 +0000] rev 10333
graphlog: remove unused import
Christian Ebert <blacktrash@gmx.net> [Thu, 04 Feb 2010 20:58:42 +0000] rev 10332
keyword: fix utcdate filter
So far the utcdate filter only omitted the timezone,
now it actually converts to utc.
Thanks to Kevin Grover for pointing out the issue.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 12:47:33 +0100] rev 10331
commands: always order heads recent to oldest
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 12:47:24 +0100] rev 10330
commands: fix up stupidly untested heads simplification
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 12:47:17 +0100] rev 10329
revlog: fix up previously stupid API change
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 11:29:48 +0100] rev 10328
commands: simplify heads a little bit before I start hacking it up
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 11:29:23 +0100] rev 10327
localrepo: add a quick docstring for localrepo.branchmap()
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 11:28:03 +0100] rev 10326
commands: deprecate the heads -a option
Hopefully we can remove it entirely in two releases or so.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 06 Feb 2010 11:27:22 +0100] rev 10325
revlog: add a fast path for checking ancestry
David Soria Parra <dsp@php.net> [Sat, 06 Feb 2010 10:23:18 +0100] rev 10324
subrepo: correct copyright
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 05 Feb 2010 18:46:22 +0100] rev 10323
record: function variable naming & signature cleanup.
No functionality change. All tests pass.
Vsevolod Solovyov <vsevolod.solovyov@gmail.com> [Fri, 05 Feb 2010 19:10:26 +0100] rev 10322
add options dict to localrepo.store.opener and use it for defversion
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 05 Feb 2010 18:23:01 +0100] rev 10321
merge with main
Henri Wiechers <hwiechers@gmail.com> [Fri, 05 Feb 2010 17:02:27 +0200] rev 10320
localrepo: minor formatting - remove double space
Henri Wiechers <hwiechers@gmail.com> [Mon, 01 Feb 2010 22:29:11 +0200] rev 10319
coverage.py: fixed syntax error
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 05 Feb 2010 17:24:38 +0100] rev 10318
merge with stable
Augie Fackler <durin42@gmail.com> [Fri, 05 Feb 2010 10:16:52 -0600] rev 10317
zeroconf: gethostbyaddr may also fail with socket.herror
Steve Borho <steve@borho.org> [Fri, 05 Feb 2010 07:07:53 -0600] rev 10316
Merge with stable
Steve Borho <steve@borho.org> [Fri, 05 Feb 2010 04:33:08 -0600] rev 10315
commands: label from user is in local encoding
repo.branchtags().keys() are in UTF-8, so the label should be converted to UTF-8
before checking for a naming conflict. Keep the original label for ui.status()
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Feb 2010 09:13:59 +0100] rev 10314
merge with main
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Feb 2010 09:05:20 +0100] rev 10313
copies: check if revisions are related (bug found with pylint)
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 11:34:44 -0600] rev 10312
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 09:34:35 -0600] rev 10311
Added signature for changeset 4aa619c4c2c0
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 09:34:35 -0600] rev 10310
Added tag 1.4.3 for changeset 4aa619c4c2c0
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 09:18:58 -0600] rev 10309
Merge with i18n
Matt Mackall <mpm@selenic.com> [Mon, 01 Feb 2010 09:18:25 -0600] rev 10308
Merge with i18n
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 01 Feb 2010 11:11:30 -0200] rev 10307
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 01 Feb 2010 11:10:43 -0200] rev 10306
i18n-pt_BR: synchronized with b08ffd27dfc8
Martin Geisler <mg@lazybytes.net> [Sun, 31 Jan 2010 16:01:20 +0100] rev 10305
Merge with stable.
Georg Brandl <georg@python.org> [Sat, 30 Jan 2010 19:49:52 +0100] rev 10304
i18n: fix typo in German translation
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 31 Jan 2010 02:34:50 +0900] rev 10303
i18n-ja: synchronized with e7727a545c48
Matt Mackall <mpm@selenic.com> [Sun, 31 Jan 2010 13:43:33 -0600] rev 10302
Merge with stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 24 Jan 2010 20:51:53 +0100] rev 10301
templates: rename `Last change' column in hgwebdir repository list.
This patch changes column headers in the templates that previously
said `Last change' to `Last modified'. Neither code nor functionality
are changed other than that.
For some time now, I have been annoyed by the fact the `Last change'
column didn't list the age of the youngest changeset in the
repository, or at least tip. It just occurred to me that this is
because the wording is slightly misleading; what the column in fact
lists is when the repository was last *modified*, that is, when
changesets was last added or removed from it.
The word `change' can be understood as referring to the changeset
itself. Using `changed' would be ever so slightly less
amigous. However, the standard nomenclature in this case is
`modification date' and `Last modified', which is incidentally entirely
unambigous. Hence, `Last modified' is the wording used.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 10 Dec 2009 17:21:31 +0900] rev 10300
run-tests: split tests/blacklist in tests/blacklists/*
Following discussions with Gilles Morris [1], it seems that it is preferable to
use several blacklist files in a blacklists/ directory. It is easier to add an
unversioned file for experiments than modifying a tracked file.
Also fall back to a simpler syntax, giving up ConfigParser, now that section
names are not needed anymore.
And allow --blacklist parameter to be a complete path, instead of only one
of the filenames contained in tests/blacklists/
[1] http://www.selenic.com/pipermail/mercurial-devel/2009-December/017317.html
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 31 Jan 2010 18:02:16 +0100] rev 10299
subrepo: fix errors reported by pylint
Matt Mackall <mpm@selenic.com> [Sun, 31 Jan 2010 12:19:52 -0600] rev 10298
copies: revert d1cd09bb4d18
The behavior of rebase both before and after the fix was actually
incorrect, and this change regressed other parts of copy behavior.
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 23:13:45 -0600] rev 10297
Merge with i18n
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 23:13:10 -0600] rev 10296
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 23:07:28 -0600] rev 10295
config: handle short continuations (issue1999)
Thanks to Greg Ward for spotting and testing
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:45:46 -0600] rev 10294
copies: fix issue1994
Unscramble divergence test
Jens Bäckman <jens.backman@gmail.com> [Mon, 18 Jan 2010 19:57:36 +0100] rev 10293
i18n-sv: Translated twelve basic commands
The help text and output strings surrounding these commands are now
available in glorious Swedish: outgoing, paths, recover, rename,
resolve, revert, rollback, root, showconfig, tag, tags, tip
This also syncs with 279c8a73fde1.
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:45:04 -0600] rev 10292
bugzilla: lowercase mysqldb var
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:54 -0600] rev 10291
check-code: del isn't a function
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:45 -0600] rev 10290
check-code: fix copyright date
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:36 -0600] rev 10289
test-minirst: hide trailing whitespace from check-code
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:25 -0600] rev 10288
zeroconf: flag third-party Zeroconf.py for ignore in check-code
Matt Mackall <mpm@selenic.com> [Thu, 28 Jan 2010 22:44:18 -0600] rev 10287
check-code: add some ignore hints
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 01:23:34 -0600] rev 10286
check-code: check thyself
Martin Geisler <mg@lazybytes.net> [Fri, 29 Jan 2010 01:04:38 +0100] rev 10285
Merge with stable.
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Jan 2010 11:27:09 +0000] rev 10284
patchbomb: document [patchbomb] config section for addresses
Christian Ebert <blacktrash@gmx.net> [Thu, 28 Jan 2010 10:38:29 +0000] rev 10283
hgrc.5: whether bcc is prompted for is up to the extension
There is no code in mail.py that forbids an extension to prompt for bcc.
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 00:05:27 -0600] rev 10282
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com> [Mon, 25 Jan 2010 00:05:22 -0600] rev 10281
Introduce check-code.py
check-code is a simple regex-based framework for checking our code and
tests for common style and portability errors. Currently, it knows a
fair amount about our Python and C style, and a little about common
shell script portability problems.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Jan 2010 18:44:12 +0100] rev 10280
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Sat, 23 Jan 2010 02:03:42 +0100] rev 10279
test-encode: Use tr chacter classes instead of character ranges
Solaris ...
Martin Geisler <mg@lazybytes.net> [Sat, 23 Jan 2010 16:55:46 +0100] rev 10278
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sat, 23 Jan 2010 16:54:53 +0100] rev 10277
templates: do not add "ago" twice
After 1d75c683ada1, "ago" is added by the ago template filter.
Martin Geisler <mg@lazybytes.net> [Fri, 22 Jan 2010 17:15:58 +0100] rev 10276
Merge with stable
Mads Kiilerich <mads@kiilerich.com> [Fri, 22 Jan 2010 17:13:55 +0100] rev 10275
tests: Don't use $PWD
$PWD doesn't work with solaris sh - use `pwd` instead
David Soria Parra <dsp@php.net> [Wed, 20 Jan 2010 23:23:18 +0100] rev 10274
mq: Do not translate import message that are appended to commits.
We should not translate the "imported patch" message. The translated message
confuses the detection whether the user has not updated the commit message yet.
We try to avoid to translate generated commit messages.
Patrick Mezard <pmezard@gmail.com> [Thu, 21 Jan 2010 13:26:26 +0100] rev 10273
subrepo: handle svn externals and meta changes (issue1982)
- Detect changes to meta on regular and external entries
- Do not try to commit external entries
Patrick Mezard <pmezard@gmail.com> [Thu, 21 Jan 2010 15:13:40 +0100] rev 10272
subrepo: svn xml output is much easier to parse
That's especially true with status flags: there are different fields and values
for regular changes, meta changes, externals changes and externals meta
changes.
Patrick Mezard <pmezard@gmail.com> [Thu, 21 Jan 2010 15:13:03 +0100] rev 10271
subrepo: make svn use C locale for portability
My reasons to do c2e2a5e6c36b were wrong. We want to have non-localized svn
output while preserving current locale for input arguments and svn internals.
This is achieved by setting LC_MESSAGE=C.
Martin Geisler <mg@lazybytes.net> [Wed, 20 Jan 2010 16:58:48 +0100] rev 10270
Merge with stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Wed, 20 Jan 2010 13:50:06 +0900] rev 10269
summary: L10N messages hide clean-ness of workdir from 'hg summary'
'hg summary' recognizes workdir as clean by searching for 'clean' is
in own output text. But 'clean' is one of I18N target texts, so 'hg
summary --quiet' behaves incorrectly in non-English locale.
Martin Geisler <mg@lazybytes.net> [Wed, 20 Jan 2010 16:48:20 +0100] rev 10268
mercurial.el: add forgotten version number
The number was accidentally removed in the change from GPLv2 to GPLv2+
in 25e572394f5c.
Mads Kiilerich <mads@kiilerich.com> [Sun, 17 Jan 2010 01:53:04 +0100] rev 10267
test-subrepo-svn: remove bashism
Patrick Mezard <pmezard@gmail.com> [Wed, 20 Jan 2010 09:49:15 +0100] rev 10266
Merge with crew-stable
Mads Kiilerich <mads@kiilerich.com> [Sun, 17 Jan 2010 01:52:36 +0100] rev 10265
test-patch-offset: Don't use unified diff
Solaris diff -u likes to be "helpful" and tell that "No differences encountered"
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:45:09 -0600] rev 10264
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:20:08 -0600] rev 10263
Update license to GPLv2+
Matt Mackall <mpm@selenic.com> [Tue, 19 Jan 2010 22:20:05 -0600] rev 10262
copies: speed up copy detection
On some large repos, copy detection could spend > 10min using
fctx.ancestor() to determine if file revisions were actually related.
Because ancestor must traverse history to the root to determine the
GCA, it was doing a lot more work than necessary. With this
replacement, same status -r a:b takes ~3 seconds.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 28 Dec 2009 12:14:26 +0900] rev 10261
hgweb: request: strip() form values
Entering "<correct_cset_hash> " in the search form was not returning anything.
This happens relatively often, due to HTML formatting: when copy/pasting a cset
hash from the web, selection might contain surrounding spaces.
Patrick Mezard <pmezard@gmail.com> [Mon, 18 Jan 2010 22:59:32 +0100] rev 10260
templatekw: fix extras, manifest and showlist args (issue1989)
Removing the explicit parameters from keywords signature is easier than copying
and reproducing the original argument list.
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 18 Jan 2010 15:38:31 -0200] rev 10259
merge with i18n stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 18 Jan 2010 15:37:45 -0200] rev 10258
i18n-pt_BR: synchronized with 279c8a73fde1
Martin Geisler <mg@lazybytes.net> [Sat, 16 Jan 2010 02:40:00 +0100] rev 10257
Merge with stable
Greg Ward <greg-hg@gerg.ca> [Wed, 13 Jan 2010 22:05:06 -0500] rev 10256
share: be more explicit about the dangers of rollback.
Mads Kiilerich <mads@kiilerich.com> [Wed, 06 Jan 2010 03:27:15 +0100] rev 10255
mercurial.spec: Alignment with AIX spec by Jim Hague
* Require Python 2.4 or later
* Note that hgk uses tk - but don't require it
* Remove bashism to support ksh
* Install mq.el
* Handle uncompressed man pages
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 16 Jan 2010 02:33:06 +0100] rev 10254
hgweb: changenav: separate pages before and after the current position
This should allow styles to customize more precisely navigation bar,
for example inserting a cursor to show where we are in the navigation bar.
Jim Hague <jim.hague@acm.org> [Wed, 06 Jan 2010 18:03:33 +0000] rev 10253
Work around AIX shell builtin printf not handling \NNN.
On AIX, ksh builtin printf does not understand \NNN. Some tests use this
to generate test data, and so fail on AIX. Rework these tests to use python
to generate the correct characters. This fixes the tests on AIX and should
be more generally portable.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 15 Jan 2010 21:32:53 +0100] rev 10252
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 15 Jan 2010 21:08:04 +0100] rev 10251
subrepo: fix merging of already merged subrepos (issue1986)
This fixes a bug seen when merging a main repo which contains a subrepo when
both repos have been merged before. Each repo (main and sub) has two
branches, both of which have been merged before.
In a subrepo, if the revision to merge to is an ancestor of the current rev,
then the merge should be a noop.
Test provided by Steve Losh.
Patrick Mezard <pmezard@gmail.com> [Fri, 15 Jan 2010 10:38:11 +0100] rev 10250
Merge with crew-stab le
Patrick Mezard <pmezard@gmail.com> [Fri, 15 Jan 2010 09:50:52 +0100] rev 10249
cmdutil: expand style paths (issue1948)
Fix suggested by Andrea Riciputi <andrea.riciputi@gmail.com>
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:43:14 +0100] rev 10248
hgweb: add a test for search logs
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:42:10 +0100] rev 10247
hgweb: add less/more links for search logs (issue1972)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:28:21 +0100] rev 10246
hgweb: add less/more links to shortlog/filelog nav
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 14 Jan 2010 16:07:34 +0100] rev 10245
hgweb: make graph page size equal to shortlog
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 13 Jan 2010 12:00:06 +0100] rev 10244
merge with stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 13 Jan 2010 11:53:55 +0100] rev 10243
ui: just return it if it's already a bool
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 13 Jan 2010 11:57:32 +0100] rev 10242
demandimport: ignore _winreg (used in python-2.7 mimetypes)
Patrick Mezard <pmezard@gmail.com> [Tue, 12 Jan 2010 22:20:21 +0100] rev 10241
shrink-revlog: add --dry-run option
Patrick Mezard <pmezard@gmail.com> [Sun, 10 Jan 2010 18:13:34 +0100] rev 10240
cmdutil: hide child window created by win32 spawndetached()
Hiding the child process window is not strictly necessary but it avoids opening
an empty shell window when running hg serve as well as a task in the task bar.
The window is hidden after the process is already started causing a single
flicker.
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Jan 2010 21:11:58 +0100] rev 10239
Find right hg command for detached process
On Windows, Mercurial can be run from the python script of from a frozen
executable. In the first case, we have to call the python interpreter since the
script is not executable. Frozen executable can be called directly.
Fix 3/3 for issue421
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Jan 2010 21:11:58 +0100] rev 10238
cmdutil: replace unix pipe handshake with file lock
The pipe handshake cannot be implemented with Windows detached process, which
disables handle inheritance.
Fix 2/3 for issue421