Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Aug 2007 20:31:15 +0200] rev 5125
merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 10:57:51 +0200] rev 5124
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 06 Aug 2007 01:00:10 -0300] rev 5123
merge with crew-stable
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 12:09:55 -0700] rev 5122
convert: svn: remove debugging message
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 12:03:27 -0700] rev 5121
convert: look up copies in getchanges instead of getcommit
svn: defer path expansion until getchanges to reduce latency, as well as memory
usage when converting incrementally.
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 11:30:52 -0700] rev 5120
convert: svn: pull up path to file expansion code into separate function.
This is part of the process for deferring path expansion until getchanges.
Copy detection also needs to be moved out of the commit object.
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 10:23:45 -0700] rev 5119
convert: svn: hoist up branch creation check
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 10:04:28 -0700] rev 5118
convert: svn: remove dead code
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 10:04:00 -0700] rev 5117
convert: svn: add helper function for optrevs
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 23:07:52 -0700] rev 5116
patch: add git symlink support
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 18:04:35 -0700] rev 5115
Merge with crew
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 18:02:37 -0700] rev 5114
convert: svn: ensure leading / is removed from paths in _find_children (broken in 2bd996d0aaf8)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 04 Aug 2007 22:27:52 +0200] rev 5113
merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Sat, 04 Aug 2007 12:38:30 -0700] rev 5112
convert: drop duplicated assignments.
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 12:26:48 -0700] rev 5111
imerge: gussy up dispatcher to support subcommand opts.
Add -n, --resolved, --unresolved to status.
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 09:33:10 -0700] rev 5110
Merge with crew
Brendan Cully <brendan@kublai.com> [Fri, 03 Aug 2007 18:05:20 -0700] rev 5109
imerge: handle renames
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 04 Aug 2007 09:48:21 +0200] rev 5108
merge with crew-stable
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 15:30:33 -0500] rev 5107
test-grep: use lowercase hg command
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:18:40 +0200] rev 5106
test-grep: test issue 685
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:09:04 +0200] rev 5105
Fix issue 685: trackback in grep -r after rename
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Aug 2007 14:51:49 +0200] rev 5104
The >| redirection does not exist in plain sh.
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:25:49 +0200] rev 5103
hghave: test hotshot dependencies (debian does not provide profile)
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 18:53:45 +0200] rev 5102
test-profile: fix grep, check hotshot availability
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Aug 2007 17:20:51 +0200] rev 5101
merge with -stable
Guillaume Chazarain <guichaz@yahoo.fr> [Tue, 14 Aug 2007 14:29:36 +0200] rev 5100
Return 0 as 'hg bisect reset' is successful
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:27:35 +0200] rev 5099
Test --time, --profile and --lsprof
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:03:15 +0200] rev 5098
demandimport: ignore resource module, not available under Windows.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5097
demandimport: ignore pwd and grp.
Both are unavailable under Windows and tarfile detects them via ImportError.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 12 Aug 2007 12:15:10 -0300] rev 5096
merge: fix a copy detection bug (issue672)
When merging rev1 and rev2, we want to search for copies that happened
in rev1 but not in rev2 and vice-versa. We were starting the search at
rev1/rev2 and then going back, stopping as soon as we reached the revno
of the ancestor, but that can miss some cases (see the new
test-issue672).
Now we calculate the revisions that are ancestors of rev1 or rev2 (but
not both) and make sure the search doesn't stop too early.
Simplified test provided by mpm, based on a test case provided by
Edward Lee.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:34:19 +0200] rev 5095
Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:17:24 +0200] rev 5094
test-context.py: Don't create second repo instance (fixed since 7b5723c95a82)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:07:47 +0200] rev 5093
fancyopts: Copy list arguments in command table before modifying.
Before this, executing
commands.dispatch(['log', '-r', '0'])
commands.dispatch(['log', '-r', 'tip'])
would look like:
hg log -r 0
hg log -r 0 -r tip
Reported by TK Soh, patch by Alexis S. L. Carvalho
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 12:47:58 +0200] rev 5092
Print less scary message if the system supports symlinks:
"Skipping test-no-symlinks: system supports symbolic links"
instead of
"Skipping test-no-symlinks: unexpected feature: symbolic links"
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 12:36:04 +0200] rev 5091
Hide absolute path from test-no-symlinks output.
And add missing eol and remove trailing space which where introduced by the
patches adding this test.
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:14:52 +0200] rev 5090
hghave: prefix temporary files with "hg-hghave-"
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:14:50 +0200] rev 5089
test-no-symlinks: rename .bundle into .hg for consistency.
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 12:34:25 -0700] rev 5088
fix up previous commit for stable
Brendan Cully <brendan@kublai.com> [Wed, 08 Aug 2007 18:04:06 -0700] rev 5087
Cache extension load failures.
hg commands call extensions.loadall twice, once during dispatch and
once when the repository is instantiated. Without this change, load
caches successful loads, but not unsuccessful, causing errors to be
displayed twice.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 09 Aug 2007 01:04:27 +0200] rev 5086
unobfuscate part of f94dbc6c7eaf
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 22:47:18 +0200] rev 5085
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 23:07:39 +0200] rev 5084
hghave: feature absence can be checked by prefixing with 'no-'
Eric Hopper <hopper@omnifarious.org> [Wed, 08 Aug 2007 22:47:30 +0200] rev 5083
Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 15:56:26 +0200] rev 5082
CVS import: Support new-style .cvspass-file format.
Based on an email from Ralf.Leibold at nuance dot com
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:24:33 +0200] rev 5081
Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Aug 2007 20:25:50 +0200] rev 5080
Update on pull -u when heads were closed (fixes issue666).
Patch written by Benoit Boissinot.
This should probably be improved in the future to handle long-living
branches, as joining two "other" heads will switch to that new head.
But this is not a new problem, as adding to the "other" head would have
switched to that new head, too.
Brendan Cully <brendan@kublai.com> [Thu, 05 Jul 2007 19:47:04 -0700] rev 5079
gitweb: add notfound template
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Aug 2007 14:45:43 +0200] rev 5078
Add message to test output if a test is aborted due to a timeout.
Without this an aborted test could produce an empty .err file so the diff
looks like as if all lines of the .out files are just missing for some unknown
reason.
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 10:08:28 +0200] rev 5077
Fix issue 653: symlinks checkout failure on non-supporting platforms
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5076
test-oldcgi: replace shebangs with explicit python calls to help pysh.
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5075
test-issue352: skip tests if platform does not support EOL in paths.
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5074
hghave: detect support for EOL in paths.
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 10:38:07 +0200] rev 5073
test-git-import: fake executable permissions.
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 10:26:04 +0200] rev 5072
hghave: detect executable permission availability.
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5071
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5070
hghave: detect FIFO availability
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5069
Skip test-archive-symlinks if symlinks are not available
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 25 Jul 2007 15:58:10 +0900] rev 5068
posixfile_nt: '+' should allow read access.
This fixes unexpected I/O error on committing many files
due to cset:8a53b39cd402 (r4902 in crew).
Patrick Mezard <pmezard@gmail.com> [Tue, 17 Jul 2007 23:33:42 +0200] rev 5067
posixfile_nt: '+' was understood as read mode instead of update.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 06 Aug 2007 00:35:06 -0300] rev 5066
httprepo: quote the path part of the URL
This should fix a 'hg clone "http://hg.example.org/path with spaces/"'
The code tries to do the right thing when the user passes a path that's
already escaped in part (e.g. "http://hg.example.org/path%20with spaces/").
If we're redirected, urllib2 will happily follow the URL it's given
without escaping anything. I'm not sure what we would have to hook
to work around that.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 05 Aug 2007 23:04:56 -0300] rev 5065
dirstate: fix rebuild; add a test
If rebuild calls invalidate, it will just queue a (re)read of the dirstate
file, while what we really want is to empty the current state.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 05 Aug 2007 22:36:39 -0300] rev 5064
hgweb: don't use os.path.join to build URL parts
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 05 Aug 2007 22:36:39 -0300] rev 5063
hgwebdir: change os.sep in the name of repos to "/"
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 04 Aug 2007 22:25:12 +0200] rev 5062
Simplify/correct finding the hg executable (fixes issue644)
Simply use find_exe('hg') as the default value for $HG and require to manually
set it if you have special requirements.
While the default will not always be 100% correct (i.e. the identical hg
version) for many users it is and for the others the hg executable found in
the PATH should do most things correctly.
Developers or other users with multiple installs can set $HG or run something
like util.set_hgexecutable in their shell or python scripts.
Additionally util.hgexecutable() is now available so extensions can access
the value with a public interface, too.
Brendan Cully <brendan@kublai.com> [Tue, 10 Jul 2007 10:06:24 -0700] rev 5061
archive: abort on empty repository. Fixes #624.
Matt Mackall <mpm@selenic.com> [Thu, 02 Aug 2007 13:23:53 -0500] rev 5060
Merge with -stable
Matt Mackall <mpm@selenic.com> [Thu, 02 Aug 2007 12:29:10 -0500] rev 5059
merge: avoid double deletion mentioned in issue636
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Aug 2007 13:03:25 +0200] rev 5058
merge with hg-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Aug 2007 14:51:49 +0200] rev 5057
The >| redirection does not exist in plain sh.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Aug 2007 14:04:51 +0200] rev 5056
imerge: sorted() is only available in python2.4 and above
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 02 Aug 2007 14:04:00 +0200] rev 5055
imerge: tarfile.extractall is only available in python2.5
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 23:59:19 -0700] rev 5054
Update imerge for new filemerge interface
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 02 Aug 2007 01:56:08 -0300] rev 5053
del transaction before lock before wlock
This way rollbacks happen while the repo is still locked.
Deleting lock before wlock is not strictly necessary, but is
more consistent with the locking order.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 02 Aug 2007 01:56:08 -0300] rev 5052
convert: fix locking order
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 02 Aug 2007 01:56:08 -0300] rev 5051
update tests output
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 15:16:42 -0700] rev 5050
convert: (svn) simplify _find_children
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 14:32:53 -0700] rev 5049
Merge with stable
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 14:32:05 -0700] rev 5048
Update asciidoc instructions to suggest html4 for newer versions
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 14:26:30 -0700] rev 5047
Merge with mpm
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 12:03:50 -0700] rev 5046
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 12:03:10 -0700] rev 5045
dirstate: improve error message on file/directory clash
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 11:37:11 -0700] rev 5044
imerge extension and test
Matt Mackall <mpm@selenic.com> [Wed, 01 Aug 2007 14:03:48 -0500] rev 5043
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 01 Aug 2007 12:33:12 -0500] rev 5042
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 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