Fabio Zadrozny <fabiofz at gmail dot com> [Sun, 26 Aug 2007 21:31:18 -0300] rev 6103
Propagating changes back to working dirs when changing files in external
Patrick Mezard <pmezard@gmail.com> [Thu, 14 Feb 2008 19:35:40 +0100] rev 6102
test-convert-baz: set username with baz, not tla
Patrick Mezard <pmezard@gmail.com> [Wed, 13 Feb 2008 00:40:18 +0100] rev 6101
Define tla username locally in baz and tla tests
Suggested by Alexis S. L. Carvalho.
Patrick Mezard <pmezard@gmail.com> [Sat, 16 Feb 2008 11:55:33 +0100] rev 6100
convert: fix --datesort ordering
Two branches a and b starting at root, with commits interleaved like:
root a0 a1 b0 a2 a3 b1
were converted in the following order:
root a0 b0 a1 b1 a2 a3
Replace depth based toposort with a more classic traversal method.
Kirill Smelkov <kirr@mns.spb.ru> [Tue, 18 Dec 2007 14:01:34 -0600] rev 6099
[RFC] convert: fix --datesort
The problem is that previously commit.date was used for sorting, but it's a
string like "1 Jan xxx 2007", so it it wrong to use it for sorting.
Another problem is that why we are using depth for sorting -- I have no clear
answer -- it seems to be plain wrong.
This patch is just an RFC.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 15 Feb 2008 15:44:32 -0200] rev 6098
push: exit(1) if "push creates new remote branches!"
Matt Mackall <mpm@selenic.com> [Thu, 14 Feb 2008 10:55:17 -0600] rev 6097
hgweb: Fix stray quote in logo img tag
Matt Mackall <mpm@selenic.com> [Thu, 14 Feb 2008 10:28:27 -0600] rev 6096
hgweb: add new logos
Matt Mackall <mpm@selenic.com> [Thu, 14 Feb 2008 10:25:24 -0600] rev 6095
Add the new "droplet" logo
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Feb 2008 11:25:30 +0100] rev 6094
cat --decode: Drop short option, use opts.get() instead of opts[]
- hg archive --no-decode has no short option, too, and maybe both could use
-d in the future to select revisions by date.
- opts.get makes python scripts calling cat() happy, because they don't have
to pass the new option.
Jesse Glick <jesse.glick@sun.com> [Sat, 09 Feb 2008 13:05:22 -0500] rev 6093
Option --decode for hg cat to apply decode filters.
(Does not trigger expansion of keyword arguments when using keyword
extension, though that might be desirable as well.)
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Feb 2008 23:49:57 +0100] rev 6092
keyword: monkeypatch patch.diff for non-interactive diffs
Avoid clobbering diffs with expanded keywords eg. for
notify extension.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 14 Feb 2008 00:13:20 +0100] rev 6091
merge with main
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Feb 2008 19:34:28 -0200] rev 6090
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Feb 2008 18:37:38 -0200] rev 6089
clone: make things work when source is a repo object
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 13 Feb 2008 18:37:38 -0200] rev 6088
clone: expand the path before saving it in .hg/hgrc
This should fix issue976
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 13 Feb 2008 16:46:43 +0100] rev 6087
better handle errors with date parsing (issue983)
Windows cannot always handle a 1970-01-01 parameter to time.mktime().
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 13 Feb 2008 16:46:43 +0100] rev 6086
better handle errors with date parsing (issue983)
Windows cannot always handle a 1970-01-01 parameter to time.mktime().
Maxim Dounin <mdounin@mdounin.ru> [Wed, 13 Feb 2008 05:27:04 +0300] rev 6085
hgweb: disable cgitb by default in hgwebdir.fcgi too
Patrick Mezard <pmezard@gmail.com> [Tue, 12 Feb 2008 23:35:44 +0100] rev 6084
Document and fix tla/baz conversion tests
Patrick Mezard <pmezard@gmail.com> [Tue, 12 Feb 2008 23:35:35 +0100] rev 6083
convert: detect baz before tla
The former seems to handle repositories built by the latter, the opposite is not true.
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:44:56 +0100] rev 6082
keyword: add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 08:25:09 +0100] rev 6081
keyword: enable all monkey patches using _kwtemplater at reposetup
- no need for try-except block
- underscore prefix for private methods
- add doc strings
Maxim Dounin <mdounin@mdounin.ru> [Tue, 12 Feb 2008 19:07:45 +0300] rev 6080
hgweb: disable cgitb by default
Aleix Conchillo Flaque <aleix@member.fsf.org> [Tue, 12 Feb 2008 11:35:06 +0100] rev 6079
convert: added GNU Arch (tla) tests and related fixes
Aleix Conchillo Flaque <aleix@member.fsf.org> [Tue, 12 Feb 2008 10:38:34 +0100] rev 6078
convert: added gnu arch (baz) tests
Matt Mackall <mpm@selenic.com> [Mon, 11 Feb 2008 16:16:05 -0600] rev 6077
convert: try to be smarter about CVS branching
Better handles this case:
The output from cvsps -A -u --cvs-direct -q:
---------------------
PatchSet 1
Date: 2008/02/08 20:33:28
Author: fk
Branch: HEAD
Tag: (none)
Log:
initial
Members:
file_one:INITIAL->1.1
---------------------
PatchSet 2
Date: 2008/02/08 20:33:32
Author: fk
Branch: branch_name
Ancestor branch: HEAD
Tag: (none)
Log:
new file on branch
Members:
file_two:1.1->1.1.2.1
Steve Borho <steve@borho.org> [Wed, 06 Feb 2008 20:44:25 -0600] rev 6076
filemerge: more backwards compatible behavior for ui.merge
if ui.merge matches a tool in [merge-tools], it is used as the
default tool selection but may be rejected by binary or gui or
other checks. If ui.merge does not match a merge tool, it is
used unconditionally.
Steve Borho <steve@borho.org> [Wed, 06 Feb 2008 20:32:06 -0600] rev 6075
filemerge: add 'checkchanged' merge tool property
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