Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Mar 2008 22:12:50 +0100] rev 6261
revlog: make sure the files are closed after an exception happens
This prevents a corruption when the writes happen after the truncate
initiated by the transaction rollback.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Mar 2008 21:36:09 +0100] rev 6260
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Mar 2008 21:35:49 +0100] rev 6259
make sure not to reuse an existing append-file from a previous failed pull
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 10:32:19 -0300] rev 6258
Fix issue995 (copy --after and symlinks pointing to a directory)
I haven't looked at other places that call os.path.isdir to make
sure they're OK.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6257
dirstate: ignore mode changes if the fs does not supports the exec bit
This can make a difference when e.g. the repo is exported through NFS
(which support exec bits) and CIFS (which does not).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6256
merge: require --force when there are deleted files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6255
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6254
localrepo.commit: normalize commit message even for rawcommit.
This normalization consists of:
- stripping trailing whitespace
- always using "\n" as the line separator
I think the main reason rawcommit was skipping this normalization was
an attempt to preserve hashes during an hg->hg conversion.
While this is a nice goal, it's not particularly interesting in
practice. Since SHA-1 is so strong, the only safe way to do it is to
have absolutely identical revisions. But:
- if the original revision was created with a recent version of hg,
the commit message will be the same, with or without that
normalization
- if it was created with an ancient version of hg that didn't do any
normalization, even if the commit message is identical, the file list
in the changelog is likely to be different (e.g. no removed files),
and there were some old issues with e.g. extra file merging, which
will end up changing the hash anyway
- in any case, if one *really* has to preserve hashes, it's easier
(and faster) to fake a partial conversion using something like:
hg clone -U -r rev orig-repo new-repo
hg -R new-repo log --template '#node# #node#\n' > new-repo/.hg/shamap
Additionally, we've had some reports of problems arising from this lack
of normalization - e.g. issue871, and a user that was wondering why
hg export/hg import was not preserving hashes when there was nothing
unusual going on (it was just import doing the normalization that had
been skipped).
This also means that it's even more unlikely to get identical revisions
when going $VCS->hg->$VCS.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6253
debugancestor: use repo.lookup when no revlog was specified
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6252
update output of test-hgweb
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 01:45:17 -0300] rev 6251
setup.py: use a simplified custom version of CCompiler.has_function
The original one doesn't remove its temporary files and even creates
a temporary file in the CWD.
Florent Guillaume <fg@nuxeo.com> [Thu, 13 Mar 2008 23:45:36 +0100] rev 6250
gitweb: show branches in most of the templates
Florent Guillaume <fg@nuxeo.com> [Thu, 13 Mar 2008 23:45:35 +0100] rev 6249
hgweb_mod: add branch helper functions to use in templates
Bryan O'Sullivan <bos@serpentine.com> [Thu, 13 Mar 2008 19:53:02 -0700] rev 6248
Automated merge with http://hg.intevation.org/mercurial/crew
Christian Ebert <blacktrash@gmx.net> [Thu, 13 Mar 2008 10:42:46 +0100] rev 6247
win32text: use util.binary to detect \0
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 14 Mar 2008 01:39:15 +0100] rev 6246
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 13 Mar 2008 19:50:03 -0300] rev 6245
setup.py: skip inotify if there's no inotify_add_watch
Debian Etch doesn't include a sys/inotify.h header, which makes it
impossible to compile _inotify.c, making hg uninstallable.
The cc.has_function() method is implemented by trying to compile a
simple C program. Since there's no redirection involved all error
messages are sent to the terminal. This is not particularly pretty
but at least it allows the installation to complete.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 13 Mar 2008 17:39:30 +0100] rev 6244
run-tests.py: add a summary of failed tests at the end
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 13 Mar 2008 15:40:41 +0100] rev 6243
fix incorrect date when committing a tag
regression introduced by 989467e8e3a9
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 12 Mar 2008 15:44:08 -0700] rev 6242
merge: fix handling of deleted files
Bryan O'Sullivan <bos@serpentine.com> [Wed, 12 Mar 2008 15:33:43 -0700] rev 6241
setup.py: os.uname is not available on Windows
Bryan O'Sullivan <bos@serpentine.com> [Wed, 12 Mar 2008 15:31:10 -0700] rev 6240
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 12 Mar 2008 15:30:11 -0700] rev 6239
Add inotify extension
Patrick Mezard <pmezard@gmail.com> [Wed, 12 Mar 2008 23:21:01 +0100] rev 6238
convert: rename MAPFILE into REVMAP to disambiguate with filemap
Ralf Schmitt <schmir@gmail.com> [Wed, 12 Mar 2008 21:59:22 +0100] rev 6237
Make mercurial easy installable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 12 Mar 2008 22:20:10 +0100] rev 6236
Add tests for the fixes to issue1014 (fractional timezones)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 12 Mar 2008 09:04:20 +0100] rev 6235
test-fetch failed due to non-zero exit code
Brendan Cully <brendan@kublai.com> [Tue, 11 Mar 2008 16:28:58 -0700] rev 6234
Hide URL passwords in hg paths output.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 11 Mar 2008 16:04:25 -0700] rev 6233
Merge with main
Jonas Diemer <diemer@gmx.de> [Tue, 11 Mar 2008 23:54:03 +0100] rev 6232
Fixed bash completion for filenames containing spaces.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 11 Mar 2008 23:59:43 +0100] rev 6231
merge with main
Matt Mackall <mpm@selenic.com> [Tue, 11 Mar 2008 17:42:51 -0500] rev 6230
dates: Fix bare times to be relative to "today"
Matt Mackall <mpm@selenic.com> [Tue, 11 Mar 2008 17:42:41 -0500] rev 6229
dates: improve timezone handling
datestr:
- add format specifiers %1 and %2 for timezone hours and minutes
- remove timezone and timezone format options
- correctly find timezone hours and minutes for fractional and negative timezones
- update users
strdate:
- correctly find timezone hours and minutes for fractional and negative timezones
Matt Mackall <mpm@selenic.com> [Tue, 11 Mar 2008 17:42:29 -0500] rev 6228
revlog: report node and file when lookup fails
Matt Mackall <mpm@selenic.com> [Tue, 11 Mar 2008 17:42:26 -0500] rev 6227
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 11 Mar 2008 11:38:12 -0700] rev 6226
fetch: don't proceed if working directory is missing files (issue988)
Bryan O'Sullivan <bos@serpentine.com> [Tue, 11 Mar 2008 11:30:42 -0700] rev 6225
fetch: rename --force-editor option to --edit, for consistency
Matt Mackall <mpm@selenic.com> [Mon, 10 Mar 2008 02:54:37 -0500] rev 6224
dates: fix fractional timezone display rounding bug
Stephen Deasey <sdeasey@gmail.com> [Sun, 09 Mar 2008 17:34:55 +0000] rev 6223
churn: show comitter email addresses unclipped (bug 1023)
Email addresses were being clipped at a hard-coded 20 chars. Measure
the length of all email addresses and accommodate the longest.
Brendan Cully <brendan@kublai.com> [Sat, 08 Mar 2008 17:28:25 -0800] rev 6222
gitweb: use {url} as entrypoint in notfound.tmpl instead of /
Brendan Cully <brendan@kublai.com> [Sat, 08 Mar 2008 17:19:18 -0800] rev 6221
Support web.baseurl in hgwebdir, overriding SCRIPT_NAME
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 08 Mar 2008 12:40:33 +0100] rev 6220
Fixed typo in tag help, found by John Coomes
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Mar 2008 08:38:07 +0100] rev 6219
hgweb: fix test results missed by 6218:345a23eca8f6
Brendan Cully <brendan@kublai.com> [Thu, 06 Mar 2008 18:40:10 -0800] rev 6218
gitweb: remove some line breaks in archive and rss columns.
Clean up archive formatting a little in the index page.
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:51:16 +0100] rev 6217
Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6216
Add missing import of sys
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6215
convert: Remove unused clone method
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6214
convert: Fix unbound name error in the subversion backend
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6213
imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:41 +0100] rev 6212
Remove unused imports
Joel Rosdahl <joel@rosdahl.net> [Thu, 06 Mar 2008 22:23:26 +0100] rev 6211
Expand import * to allow Pyflakes to find problems
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Mar 2008 00:24:36 +0100] rev 6210
Removed trailing spaces from everything except test output
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Mar 2008 00:01:13 +0100] rev 6209
Replaced tab in run-tests.py
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 05 Mar 2008 08:00:05 +0100] rev 6208
tests: add --keep-tmp to run-tests.py to debug test environment
When set, you can find the working dir of the test run as a
uniquely named subdirectory of --tmpdir so you can inspect
it.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 05 Mar 2008 09:20:57 -0800] rev 6207
fetch: make test reproducible, tiny code cleanup
Bryan O'Sullivan <bos@serpentine.com> [Wed, 05 Mar 2008 09:10:45 -0800] rev 6206
fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 03 Mar 2008 21:48:43 +0100] rev 6205
mq: test for qclone of http repo+queue
tests f857eac30cd5 and 0c2b443fb3c3
Jesse Glick <jesse.glick@sun.com> [Mon, 03 Mar 2008 12:46:57 -0500] rev 6204
When failing to load an extension, show where Hg tried to load it from.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Mar 2008 23:32:13 +0100] rev 6203
hgweb/annotate: handle binary files like hgweb/file
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Mar 2008 20:54:00 +0100] rev 6202
test-status: Make assert function definition sh compatible.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Mar 2008 13:52:34 +0100] rev 6201
Extend/correct acc40572da5b regarding -qA and ignored files.
hg status -qA will now hide untracked files as described in the doc string.
Zoran Bosnjak <zoran.bosnjak@via.si> [Sat, 01 Mar 2008 22:30:03 +0100] rev 6200
'hg status -q' output skips non-tracked files.
The '-q' flag was ignored in status command. But this flag
can be used to hide non-tracked files in hg status output.
This small correction makes status command more general,
similar to 'svn status', where '-q' flag has the same effect.
The '-u' and '-A' flags have priority over '-q'.
A testcase and doc-string for status was extended to cover
'-q' flag.
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 14:48:21 -0800] rev 6199
highlight: forgot import
Brendan Cully <brendan@kublai.com> [Fri, 29 Feb 2008 14:47:07 -0800] rev 6198
highlight: guess by text when path name is ambiguous
Although the docs claim that guess_lexer_for_filename will fall back
to using file data, my ubuntu 7.10 pygments library seems to ignore
the text argument. So call guess_lexer explicitly on failure.