Yuya Nishihara <yuya@tcha.org> [Thu, 08 Apr 2010 00:13:33 +0900] rev 10953
remoteui: copy http_proxy settings
http_proxy settings of current repo's .hg/hgrc should be available
on remoteui, so that the httprepo can use them when pulling via http.
Simon Heimberg <simohe@besonet.ch> [Wed, 07 Apr 2010 02:41:22 +0200] rev 10952
dispatch: ignore if signals can not be set
This happens if the code is executed in a thread.
This patch allows tortoisehg to start the inotify server again.
Mark Determann <qwerty360@gmail.com> [Thu, 01 Apr 2010 22:04:30 +0100] rev 10951
hgweb: fix attribute error in error response (
issue2060)
Brandon Parsons <parsonsb@rsn.hp.com> [Thu, 04 Mar 2010 14:32:01 -0600] rev 10950
cvs: skip bad tags
If the CVS repo somehow has a symbolic name that references a revision
consisting of a single number (e.g. BAD_TAG: 1), convert will fail when
attempting to find the branches, preventing the initial import from
working.
This patch skips those symbolic names--without warning.
anatoly techtonik <techtonik@gmail.com> [Wed, 07 Apr 2010 00:35:38 +0300] rev 10949
document missing template variables
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 15 Apr 2010 18:52:59 +0200] rev 10948
diffstat: use ui.plain() instead of ui.interactive()
Previously, a default width of 80 is used for non-interactive
sessions. This behaviour was introduced before HGPLAIN was supported.
Isaac Jurado <diptongo@gmail.com> [Sat, 17 Apr 2010 15:35:34 +0200] rev 10947
mq: Remove -f from qnew command syntax.
In
1ebba857b371 the -f option was not completely removed from the help message.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 15 Apr 2010 14:06:07 +0200] rev 10946
mq: toggle truncating using ui.plain() rather than ui.interactive()
This enables truncated messages when using `qseries' with the `pager'
extension.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 21:47:23 +0200] rev 10945
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 20:41:53 +0200] rev 10944
filemerge: use working dir parent as ancestor for backward wdir merge
I checked the tests, they were bogus in the first place
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 21:44:21 +0200] rev 10943
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Apr 2010 20:30:31 +0200] rev 10942
filectx: _fileid isn't normalized, use _filenode instead
_fileid can be anything the lookup accepts (hex(node), node, rev, etc.), we
should use something stable for comparisons (like _filenode).
Martin Geisler <mg@lazybytes.net> [Mon, 19 Apr 2010 20:49:09 +0200] rev 10941
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10940
convert: write "working copy" instead of "wc"
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10939
convert: mark strings for translation
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10938
convert: write "repository" instead of "repo"
We should strive to avoid slang in our messages to the users.
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10937
minirst: removed unnecessary initindent variable
Martin Geisler <mg@lazybytes.net> [Sun, 18 Apr 2010 15:47:49 +0200] rev 10936
minirst: add margin around definition items
This greatly improves the output of 'hg help env'.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Apr 2010 19:18:20 +0200] rev 10935
dirstate: remove unused variable
Martin Geisler <mg@lazybytes.net> [Fri, 16 Apr 2010 22:14:14 +0200] rev 10934
Merge with stable
Faheem Mitha <faheem@email.unc.edu> [Wed, 14 Apr 2010 11:59:53 +0530] rev 10933
Document 'default' and 'default-push' in paths docstring
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Thu, 15 Apr 2010 18:12:28 +0200] rev 10932
mq: only highlight/label patch name for qseries.
Restore the behaviour introduced in
e37e9904bf10, which was
accidentally removed when labelling was introduced in
717c35d55fb3.
Christian Ebert <blacktrash@gmx.net> [Fri, 16 Apr 2010 14:30:13 +0200] rev 10931
keyword: replace deprecated mq commands in test
Adrian Buehlmann <adrian@cadifra.com> [Fri, 16 Apr 2010 14:57:30 +0200] rev 10930
wix updates
- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Apr 2010 01:58:14 +0200] rev 10929
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Apr 2010 01:57:53 +0200] rev 10928
test-git-import: better testing, check nodeids
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 16 Apr 2010 01:57:32 +0200] rev 10927
context: fix bug introduced in
fb89cd21a7a0, path should be used
Sune Foldager <cryo@cyanite.org> [Thu, 15 Apr 2010 22:34:26 +0200] rev 10926
merge with stable
Sune Foldager <cryo@cyanite.org> [Thu, 15 Apr 2010 21:59:21 +0200] rev 10925
prepush: rewrite most of the code from scratch
For servers with branchmap support, the algorithm now works as follows:
1. A list of branches in outgoing changesets is created.
2. Using the remote branchmap, a check for new branches is performed.
3. A map (from branch to head list) of locally known remote heads before
the push is created, and one which, after step 4, will contain the locally
known remote heads after the push.
4. The post-push head map is updated with the outgoing changesets, using the
branch cache update mechanism.
5. A check for new heads is performed, by comparing the length of the head list
before and after push, for each branch. If there are new heads, an error
depending on whether or not there are incoming changes on the branch,
is returned.
6. If the push is allowed, a warning is written if there are incoming changes
on any branches involved in the push.
For old servers, an algorithm similar to step 4-6 above is used to check for
new topological heads only.
Two bugs are also fixed:
1. Sometimes you would be allowed to push new branch heads without --force.
A test for this case was added.
2. You would get the "note: unsynced remote changes!" warning if there were any
incoming changesets, even if they were on unrelated branches.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 20:25:26 +0200] rev 10924
merge with stable