Martin Geisler <mg@aragost.com> [Fri, 23 Apr 2010 09:53:25 +0200] rev 10974
doc: make links for hg role
The system has a bit of smartness:
:hg:`update` -> links to hg.1.html#update
:hg:`help diffs` -> links to hg.1.html#diffs
Martin Geisler <mg@aragost.com> [Thu, 22 Apr 2010 10:24:49 +0200] rev 10973
Use hg role in help strings
Martin Geisler <mg@aragost.com> [Thu, 22 Apr 2010 10:04:53 +0200] rev 10972
doc, minirst: support hg interpreted text role
Martin Geisler <mg@aragost.com> [Thu, 22 Apr 2010 09:57:04 +0200] rev 10971
doc: add generic frontend to rst2man and rst2html
This will allow us to easily register new roles and directives.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 21 Apr 2010 01:34:12 +0200] rev 10970
localrepo.commit: use explicit variables, avoid creating new contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 21 Apr 2010 01:18:31 +0200] rev 10969
context: remove parents parameter to workingctx
it was needed before the refactor of commit, workingctx always uses the
dirstate now.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 20 Apr 2010 11:17:01 +0200] rev 10968
dirstate: more explicit name, rename normaldirty() to otherparent()
Augie Fackler <durin42@gmail.com> [Sat, 17 Apr 2010 13:38:42 -0500] rev 10967
keyword: monkeypatch patch so that optional args can be passed as kwargs
Augie Fackler <durin42@gmail.com> [Sat, 17 Apr 2010 13:23:24 -0500] rev 10966
patch: refactor applydiff to allow for mempatching
Augie Fackler <durin42@gmail.com> [Sat, 17 Apr 2010 13:13:57 -0500] rev 10965
patch: move mercurial-specific imports after stdlib imports
Augie Fackler <durin42@gmail.com> [Fri, 16 Apr 2010 14:24:40 -0500] rev 10964
test-record: add hg summary to verify we update dirstate
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 20 Apr 2010 01:08:20 +0200] rev 10963
log -b: use opts.get() instead of assuming opts is correctly filled
Matt Mackall <mpm@selenic.com> [Mon, 19 Apr 2010 17:00:02 -0500] rev 10962
Merge with stable
Dévai Tamás <devait@vnet.hu> [Fri, 16 Apr 2010 23:59:43 +0200] rev 10961
Respect the DESTDIR variable during 'make install'
The DESTDIR variable used to tell 'make install' an alternate system root
to install the software to. Since setup.py supports the same via its --root
parameter, it's easy to make life easier for many packagers.
Steve Losh <steve@stevelosh.com> [Mon, 12 Apr 2010 19:33:25 -0400] rev 10960
commands: add more robust support for 'hg log -b' (issue2078)
Fixes issue2078 and adds tests to cover various 'hg log -b' uses.
This change adds a localrepo.lookupbranch(key, remote=None) function. This
will look up the branch of the revision with the given key. The algorithm
works like this:
* If a remote repo is given and KEY is the name of a branch in that repo,
return KEY.
* If no remote repo is given and KEY is the name of a branch in the local
repo object, return KEY.
* Otherwise look up the revision with the identifier KEY in the local repo
and return its branch.
This change also makes 'hg log -b' use this new functionality and adds a few
tests for it.
Matt Mackall <mpm@selenic.com> [Mon, 19 Apr 2010 16:47:44 -0500] rev 10959
highlight: fix to work with caching templater
Matt Mackall <mpm@selenic.com> [Mon, 19 Apr 2010 16:47:44 -0500] rev 10958
debugcomplete: don't list deprecated options
Steve Losh <steve@stevelosh.com> [Sun, 18 Apr 2010 18:18:19 -0400] rev 10957
commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Switching to --branch makes log consistent with push/pull and make more sense
given the actual behavior of the option (you can specify -b multiple times to
include multiple branches).
This change also adds some tests for 'hg log -b'.
Isaac Jurado <diptongo@gmail.com> [Sat, 17 Apr 2010 14:32:26 +0200] rev 10956
bookmarks: complete the missing references from dda4ad7c9ea9 (issue2121)
The fix for issue1611 left one last use of "repo" instead of "self" that has
resulted in more memory leaks from push/pull operations.
Elifarley Callado Coelho Cruz <elifarley@gmail.com> [Tue, 06 Apr 2010 22:15:43 -0300] rev 10955
Added support for 'pretxncommit', so that one can call the ACL hook at
pre-commit time too. This is useful because now it's possible to avoid
violating ACL permissions much sooner, at commit time, instead of
waiting for a PUSH to check if there were any invalid commits.
Brett Cannon <brett@python.org> [Sun, 18 Apr 2010 14:20:08 -0700] rev 10954
subrepo: fix repo root path handling in svn subrepo
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 20:25:07 +0200] rev 10923
run-tests.py: can't remove from os.environ on solaris
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 19:03:03 +0200] rev 10922
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 18:08:48 +0200] rev 10921
workingctx: correctly compute the flag for noexec filesystems+merge
This bug happens if the filesystem doesn't support exec-bit, during merges,
for example in 24ed7a541f23 on the hg repo.
If f is not in p1, but is in p2 and has the x-bit in p2, since the dirstate is
based on p1, and the FS doesn't support the exec-bit, the dirstate can't
"guess" the right bit.
We instead fix it in workingcontext.flags()/manifest.
Sune Foldager <cryo@cyanite.org> [Thu, 15 Apr 2010 17:25:37 +0200] rev 10920
localrepo: simplify _updatebranchcache slightly
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 15:35:06 +0200] rev 10919
merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 15:34:27 +0200] rev 10918
add +x to test-update-renames, removed by the merge on 24ed7a541f23
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 15:21:41 +0200] rev 10917
simplify test-issue2137, make it more portable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 15:21:21 +0200] rev 10916
add documentation for revlog._prereadsize
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Apr 2010 13:52:41 +0200] rev 10915
merge with stable
Greg Ward <greg-hg@gerg.ca> [Wed, 14 Apr 2010 15:06:40 -0400] rev 10914
revlog: fix lazyparser.__iter__() to return all revisions (issue2137)
Previously, it only returned revisions that were in the revlog when it
was originally opened; revisions added since then were invisible.
This broke revlog._partialmatch() and therefore repo.lookup().
(Credit to Benoit Boissinot for simplifying my original test script
and for the actual fix.)
Greg Ward <greg-hg@gerg.ca> [Tue, 13 Apr 2010 17:58:38 -0400] rev 10913
revlog: factor out _maxinline global.
This lets us change the threshold at which a *.d file will be split
out, which should make it much easier to construct test cases that
probe revlogs with a separate data file.
(issue2137)
Sune Foldager <cryo@cyanite.org> [Wed, 14 Apr 2010 19:49:06 +0200] rev 10912
merge with stable
Sune Foldager <cryo@cyanite.org> [Wed, 14 Apr 2010 19:43:40 +0200] rev 10911
merge