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