Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 16:20:10 -0700] rev 5174
mq: truncate patch just before rewriting header
Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 14:38:18 -0700] rev 5173
convert: raise Abort instead of NoRepo when CVS pserver auth fails.
At this point we know the source is CVS, so we should not go through
the rest of the converters.
Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 13:21:23 -0700] rev 5172
convert: hg: optionally create branches as clones
If convert.hg.clonebranches is set, branches will be created as clones of
their parent revisions. All clones will be subdirectories of the
destination path.
Sascha Wilde <wilde@sha-bang.de> [Wed, 15 Aug 2007 17:27:51 +0200] rev 5171
Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:43:40 +0200] rev 5170
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:18:40 +0200] rev 5169
test-grep: test issue 685
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:09:04 +0200] rev 5168
Fix issue 685: trackback in grep -r after rename
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 14 Aug 2007 21:36:08 +0200] rev 5167
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Aug 2007 14:51:49 +0200] rev 5166
The >| redirection does not exist in plain sh.
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:30:14 +0200] rev 5165
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:25:49 +0200] rev 5164
hghave: test hotshot dependencies (debian does not provide profile)
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:06:10 +0200] rev 5163
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 18:53:45 +0200] rev 5162
test-profile: fix grep, check hotshot availability
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Aug 2007 17:20:51 +0200] rev 5161
merge with -stable
Guillaume Chazarain <guichaz@yahoo.fr> [Tue, 14 Aug 2007 14:29:36 +0200] rev 5160
Return 0 as 'hg bisect reset' is successful
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Aug 2007 18:25:27 +0200] rev 5159
fix bundlerepo broken by 4205f626dc05
since we now use struct in case of lazy parser, this have to be an integer
instead of None
see issue681
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:30:38 +0200] rev 5158
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:27:35 +0200] rev 5157
Test --time, --profile and --lsprof
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:03:15 +0200] rev 5156
demandimport: ignore resource module, not available under Windows.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5155
demandimport: ignore pwd and grp.
Both are unavailable under Windows and tarfile detects them via ImportError.
Brendan Cully <brendan@kublai.com> [Mon, 13 Aug 2007 11:58:47 -0700] rev 5154
imerge: simplify 1d5ebb0d366f
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5153
imerge: fix status file lookups
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5152
demandimport: ignore pwd and grp.
Both are unavailable under Windows and tarfile detects them via ImportError.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:50 +0200] rev 5151
util: ignore invalid path errors in path_auditor.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 12 Aug 2007 12:43:52 -0300] rev 5150
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 12 Aug 2007 12:15:10 -0300] rev 5149
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:35:25 +0200] rev 5148
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:34:19 +0200] rev 5147
Added test for commands.dispatch (especially 88803a69b24)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:17:24 +0200] rev 5146
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 5145
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 5144
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 5143
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.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 10 Aug 2007 10:51:47 -0700] rev 5142
Make a few portability improvements to path auditing code.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 10 Aug 2007 10:46:03 -0700] rev 5141
Make audit_path more stringent.
The following properties of a path are now checked for:
- under top-level .hg
- starts at the root of a windows drive
- contains ".."
- traverses a symlink (e.g. a/symlink_here/b)
- inside a nested repository
If any of these is true, the path is rejected.
The check for traversing a symlink is arguably stricter than necessary;
perhaps we should be checking for symlinks that point outside the
repository.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 20:16:00 -0700] rev 5140
mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 20:03:34 -0700] rev 5139
debugstate: print symlinks as 'lnk', not '777'
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 19:42:33 -0700] rev 5138
manifest: accept -r for rev specification
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 17:29:16 -0700] rev 5137
record: improve docs, improve prompts
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:29:29 +0200] rev 5136
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:14:52 +0200] rev 5135
hghave: prefix temporary files with "hg-hghave-"
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:14:50 +0200] rev 5134
test-no-symlinks: rename .bundle into .hg for consistency.
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 12:35:10 -0700] rev 5133
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 12:34:25 -0700] rev 5132
fix up previous commit for stable
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 11:37:47 -0700] rev 5131
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Wed, 08 Aug 2007 18:04:06 -0700] rev 5130
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:07:11 +0200] rev 5129
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 09 Aug 2007 01:04:27 +0200] rev 5128
unobfuscate part of f94dbc6c7eaf
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 23:11:12 +0200] rev 5127
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 22:47:18 +0200] rev 5126
Test symlink handling on platform not supporting them
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 23:07:39 +0200] rev 5125
hghave: feature absence can be checked by prefixing with 'no-'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 08 Aug 2007 23:00:01 +0200] rev 5124
merge with -stable
Eric Hopper <hopper@omnifarious.org> [Wed, 08 Aug 2007 22:47:30 +0200] rev 5123
Fix hgwebdir after 9858477ed74cce9dc8f4069f9453a1bda0e13ba1 broke it.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 08 Aug 2007 12:27:20 +0200] rev 5122
refactor options from cmdtable
- add extracommitopts for user and date
- factor stuff
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 15:57:23 +0200] rev 5121
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 15:56:26 +0200] rev 5120
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 12:24:25 +0200] rev 5119
raise util.Abort again if specified revision is not an integer.
This was changed to NoRepo in 462cc56d898f, because specifying non-integer
revisions for e.g. the Mercurial backend caused Abort to be raised in the
subversion importer.
Now util.Abort is raised again, but the check is done after verifying if it
really is a subversion repository.