Commit Graph

6395 Commits

Author SHA1 Message Date
Benoit Boissinot
b389d6435c merge with crew 2008-03-14 21:36:09 +01:00
Benoit Boissinot
7043af3e09 make sure not to reuse an existing append-file from a previous failed pull 2008-03-14 21:35:49 +01:00
Alexis S. L. Carvalho
6f8858904c 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.
2008-03-14 10:32:19 -03:00
Alexis S. L. Carvalho
7a9e64075f 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).
2008-03-14 09:56:58 -03:00
Alexis S. L. Carvalho
fa062ecb4c merge: require --force when there are deleted files 2008-03-14 09:56:58 -03:00
Alexis S. L. Carvalho
43ac0bffb6 add a test for 6acd9ff3f1ac 2008-03-14 09:56:58 -03:00
Alexis S. L. Carvalho
4789a32b07 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.
2008-03-14 09:56:58 -03:00
Alexis S. L. Carvalho
c9d5d3c89f debugancestor: use repo.lookup when no revlog was specified 2008-03-14 09:56:58 -03:00
Alexis S. L. Carvalho
88defcf937 update output of test-hgweb 2008-03-14 09:56:58 -03:00
Alexis S. L. Carvalho
552d87eaae 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.
2008-03-14 01:45:17 -03:00
Florent Guillaume
1282137f5c gitweb: show branches in most of the templates 2008-03-13 23:45:36 +01:00
Florent Guillaume
c1858ea074 hgweb_mod: add branch helper functions to use in templates 2008-03-13 23:45:35 +01:00
Bryan O'Sullivan
9bc32e9797 Automated merge with http://hg.intevation.org/mercurial/crew 2008-03-13 19:53:02 -07:00
Thomas Arendsen Hein
597f358322 adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j 2008-03-14 01:39:15 +01:00
Alexis S. L. Carvalho
d897d40d93 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.
2008-03-13 19:50:03 -03:00
Benoit Boissinot
3a35d838ed run-tests.py: add a summary of failed tests at the end 2008-03-13 17:39:30 +01:00
Benoit Boissinot
fd92c733e5 fix incorrect date when committing a tag
regression introduced by f50c54a5d990
2008-03-13 15:40:41 +01:00
Christian Ebert
054ab4657a win32text: use util.binary to detect \0 2008-03-13 10:42:46 +01:00
Alexis S. L. Carvalho
d98fc139f2 merge: fix handling of deleted files 2008-03-12 15:44:08 -07:00
Bryan O'Sullivan
23adb6cef4 setup.py: os.uname is not available on Windows 2008-03-12 15:33:43 -07:00
Bryan O'Sullivan
fe8ea9f17a Automated merge with http://hg.intevation.org/mercurial/crew 2008-03-12 15:31:10 -07:00
Bryan O'Sullivan
08dc4f9063 Add inotify extension 2008-03-12 15:30:11 -07:00
Patrick Mezard
b31dc66c25 convert: rename MAPFILE into REVMAP to disambiguate with filemap 2008-03-12 23:21:01 +01:00
Thomas Arendsen Hein
61fdf43543 Add tests for the fixes to issue1014 (fractional timezones) 2008-03-12 22:20:10 +01:00
Ralf Schmitt
5cc68fbcac Make mercurial easy installable 2008-03-12 21:59:22 +01:00
Thomas Arendsen Hein
36ad657bd7 test-fetch failed due to non-zero exit code 2008-03-12 09:04:20 +01:00
Brendan Cully
a9922f5fcd Hide URL passwords in hg paths output. 2008-03-11 16:28:58 -07:00
Bryan O'Sullivan
c00f264fa3 Merge with main 2008-03-11 16:04:25 -07:00
Jonas Diemer
e984394797 Fixed bash completion for filenames containing spaces. 2008-03-11 23:54:03 +01:00
Thomas Arendsen Hein
c11614e7b8 merge with main 2008-03-11 23:59:43 +01:00
Matt Mackall
44c538327c dates: Fix bare times to be relative to "today" 2008-03-11 17:42:51 -05:00
Matt Mackall
555abf8390 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
2008-03-11 17:42:41 -05:00
Matt Mackall
865487e7f2 revlog: report node and file when lookup fails 2008-03-11 17:42:29 -05:00
Matt Mackall
a62e61efb8 Merge with crew 2008-03-11 17:42:26 -05:00
Bryan O'Sullivan
f9f5e47a2f fetch: don't proceed if working directory is missing files (issue988) 2008-03-11 11:38:12 -07:00
Bryan O'Sullivan
a26a2d3c66 fetch: rename --force-editor option to --edit, for consistency 2008-03-11 11:30:42 -07:00
Matt Mackall
309ee9f391 dates: fix fractional timezone display rounding bug 2008-03-10 02:54:37 -05:00
Stephen Deasey
8fd0ead6b5 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.
2008-03-09 17:34:55 +00:00
Brendan Cully
fd1a53bce5 gitweb: use {url} as entrypoint in notfound.tmpl instead of / 2008-03-08 17:28:25 -08:00
Brendan Cully
e1863ee903 Support web.baseurl in hgwebdir, overriding SCRIPT_NAME 2008-03-08 17:19:18 -08:00
Thomas Arendsen Hein
352ee8c7f1 Fixed typo in tag help, found by John Coomes 2008-03-08 12:40:33 +01:00
Peter Arrenbrecht
33ae436dd8 hgweb: fix test results missed by 6218:94688fe8c7c3 2008-03-07 08:38:07 +01:00
Brendan Cully
c592a63caf gitweb: remove some line breaks in archive and rss columns.
Clean up archive formatting a little in the index page.
2008-03-06 18:40:10 -08:00
Joel Rosdahl
c26213193c Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg 2008-03-06 22:51:16 +01:00
Joel Rosdahl
10088cb75f Add missing import of sys 2008-03-06 22:23:41 +01:00
Joel Rosdahl
bd755ed723 convert: Remove unused clone method 2008-03-06 22:23:41 +01:00
Joel Rosdahl
2cc739b2aa convert: Fix unbound name error in the subversion backend 2008-03-06 22:23:41 +01:00
Joel Rosdahl
9c3f9d4bd6 imerge: Fix unbound name error and add a test case 2008-03-06 22:23:41 +01:00
Joel Rosdahl
4f8012378a Remove unused imports 2008-03-06 22:23:41 +01:00
Joel Rosdahl
5dae3059a0 Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00