Matt Mackall <mpm@selenic.com> [Mon, 11 Feb 2008 16:13:43 -0600] rev 6074
ignore: split up huge patterns
Some versions of Python silently mishandle large regexes, so split
them up at a conservative 20k.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 10 Feb 2008 13:19:24 +0100] rev 6073
Use chmod 0770 and g+s instead of 02770 which does't work on Solaris 8.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 04:24:59 +0100] rev 6072
keyword: no expansion in web diffs
Expansion in hgweb view of changesets and diffs is not needed and
only distracting.
Expansion stays enable in file and archive requests where it
makes sense.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 01:53:19 +0100] rev 6071
keyword: make restrict entirely a kwtemplater attribute
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 22:50:53 +0100] rev 6070
keyword: declare globals in a more compact way
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 22:37:51 +0100] rev 6069
keyword: avoid os import by using util.splitpath
Bryan O'Sullivan <bos@serpentine.com> [Sat, 09 Feb 2008 20:43:42 -0800] rev 6068
Automated merge with http://hg.west.spy.net/hg/hacks/hg
Dustin Sallings <dustin@spy.net> [Fri, 08 Feb 2008 21:31:03 -0800] rev 6067
Option to log to only show changesets within a specified branch.
Jesse Glick <jesse.glick@sun.com> [Sat, 09 Feb 2008 12:27:58 -0500] rev 6066
Strip filter name from command before passing to filter function.
The new registration of in-process data filters (introduced in
f8ad3b76e923 & 11af38a592ae) failed to correctly strip the filter name
from its arguments before passing the "command" to the filter
function. Thus a registration such as
[decode]
*.gz = compress: -9
would result in the associated filter function being called with the
argument 'compress: -9' rather than just '-9' as expected.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Feb 2008 18:38:54 -0200] rev 6065
make the journal/undo files from transactions inherit the mode from .hg/store
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Feb 2008 18:38:54 -0200] rev 6064
add test-inherit-mode
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Feb 2008 18:38:54 -0200] rev 6063
hghave: detect unix-style permissions
By "unix-style" I mean:
- user/group/other permissions
- umask determines original permissions
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Feb 2008 18:38:54 -0200] rev 6062
Make files in .hg inherit the permissions from .hg/store
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 20:17:09 +0100] rev 6061
test-keyword: make it run under Windows
- don't cat symlink, content differs
- rewrite OS specific messages
- generate symlink with a bundle
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 20:17:06 +0100] rev 6060
keyword: fix symlink detection under Windows
Patrick Mezard <pmezard@gmail.com> [Sat, 09 Feb 2008 19:40:30 +0100] rev 6059
keyword: fix mq repository detection under Windows
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Feb 2008 19:39:01 +0100] rev 6058
Do not abort rollback if undo.branch isn't available, but warn.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Feb 2008 19:13:57 +0100] rev 6057
Remove trailing ! from two error messages as this was confusing.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Feb 2008 18:58:31 +0100] rev 6056
Print less scary warning when invalidating the branch cache.
Aleix Conchillo Flaque <aleix@member.fsf.org> [Sat, 09 Feb 2008 17:36:42 +0100] rev 6055
convert: support binary files, link to files (viceversa) in gnu arch
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Feb 2008 13:13:46 +0100] rev 6054
convert: Don't decode unicode strings
This does not work with python2.3 and is probably not useful anyway with 2.4.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Feb 2008 13:08:02 +0100] rev 6053
convert: Compatibility fixes for python2.3
set -> util.set
sort(reverse=True) -> sort(); reverse()
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 22:25:00 +0100] rev 6052
keyword: monkeypatch dispatch._parse to avoid redundant run
Inspired by Thomas Arendsen Hein.
Christian Ebert <blacktrash@gmx.net> [Wed, 06 Feb 2008 23:14:33 +0100] rev 6051
keyword: safeguards against erroneous behaviour or aborts
prevent issues due to global [keyword] filename patterns:
- add email to nokwcommands
- protect everything under .hg from expansion
(tested with qcommit)
- exclude everything starting with .hg* just in case
prevent abort when pulling from bundlerepo:
- do not set up kwrepo for bundlerepo
expansion inside a bundle is nonsense
bundlerepo issue spotted and test case provided by pmezard.
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Feb 2008 15:56:20 +0100] rev 6050
keyword: fix pychecker warning about shadowed variable
Also no underscore prefix for restricted switch inside reposetup.
Aleix Conchillo Flaque <aleix@member.fsf.org> [Fri, 08 Feb 2008 13:56:29 +0100] rev 6049
convert: improve gnu arch source performance and other fixes
- Improve performance by reading 'replay' output instead of
calling 'delta' command after 'replay'. This increases speed
significantly.
- Some times 'replay' command might fail with conflicts (don't
know why), a new get from that revision just fixes it. So,
if something fails, get a fresh copy from that revision and
try from there.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:31:55 -0200] rev 6048
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 13:16:49 -0200] rev 6047
fix syntax in coverage.py, fixing run-tests.py -C
d0576d065993 accidentally broke things.
Michele Cella <michele.cella@gmail.com> [Fri, 08 Feb 2008 15:42:28 +0100] rev 6046
fix to let test-hgwebdir pass
fixes a regression introduced in changeset f25070ecf334
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 08 Feb 2008 11:55:17 +0100] rev 6045
merge with crew-stable
Aleix Conchillo Flaque <aleix@member.fsf.org> [Thu, 07 Feb 2008 12:31:29 +0100] rev 6044
convert: do not skip some lines in gnu arch summaries
Bryan O'Sullivan <bos@serpentine.com> [Wed, 06 Feb 2008 20:00:35 -0800] rev 6043
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 06 Feb 2008 19:57:52 -0800] rev 6042
Merge with crew
jorendorff@mozilla.com [Thu, 26 Jul 2007 07:56:27 -0400] rev 6041
mq.py: add -U option to hg qdiff command
jorendorff@mozilla.com [Thu, 26 Jul 2007 07:56:04 -0400] rev 6040
commands.py, patch.py: add -U option to hg diff command
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 07 Feb 2008 00:41:30 +0100] rev 6039
Update help output of test-convert for GNU arch entry.
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Feb 2008 23:24:15 +0100] rev 6038
Merge with crew-stable
Aleix Conchillo Flaque <aleix@member.fsf.org> [Wed, 06 Feb 2008 11:42:04 +0100] rev 6037
convert: add full description for gnu arch revisions
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Feb 2008 09:11:36 +0100] rev 6036
merge with main
Aleix Conchillo Flaque <aleix@member.fsf.org> [Tue, 05 Feb 2008 09:30:08 +0100] rev 6035
convert: added GNU Arch source converter
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6034
qinit -c: add ^\.hg and ^\.mq to .hgignore
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6033
dirstate.status: avoid putting ignored files in the unknown list
If list_ignored was false, we would blindly add files not in the
dirstate to the unknown list.
This should finish fixing issue886.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6032
dirstate: don't walk ignored directories
With a pattern like '^directory$' in .hgignore, a "hg status directory"
would still walk "directory" and all its subdirs.
This is the first half of a fix for issue886.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6031
revert: don't assume ignored files will be returned in the unknown list
That's just an artifact of the current implementation, and I'll change
that soon.
Bonus points:
- we don't care about the unknown list at all
- we don't print an extra message if we try to revert a removed file
that is not present in the target revision
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6030
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6029
Revert e82dd2dd6276
Those files are supposed to be HTML 4.01, not XML.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 08 Feb 2008 11:50:37 +0100] rev 6028
make static-http work with empty repos (issue965)
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Feb 2008 23:09:13 +0100] rev 6027
mq: qimport must read patches in binary mode
Matt Mackall <mpm@selenic.com> [Tue, 05 Feb 2008 16:09:21 -0600] rev 6026
keyword: fix my string pasting thinko
Spotted by Maxim Dounin
Steve Borho <steve@borho.org> [Mon, 04 Feb 2008 19:38:34 -0600] rev 6025
filemerge: wrap quotes around tool path
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 21:08:45 +0100] rev 6024
keyword: nokwcommands, restricted string variables at top level
- prettier syntax conforming eg. to commands.norepo
- possibly easier to hook from outside
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6023
keyword: split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6022
keyword: add empty_ok argument to kwrepo.commit
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6021
keyword: allow keyword expansion on clone
If [keyword] filename patterns are specified in a global hgrc
keywords will be expanded in clone.
This behaviour is more consistent but also more dangerous.
Specifying global, and thus more complicted, [keyword] patterns
might slow things down as well.
Mention this in help?
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 05 Feb 2008 15:59:10 +0100] rev 6020
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 05 Feb 2008 15:54:42 +0100] rev 6019
cleanly abort on unknown archive type (issue966)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 05 Feb 2008 14:34:46 +0100] rev 6018
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 05 Feb 2008 14:02:03 +0100] rev 6017
hgweb: fix search skipping tip
dhruva <dhruvakm@gmail.com> [Mon, 04 Feb 2008 09:56:01 -0600] rev 6016
filemerge: fix pattern matching
Lee Cantey <lcantey@gmail.com> [Sun, 03 Feb 2008 23:58:02 -0800] rev 6015
filemerge: fix path to working file when fixeol is enabled
Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:53:10 -0600] rev 6014
mergetools: correct vim typo
Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:51:56 -0600] rev 6013
filemerge: handle missing regappend
Lee Cantey <lcantey@gmail.com> [Sun, 03 Feb 2008 23:08:16 -0800] rev 6012
util_win32: add missing valname param to query_val function
Steve Borho <steve@borho.org> [Sun, 03 Feb 2008 22:27:53 -0600] rev 6011
filemerge: two fixes for kdiff3 example configuration