Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 20 Mar 2008 01:47:35 +0100] rev 6304
Make clear that for a changegroup '-r' pulls "up to" a revision
If some better wording is found, it can be changed later.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 19 Mar 2008 16:54:35 -0300] rev 6303
two fixes for the pager stuff
- open pipe in binary mode
- don't start a pager if stdout is not a tty (this prevents test-ssh
from hanging if you set ui.usepager=True in run-tests.py)
David Soria Parra <dsp@php.net> [Tue, 18 Mar 2008 22:12:34 +0100] rev 6302
Use the pager given by the environment to display long output
Unix systems usually have a PAGER environment variable set.
If it is set, mercurial will use the pager application to display
output.
Two configuration variables are available to influence the behaviour of the
pager. ui.pager sets the pager application. The pager is
only used if ui.usepager is true. By default ui.usepager is disabled.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 18:14:59 -0300] rev 6301
Fix thinko in test-inherit-mode
If we don't change any rwx bit in the last test, hg will skip the
calls to chmod since it'll assume they're not needed.
This might fix things on BSD systems.
Patrick Mezard <pmezard@gmail.com> [Mon, 17 Mar 2008 16:15:43 +0100] rev 6300
test-serve: replace copy/paste with shell function
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6299
revert: update state of files in the "checkout" list
This can make a difference when there are filters involved and
decode(encode(working-dir-data)) != working-dir-data
even though
encode(decode(repo-data)) == repo-data
An example is a working dir file that uses only \n when you're using
the win32text extension.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6298
normallookup: during merges, restore the state saved by remove
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.