Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6297
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6296
debugstate: add --nodates
This can be useful for tests.
Patrick Mezard <pmezard@gmail.com> [Mon, 17 Mar 2008 23:36:45 +0100] rev 6295
patch: fix corner case with update + copy patch handling (issue 937)
The self patching of files when diffed with a backup is a bit peculiar to me.
It makes sense in mpatch, that's less clear in mercurial patching code. Let's
document and preserve it for now.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 14:51:41 -0700] rev 6294
Merge
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 14:51:36 -0700] rev 6293
Backed out changeset 4b81eecc8aa2
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 08:04:09 -0700] rev 6292
Merge
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 07:59:23 -0700] rev 6291
Backed out changeset 91ac1726730a
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:31 -0700] rev 6290
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:04 -0700] rev 6289
issue 1003: send all data properly
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Mar 2008 23:30:47 +0100] rev 6288
Remove unneeded "import os.path" again.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Mar 2008 23:24:53 +0100] rev 6287
Spacing cleanup
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 16 Mar 2008 06:10:47 -0300] rev 6286
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
_repopath may be different from _path for workingfilectx when there
are renames involved.
Eric Hopper <hopper@omnifarious.org> [Sat, 15 Mar 2008 12:42:41 -0700] rev 6285
Change User-agent field in client to have a lot more info.
Eric Hopper <hopper@omnifarious.org> [Sat, 15 Mar 2008 12:42:34 -0700] rev 6284
Allow hgwebdir collections to follow symlinks.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 15 Mar 2008 22:03:18 -0300] rev 6283
Revert cfebb175704f, fixing the output of 2 tests
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 15 Mar 2008 22:03:18 -0300] rev 6282
test-mv-cp-st-diff: avoid linkrev collisions
The copy detection code relies heavily on the linkrevs, so it's better
to avoid collisions in this test.
Patrick Mezard <pmezard@gmail.com> [Sun, 16 Mar 2008 00:35:14 +0100] rev 6281
convert: avoid querying log of foreign svn branches
Server configuration may prevent access to other branches, so don't even try to
get them, instead of ignoring them afterwards.
Patrick Mezard <pmezard@gmail.com> [Sun, 16 Mar 2008 00:35:12 +0100] rev 6280
patch: check filename is /dev/null for creation or deletion (issue 1033)
Otherwise, file creation or deletion is ambiguous with file being filled or
emptied.
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:51:53 -0500] rev 6279
update tests for copy detection changes
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:49:27 -0500] rev 6278
copies: add tests for status -C/diff --git
This goes through 42 combinations of copy/rename branch/parent/working dir.
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:25:27 -0500] rev 6277
copies: deal with symmetric difference for linear relationships
choose the minimum of symmetric difference and the two revs in question
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:24:16 -0500] rev 6276
status: find copies and renames beyond the working directory
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6275
diff: use copy smarts from copies.py
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6274
copies: move findcopies code to its own module
- pass in contexts
- fold symmetricdifference check into copies.copies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6273
merge: move symmetricdifferences to ancestor.py
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6272
merge: simplify some helpers
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6271
merge: more simplifications to checkcopies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6270
merge: simplify checkcopies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6269
merge: privatize some functions, unnest some others
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 11:01:31 -0500] rev 6268
merge: notice uncommited copies (issue1000)
As mentioned in msg5349 in issue988, "hg update" doesn't take into account
uncommitted copies. To reproduce:
----------------
hg init repo
cd repo
touch foo
hg ci -Am 'add foo'
echo >> foo
hg ci -m 'change foo'
hg up -C 0
hg mv foo bar
HGMERGE=false thg --debug -y update
--------------------------
A similar problem happens with hg merge --force.
I'm attaching a possible patch.
Eric Hopper <hopper@omnifarious.org> [Sun, 02 Mar 2008 08:51:02 -0800] rev 6267
Check for patches repo with os.path.isdir not os.path.exists
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 21:57:46 -0300] rev 6266
hook.py: fix redirections introduced by 323b9c55b328
The only non-obvious part is the use of sys.{__stderr__,__stdout__},
which is needed because sshserver overrides sys.stdout.
This makes a test that I added back in revision 7939c71f3132 ineffective.
Jesse Glick <jesse.glick@sun.com> [Mon, 25 Feb 2008 09:55:57 -0500] rev 6265
Issue937: error messages from hooks not sent over HTTP.
Turns out that stderr - where ui.warn would send messages - was not
being proxied over the HTTP connection. stdout was, and it seems you
need both. (The streams are interleaved for readability.)
Tested on Ubuntu 7.10 with lighttpd on hgweb.cgi with HTTP Basic auth,
no SSL, using a changeset failing win32text.forbidcrlf.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 20:01:50 -0300] rev 6264
revlog.py: remove extra close()
atomictempfile.rename() already calls close().
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 14 Mar 2008 23:51:58 +0100] rev 6263
adjust test-http output to non-default HGPORT, e.g. with run-tests.py -j
Stephen Deasey <sdeasey@gmail.com> [Mon, 10 Mar 2008 19:25:34 +0000] rev 6262
hgweb: clarify which address and port can/cannot be bound at startup (bug 769)
The error message at startup when the address/port could not be bound
was confusing:
hg serve
abort: cannot start server: Address already in use
Be more explicit:
$ hg serve -a localhost
abort: cannot start server at 'localhost:8000': Address already in use
Also be more explicit on success, showing hostname and ip address/port:
$ hg -v serve -a localhost -p 80
listening at http://localhost/ (127.0.0.1:80)
We are careful to handle a missconfigured machine whose hostname does not
resolve, falling back to the address given at the command line.
Remove a dead-code error message.
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