Matt Mackall <mpm@selenic.com> [Wed, 01 Aug 2007 14:03:48 -0500] rev 5046
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 01 Aug 2007 12:33:12 -0500] rev 5045
merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 12:03:50 -0700] rev 5044
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 12:03:10 -0700] rev 5043
dirstate: improve error message on file/directory clash
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 11:37:11 -0700] rev 5042
imerge extension and test
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 09:57:05 -0700] rev 5041
localrepository: allow rawcommit to commit with an empty message
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Aug 2007 10:42:42 +0200] rev 5040
Update style of record's cmdtable to match mercurial/commands.py
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Aug 2007 10:33:21 +0200] rev 5039
os.isatty isn't available on Windows, so use sys.stdin.isatty()
Bryan O'Sullivan <bos@serpentine.com> [Tue, 31 Jul 2007 17:18:59 -0700] rev 5038
convert: add config option to turn off use of branch names
Bryan O'Sullivan <bos@serpentine.com> [Tue, 31 Jul 2007 16:28:05 -0700] rev 5037
Add record extension, giving darcs-like interactive hunk picking
Bryan O'Sullivan <bos@serpentine.com> [Tue, 31 Jul 2007 16:28:05 -0700] rev 5036
ui: get readline and prompt to behave better depending on interactivity
Bryan O'Sullivan <bos@serpentine.com> [Tue, 31 Jul 2007 16:28:05 -0700] rev 5035
patch: make internal code a bit friendlier to use
Bryan O'Sullivan <bos@serpentine.com> [Tue, 31 Jul 2007 16:28:05 -0700] rev 5034
commands: move commit to cmdutil as wrapper for commit-like functions
Bryan O'Sullivan <bos@serpentine.com> [Mon, 30 Jul 2007 20:49:08 -0700] rev 5033
patch: remove unused parameter from b85diff
Bryan O'Sullivan <bos@serpentine.com> [Mon, 30 Jul 2007 20:48:50 -0700] rev 5032
Update expected test output
It's no longer a "problem" to have the same name listed with no prefix
and a "hgext." prefix.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 30 Jul 2007 14:53:03 -0700] rev 5031
extensions: don't get confused by aliasing between "foo" and "hgext.foo"
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 30 Jul 2007 20:06:11 +0200] rev 5030
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 30 Jul 2007 20:01:16 +0200] rev 5029
Fix re: and glob: patterns in .hgignore (reported by Brad Schick)
relglob: and relre: were already detected for a long time, so
I kept this undocumented functionality, especially as it was already
tested in test-hgignore.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 29 Jul 2007 19:32:55 +0200] rev 5028
test-convert: Hide warning about missing subversion bindings.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 29 Jul 2007 18:53:09 +0200] rev 5027
Fix bashism and remove useless use of cat.
Patrick Mezard <pmezard@gmail.com> [Sat, 28 Jul 2007 20:15:54 +0200] rev 5026
Test qnew --git
Patrick Mezard <pmezard@gmail.com> [Sat, 28 Jul 2007 20:15:54 +0200] rev 5025
mq: add qnew --git option
Bryan O'Sullivan <bos@serpentine.com> [Fri, 27 Jul 2007 14:30:20 -0700] rev 5024
convert: empty log messages are OK as of 7f5c3fb0a37d
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 14:47:31 -0700] rev 5023
localrepo.commit: only munge comment text if committing via dirstate
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 14:08:39 -0700] rev 5022
convert: make test-convert executable
Brendan Cully <brendan@kublai.com> [Thu, 26 Jul 2007 14:04:48 -0700] rev 5021
Merge with bos
Brendan Cully <brendan@kublai.com> [Thu, 26 Jul 2007 14:02:49 -0700] rev 5020
convert svn: canonicalize path before calling url_from_path.
Otherwise libsvn has a tendency to abort().
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 13:38:20 -0700] rev 5019
Ignore mergebackup files generated by mpatch
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 13:36:53 -0700] rev 5018
convert: get rid of ugly use of hasattr
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 13:34:36 -0700] rev 5017
convert: get rid of "hg." prefix where not needed
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 13:34:36 -0700] rev 5016
convert: add filename filtering and renaming support
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 13:34:36 -0700] rev 5015
convert: add test
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 13:34:36 -0700] rev 5014
convert: acquire/release locks periodically
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 13:34:36 -0700] rev 5013
convert: Support Mercurial as a source, as well as a sink
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 13:34:36 -0700] rev 5012
convert: make commit constructor clearer and less magical
Bryan O'Sullivan <bos@serpentine.com> [Thu, 26 Jul 2007 13:34:36 -0700] rev 5011
convert: rename mapfile to revmapfile, so we can map more than just revs
Brendan Cully <brendan@kublai.com> [Thu, 26 Jul 2007 10:57:26 -0700] rev 5010
convert svn: try to extract URL from source if it is a working directory
Brendan Cully <brendan@kublai.com> [Thu, 26 Jul 2007 10:43:01 -0700] rev 5009
Merge with mpm
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5008
revlog: localize some fastpath functions
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5007
revlog: minor chunk speed-up
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5006
revlog: minor revdiff reorganization
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5005
revlog: move flag checking out of the offset fastpath
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5004
dirstate: localize a bunch of methods in status fastpath
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5003
dirstate: speed up sorting in findfiles
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5002
revlog: pass mode to _supported directly
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5001
dirstate: localize a bunch of methods for findfiles
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:55 -0500] rev 5000
Merge with -stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 11:19:53 -0500] rev 4999
merge: don't forget to update the dirstate for exec bit changes
Brendan Cully <brendan@kublai.com> [Thu, 26 Jul 2007 10:42:44 -0700] rev 4998
convert: urlify svn repos if necessary.
We should also try to extract the URL from an svn working directory.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 25 Jul 2007 15:58:10 +0900] rev 4997
posixfile_nt: '+' should allow read access.
This fixes unexpected I/O error on committing many files
due to cset:8a53b39cd402 (r4902 in crew).
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4996
revlog: avoid some unnecessary seek/tell syscalls
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4995
manifest: speed up creation of the manifestdict
- fold iteration and rawset into parse
- avoid creating extra new strings with [:] where possible
- speed up node.bin
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4994
lazyparser.findnode: fix typo and s/rfind/find/
There's no reason to use reverse string search and it's slightly slower
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4993
lazyindex: speed up __getitem__
This function is fairly performance sensitive, so we make a couple
ugly tweaks:
- keep all entries packed so we needn't test entry types
- fold index lookup/load into unpack call to eliminate
local variable setting
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4992
lazyparser: up the blocksize from 512 bytes to 64k
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4991
revlog: implement a fast path for heads
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4990
revlogio: speed up parsing
- precalcuate ending offset
- pull some variables into local scope
- separate inline and out of line code paths
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4989
revlog: eliminate diff and patches functions
call mdiff variants directly
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4988
revlog: speed up chunkcache
- use a reasonable cache size
- avoid an extra copy when we pull in big revs
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4987
revlog: some basic code reordering
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4986
revlog: abstract out index entry packing
This lets us remove most of the remaining v0/v1 logic from revlog
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4985
revlog: simplify revlog.__init__
- move stat into io helper
- get rid of self.defversion and self.indexstat
- fold _load into __init__
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4984
revlog: mark cache private
Matt Mackall <mpm@selenic.com> [Mon, 23 Jul 2007 20:44:08 -0500] rev 4983
revlog: pull chunkcache back into revlog