Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 15:35:57 +0200] rev 5230
hghave: detect git availability
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 14:51:27 +0200] rev 5229
convert: fix issue702 about GIT_DIR= construct unsupported under Windows.
Brendan Cully <brendan@kublai.com> [Sun, 01 Jul 2007 21:09:08 -0700] rev 5228
convert: gitcmd wrapper for os.popen
Brendan Cully <brendan@kublai.com> [Sat, 25 Aug 2007 12:25:53 -0700] rev 5227
Improve extdiff configuration.
In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple
alias = command [opts]... form. For example:
[extdiff]
cdiff = colordiff -uprN
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 16:31:37 +0200] rev 5226
cgi: sys.path.insert should be before importing mercurial
thanks to R. Burke
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:59 +0200] rev 5225
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:11 +0200] rev 5224
improve error message for 'hg merge' when repo already at branchtip
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 22:45:41 -0700] rev 5223
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:52:15 -0700] rev 5222
Merge with crew
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:51:59 -0700] rev 5221
imerge: fix ancestor calculation
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.
This patch also handles the ParseError move from cmdutil to dispatch.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:56:56 +0200] rev 5220
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:56:08 +0200] rev 5219
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:53:16 +0200] rev 5218
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:52:28 +0200] rev 5217
testcase for issue705 (fixed by 316ce5e85b3e)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:39:59 +0200] rev 5216
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:39:16 +0200] rev 5215
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:38:08 +0200] rev 5214
check exec: return fallback in case of error during the check
If there is any error while checking if exec is supported,
we can return fallback.
fix issue705
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 13:59:52 -0700] rev 5213
mq: some improvements to header rewriting (closes #690)
Tested with qrefresh -m against the mm series.
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 12:24:54 -0700] rev 5212
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 12:23:07 -0700] rev 5211
Do not lose previous tags when adding a tag in raw mode
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 23 Aug 2007 01:48:29 -0300] rev 5210
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
Matt Mackall <mpm@selenic.com> [Mon, 20 Aug 2007 21:10:45 -0500] rev 5209
gendoc: use demandimport
Matt Mackall <mpm@selenic.com> [Mon, 20 Aug 2007 21:14:53 -0500] rev 5208
Merge with -crew
Matt Mackall <mpm@selenic.com> [Sun, 19 Aug 2007 14:04:26 -0500] rev 5207
Merge with -stable
Matt Mackall <mpm@selenic.com> [Sun, 19 Aug 2007 14:03:56 -0500] rev 5206
match: handle large regexes
Some Python versions don't handle large regexes, so when we hit an
overflow, split our regex in two.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Aug 2007 02:13:32 +0200] rev 5205
make hg add of a removed file unremove the file
if a file was removed, hg add shouldn't mark the file
as added, but as normal
see issue683
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Aug 2007 02:02:08 +0200] rev 5204
abort when adding a file in merged state
rupert.thurner@gmail.com [Mon, 20 Aug 2007 22:02:05 +0200] rev 5203
add import from url capability
Patrick Mezard <pmezard@gmail.com> [Sun, 19 Aug 2007 17:38:40 +0200] rev 5202
convert: load parent commits on-demand
Patrick Mezard <pmezard@gmail.com> [Sun, 19 Aug 2007 17:38:07 +0200] rev 5201
convert: wrap cached commits author remapping
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 18 Aug 2007 21:36:10 -0300] rev 5200
path_auditor: cache names of audited directories
We use a separate cache to avoid problems with
audit = path_auditor(repo.root)
audit("subrepo")
audit("subrepo/file")
whitelisting "subrepo" (which is fine) and then using the same whitelist
with "subrepo/file" (which is not fine).
Since we create a separate path_auditor for every path on the command line,
a "hg add dir/a dir/b dir/c" will still lstat dir 3 times just to audit
the paths.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Aug 2007 20:21:14 +0200] rev 5199
Quote ^ and ~ chars in test-parentrevspec.
At least ^ causes problems on some sh implementations.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 18 Aug 2007 14:25:55 -0300] rev 5198
Remove demandimport.enable from dispatch.py
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Aug 2007 11:37:08 +0200] rev 5197
Enable demandimport only in scripts, not in importable modules (issue605)
This way other applications can choose if and when they want this feature,
because it might be problematic if those applications rely on ImportError.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 23:20:13 -0300] rev 5196
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 22:43:38 -0300] rev 5195
Fix sshrepo.unbundle
We weren't reading all the data sent by the server. Depending on
the system, the remote hg (actually, the remote python) could send a
"close failed: [Errno 32] Broken pipe", making some tests fail.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 22:43:38 -0300] rev 5194
run-tests.py: pass --install-scripts to setup.py
This avoids possible problems when the user has a ~/.pydistutils.cfg.
Fixes issue638. Patch provided by Ralf Schmitt.
Peter Meerwald <pmeerw@pmeerw.net> [Fri, 17 Aug 2007 22:43:38 -0300] rev 5193
recognize user:password in URLs that include port numbers.
when giving user/pwd in an URL, eg.
hg pull http://user:pwd@host.com:666/hg/something,
hg would still ask for user/pwd in interactive mode (or fail in
non-interactive)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 20:18:05 -0300] rev 5192
convert: fix mercurial_sink.putcommit
Changeset 4ebc8693ce72 added some code to putcommit to avoid creating a
revision that touches no files, but this can break regular conversions
from some repositories:
- conceptually, since we're converting a repo, we should try to make
the new hg repo as similar as possible to the original repo - we
should create a new changeset, even if the original revision didn't
touch any files (maybe the commit message had some important bit);
- even if a "regular" revision that doesn't touch any file may seem
weird (and maybe even broken), it's completely legitimate for a merge
revision to not touch any file, and, if we just skip it, the
converted repo will end up with wrong history and possibly an extra
head.
As an example, say the crew and main hg repos are sync'ed. Somebody
sends an important patch to the mailing list. Matt quickly applies
and pushes it. But at the same time somebody also applies it to crew
and pushes it. Suppose the commit message ended up being a bit
different (say, there was a typo and somebody didn't fix it) or that
the date ended up being different (because of different patch-applying
scripts): the changeset hashes will be different, but the manifests
will be the same.
Since both changesets were pushed to public repos, it's hard to recall
them. If both are merged, the manifest from the resulting merge
revision will have the exact same contents as its parents - i.e. the
merge revision really doesn't touch any file at all.
To keep the file filtering stuff "working", the generic code was changed
to skip empty revisions if we're filtering the repo, fixing a bug in the
process (we want parents[0] instead of tip).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 17:33:27 -0300] rev 5191
Add parentrevspec extension
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 17:33:27 -0300] rev 5190
Move enabling of demandimport to dispatch.py
This avoids loading many modules before enabling demandimport.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Aug 2007 17:33:27 -0300] rev 5189
Move cmdtable and reposetup handling out of extensions.py
A new function (extensions.extensions) allows the code that is
interested in those attributes to handle them directly.
This allows some cleanups of extensions.py. Notably, we can
remove the extensions.commandtable hack.
It also makes it easier to add standard extension attributes,
like a "hgwebsetup" function or a "helptable" dict that augments
the data in help.py, etc.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 17 Aug 2007 19:11:16 +0200] rev 5188
Adjust contrib/hg-ssh for moved dispatch() function.
Matt Mackall <mpm@selenic.com> [Fri, 17 Aug 2007 00:35:16 -0500] rev 5187
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:55:15 -0500] rev 5186
verify: report expected linkrev
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:55:13 -0500] rev 5185
dispatch: move command dispatching into its own module
- move command dispatching functions from commands and cmdutil to dispatch
- change findcmd to take a table argument
- remove circular import of commands in cmdutil
- privatize helper functions in dispatch
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:10:36 -0500] rev 5184
move parseurl from cmdutil to hg
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:10:24 -0500] rev 5183
fix-up references to repo.RepoError
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:09:50 -0500] rev 5182
remove unneeded imports of mdiff
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 15:56:39 -0500] rev 5181
Merge with stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 17 Aug 2007 00:43:49 +0200] rev 5180
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 17 Aug 2007 00:42:22 +0200] rev 5179
clone: do not delete the target if only the update fails
Patrick Mezard <pmezard@gmail.com> [Thu, 16 Aug 2007 08:23:14 +0200] rev 5178
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 16 Aug 2007 08:19:15 +0200] rev 5177
Merge with hg-stable
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 15:30:33 -0500] rev 5176
test-grep: use lowercase hg command
Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 16:22:12 -0700] rev 5175
Merge with crew-stable
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.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 12:10:56 +0200] rev 5118
debugsvnlog call had too many quotes (found by Edouard Gomez)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:28:43 +0200] rev 5117
Remove trailing spaces, fix indentation
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:28:14 +0200] rev 5116
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:24:33 +0200] rev 5115
Remove trailing spaces
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 10:01:20 +0200] rev 5114
Removed debug print from convert/subversion.py
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 09:56:21 +0200] rev 5113
Replace _ with inst for catching exceptions to not shadow gettext.
And removed one _(...) because mercurial.i18n is not yet imported
in convert/subversion.py.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 09:49:07 +0200] rev 5112
Move debugsvnlog to subversion module.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 09:42:32 +0200] rev 5111
convert: Use debugsvnlog instead of git-like debug-svn-log.
Brad Schick <schickb@gmail.com> [Mon, 06 Aug 2007 14:50:57 -0700] rev 5110
extdiff: do single file diffs from the wc with no copy
Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.
Brad Schick <schickb@gmail.com> [Mon, 06 Aug 2007 14:42:11 -0700] rev 5109
extdiff: made it less chatty in non-verbose mode
Made the status info only display in verbose mode since most hg commands aren't so chatty. This also makes it cleaner for other extensions to call extdiff.
Brad Schick <schickb@gmail.com> [Mon, 06 Aug 2007 14:32:23 -0700] rev 5108
extdiff: un-nested two functions
The functions in extdiff that create temporary repo copies for are useful in other extensions, so the change moves them at the module level.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 15:37:14 -0700] rev 5107
convert: remove accidental debug print
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 14:59:00 -0700] rev 5106
convert: use '.' as destination name if renaming subdir into root
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 14:17:05 -0700] rev 5105
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 14:16:50 -0700] rev 5104
convert: only get history for requested revs when converting hg repo
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 14:16:02 -0700] rev 5103
convert: raise correct type of exception if svn converter can't handle rev
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 12:53:49 -0700] rev 5102
record: raise an exception correctly if we can't create a backup directory
Bryan O'Sullivan <bos@serpentine.com> [Mon, 06 Aug 2007 12:53:17 -0700] rev 5101
record: work properly if invoked in a subdirectory
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 21:49:26 +0200] rev 5100
convert: replace fork with subprocess call.
Patrick Mezard <pmezard@gmail.com> [Thu, 02 Aug 2007 23:38:32 +0200] rev 5099
convert: support windows SVN simple auth provider
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Aug 2007 20:31:15 +0200] rev 5098
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Aug 2007 20:25:50 +0200] rev 5097
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 5096
gitweb: add notfound template
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Aug 2007 14:45:43 +0200] rev 5095
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:57:51 +0200] rev 5094
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 10:08:28 +0200] rev 5093
Fix issue 653: symlinks checkout failure on non-supporting platforms
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5092
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 5091
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 5090
hghave: detect support for EOL in paths.
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 10:38:07 +0200] rev 5089
test-git-import: fake executable permissions.
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 10:26:04 +0200] rev 5088
hghave: detect executable permission availability.
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5087
test-clone-failure: fake output upon fifo unavailabity
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5086
hghave: detect FIFO availability
Patrick Mezard <pmezard@gmail.com> [Mon, 06 Aug 2007 09:57:23 +0200] rev 5085
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 5084
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 5083
posixfile_nt: '+' was understood as read mode instead of update.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 06 Aug 2007 01:00:10 -0300] rev 5082
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 06 Aug 2007 00:35:06 -0300] rev 5081
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 5080
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 5079
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 5078
hgwebdir: change os.sep in the name of repos to "/"
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 12:09:55 -0700] rev 5077
convert: svn: remove debugging message
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 12:03:27 -0700] rev 5076
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 5075
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 5074
convert: svn: hoist up branch creation check
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 10:04:28 -0700] rev 5073
convert: svn: remove dead code
Brendan Cully <brendan@kublai.com> [Sun, 05 Aug 2007 10:04:00 -0700] rev 5072
convert: svn: add helper function for optrevs
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 23:07:52 -0700] rev 5071
patch: add git symlink support
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 18:04:35 -0700] rev 5070
Merge with crew
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 18:02:37 -0700] rev 5069
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 5068
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 04 Aug 2007 22:25:12 +0200] rev 5067
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.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 04 Aug 2007 12:38:30 -0700] rev 5066
convert: drop duplicated assignments.
Brendan Cully <brendan@kublai.com> [Sat, 04 Aug 2007 12:26:48 -0700] rev 5065
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 5064
Merge with crew
Brendan Cully <brendan@kublai.com> [Fri, 03 Aug 2007 18:05:20 -0700] rev 5063
imerge: handle renames
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 04 Aug 2007 09:48:21 +0200] rev 5062
merge with crew-stable
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
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