Matt Mackall <mpm@selenic.com> [Tue, 09 Oct 2007 17:44:44 -0500] rev 5436
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Oct 2007 08:39:37 -0700] rev 5435
osutil: Solaris build fix
Matt Mackall <mpm@selenic.com> [Tue, 09 Oct 2007 17:25:24 -0500] rev 5434
Merge with -stable
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:22 -0500] rev 5433
findcopies: fix rename bug
We've fiddled with this line several times, and an old bug has
reappeared from it. Let's take a peek at the history.
The original "or" (rev 3674, in 0.9.2 and 0.9.3):
http://www.selenic.com/hg/rev/9103dab96093
Then I changed it to an "and" to fix a bug (rev 4304):
http://www.selenic.com/hg/rev/4787e2b0dd03
Then for reasons now lost in the mists of time, I dropped half (rev 4399):
http://www.selenic.com/hg/rev/93652499bed3
Then we added back the "or" (rev 4416, in 0.9.4):
http://www.selenic.com/hg/rev/bb1800a7d7e1
So it seems it ought to be "and".
Matt Mackall <mpm@selenic.com> [Tue, 09 Oct 2007 17:22:38 -0500] rev 5432
mq: clarify queue top message
Bryan O'Sullivan <bos@serpentine.com> [Mon, 08 Oct 2007 22:45:48 -0700] rev 5431
Fix build error with Sun C compiler.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 08 Oct 2007 21:37:25 -0300] rev 5430
osutil.c: use strncpy instead of strncat
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:22 -0500] rev 5429
findcopies: fix rename bug
We've fiddled with this line several times, and an old bug has
reappeared from it. Let's take a peek at the history.
The original "or" (rev 3674, in 0.9.2 and 0.9.3):
http://www.selenic.com/hg/rev/9103dab96093
Then I changed it to an "and" to fix a bug (rev 4304):
http://www.selenic.com/hg/rev/4787e2b0dd03
Then for reasons now lost in the mists of time, I dropped half (rev 4399):
http://www.selenic.com/hg/rev/93652499bed3
Then we added back the "or" (rev 4416, in 0.9.4):
http://www.selenic.com/hg/rev/bb1800a7d7e1
So it seems it ought to be "and".
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:21 -0500] rev 5428
osutil: more tidying
- do_stat -> keep_stat
- all_kinds -> !need_stat
- simplify main error logic
- reorder declarations
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:18 -0500] rev 5427
osutil: move file list loop to its own function
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:17 -0500] rev 5426
osutil: simplify DT_REG support
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:16 -0500] rev 5425
osutils: pull file stat loop into its own function
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:15 -0500] rev 5424
osutil: fold stat paths together
- simplify st/py_st logic
- use stp to point to stat buffer
- combine stat paths
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:14 -0500] rev 5423
osutil: more cleanups
- eliminate a level of nesting
- untab targets of gotos
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:12 -0500] rev 5422
osutil: eliminate alloca call
- make full_path a PATH_MAX + epsilon local buffer
- use strncpy and strncat
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:06 -0500] rev 5421
osutil: cleanups
- use tabs
- eliminate old-style function pointer calls
- eliminate weird scoping
- eliminate assignment-in-iff
- use !foo rather than foo == NULL
Rafael Villar Burke <pachi@rvburke.com> [Fri, 05 Oct 2007 01:52:53 +0200] rev 5420
Execution bit detection fixes for VFAT on Linux
On Linux VFAT execution mode can be modified, but changes don't
persist a filesy stem remount. The current test can be trickled by
this. We can help with the det ection of VFAT checking whether new
files get created with the execution bits on
(as usually these partitions are mounted with the exec option, for
convenience)
.
Christian Ebert <blacktrash@gmx.net> [Wed, 12 Sep 2007 12:54:36 +0200] rev 5419
churn: simplify code to get terminal width
Patrick Mezard <pmezard@gmail.com> [Mon, 08 Oct 2007 22:20:23 +0200] rev 5418
patch: fix git sendmail handling without proper mail headers
TK Soh <teekaysoh@yahoo.com> [Mon, 08 Oct 2007 11:18:34 +0800] rev 5417
hgk: allow any extdiff command for visual diff
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 07 Oct 2007 21:56:36 +0300] rev 5416
osutil.c: style fix - delete trailing end-of-line spaces
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 07 Oct 2007 20:45:10 +0200] rev 5415
convert: do not output when trying to load svn bindings
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 07 Oct 2007 20:44:54 +0200] rev 5414
convert: split converters into sink/source
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Oct 2007 19:03:32 +0200] rev 5413
Test darcs converter
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Oct 2007 18:59:03 +0200] rev 5412
convert: fix darcs_source.pull() under windows
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Oct 2007 18:58:54 +0200] rev 5411
convert: fix darcs_source._run() under windows
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Oct 2007 18:58:44 +0200] rev 5410
hghave: detect darcs client
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Oct 2007 18:58:36 +0200] rev 5409
hghave: reorder check functions and entries
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Oct 2007 15:13:50 +0200] rev 5408
Test workingctx exec/link bit for copies.
Also, make the test runnable on platforms without symlinks.
Patrick Mezard <pmezard@gmail.com> [Sun, 07 Oct 2007 15:07:35 +0200] rev 5407
Fix workingctx exec/link bit of copies on non-supporting systems
Patrick Mezard <pmezard@gmail.com> [Sat, 06 Oct 2007 22:30:24 +0200] rev 5406
test-manifest: test symlink and exec bit display
Patrick Mezard <pmezard@gmail.com> [Sat, 06 Oct 2007 22:30:22 +0200] rev 5405
Display symlink or executable bit with manifest -v
New output looks like:
644 a
755 * b/a
644 @ l
Patrick Mezard <pmezard@gmail.com> [Sat, 06 Oct 2007 21:19:06 +0200] rev 5404
convert: quote "^" to avoid windows using it as an escape char.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 06 Oct 2007 15:30:15 -0300] rev 5403
Always copy the necessary files before applying a git patch
This patch removes the "copymod" attribute from the gitpatch
class.
AFAICS, that attribute was only used to delay the copying of
renamed/copied files if there are no other changes to the target,
but in this case, if there are changes to the source, we'll end
up copying the wrong version.
This should fix issue762.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 06 Oct 2007 15:30:15 -0300] rev 5402
mercurial_sink: regrab locks in setbranch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 06 Oct 2007 15:30:15 -0300] rev 5401
convert --filemap: reduce memory usage
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 06 Oct 2007 15:30:15 -0300] rev 5400
convert: change SKIPREV to 'SKIP'
Patrick Mezard <pmezard@gmail.com> [Sat, 06 Oct 2007 17:54:33 +0200] rev 5399
Fix bad lambda prototype in workingctx.fileflags()
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 06 Oct 2007 14:14:11 -0300] rev 5398
osutil.c: use readdir instead of readdir64
Some systems (e.g. *BSD) don't have a readdir64 function - the regular
readdir already uses 64-bit types.
On other systems (Linux, Solaris, ...), if Python was compiled with large
file support, Python.h will define _LARGEFILE_SOURCE and _FILE_OFFSET_BITS=64,
so that any call to readdir will actually be a call to readdir64. If Python
was not compiled with large file support, we probably don't want to define
these macros to avoid ABI problems.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 06 Oct 2007 14:14:11 -0300] rev 5397
osutil.c: include Python.h before the other headers
This is recommended by the Python documentation, since Python.h defines
some constants.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 05 Oct 2007 15:01:06 -0700] rev 5396
Add osutil module, containing a listdir function.
This is similar to os.listdir, only it returns a sorted list of tuples.
Patrick Mezard <pmezard@gmail.com> [Fri, 05 Oct 2007 23:40:33 +0200] rev 5395
hgk: add basic usage and configuration documentation
Patrick Mezard <pmezard@gmail.com> [Tue, 02 Oct 2007 23:28:04 +0200] rev 5394
hgk: add context menu visual diff action
* * *
Patrick Mezard <pmezard@gmail.com> [Fri, 05 Oct 2007 22:39:36 +0200] rev 5393
hgk: add debug-config command to pass configuration options
Patrick Mezard <pmezard@gmail.com> [Tue, 02 Oct 2007 23:28:02 +0200] rev 5392
hgk: fix right-mouse button handling under macosx
Patrick Mezard <pmezard@gmail.com> [Fri, 05 Oct 2007 23:01:38 +0200] rev 5391
Test *_ISLINK merge environment vars
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Oct 2007 23:09:36 +0200] rev 5390
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
Patrick Mezard <pmezard@gmail.com> [Fri, 05 Oct 2007 23:01:38 +0200] rev 5389
context: add fileflags() to avoid rebuilding manifests
Bryan O'Sullivan <bos@serpentine.com> [Fri, 05 Oct 2007 12:42:52 -0700] rev 5388
run-tests.py: allow a different temporary directory to be specified
Bryan O'Sullivan <bos@serpentine.com> [Fri, 05 Oct 2007 12:30:19 -0700] rev 5387
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com> [Fri, 05 Oct 2007 12:28:18 -0700] rev 5386
Fix accidentally broken test.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 05 Oct 2007 12:17:29 -0700] rev 5385
Merge with crew.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 05 Oct 2007 12:17:01 -0700] rev 5384
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 05 Oct 2007 09:30:02 -0700] rev 5383
run-tests.py: reorder options alphabetically.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5382
convert_svn: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5381
convert_cvs: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5380
convert_git: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5379
mercurial_source: add --filemap support
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5378
convert: add a mode where mercurial_sink skips empty revisions.
The getchanges function of some converter_source classes can return
some false positives. I.e. they sometimes claim that a file "foo"
was changed in some revision, even though its contents are still the
same.
convert_svn is particularly bad, but I think this can also happen with
convert_cvs and, at least in theory, with mercurial_source.
For regular conversions this is not really a problem - as long as
getfile returns the right contents, we'll get a converted revision
with the right contents. But when we use --filemap, this could lead
to superfluous revisions being converted.
Instead of fixing every converter_source, I decided to change
mercurial_sink to work around this problem.
When --filemap is used, we're interested only in revisions that touch
some specific files. If a revision doesn't change any of these files,
then we're not interested in it (at least for revisions with a single
parent; merges are special).
For mercurial_sink, we abuse this property and rollback a commit if
the manifest text hasn't changed. This avoids duplicating the logic
from localrepo.filecommit to detect unchanged files.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5377
convert: readd --filemap
To handle merges correctly, this revision adds a filemap_source class
that wraps a converter_source and does the work necessary to calculate
the subgraph we're interested in.
The wrapped converter_source must provide a new getchangedfiles method
that, given a revision rev, and an index N, returns the list of files
that are different in rev and its Nth parent.
The implementation depends on the ability to skip some revisions and to
change the parents field of the commit objects that we returned earlier.
To make the conversion restartable, we assume the revisons in the
revmapfile are topologically sorted.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5376
convert: move filemapper class to a separate file
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5375
convert: disable current --filemap support
The --filemap support in hg convert doesn't handle merges correctly.
(And after 33015dac5df5 I managed to break it even for simple cases
where we don't want the first revision.)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5374
convert: allow the converter_source to say "skip this revision"
If getchanges returns a string, it's assumed to be the id of an
already converted revision. We map the current revision to the same
revision this converted revision was mapped to.
To allow skipping a root revision, getchanges can return the special
string 'hg-convert-skipped-revision' (a.k.a. common.SKIPREV), which
hopefully won't clash with any real id.
The converter_source is responsible for rewriting the parents of the
commit objects to make sure the revision graph makes sense.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 04 Oct 2007 23:21:37 -0300] rev 5373
convert: pass the order of the revmapfile to the converter_source
The entries in this file are supposed to be topologically sorted and
this may be useful for a converter_source.
Matt Mackall <mpm@selenic.com> [Thu, 04 Oct 2007 19:47:22 -0500] rev 5372
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 04 Oct 2007 19:44:37 -0500] rev 5371
merge: add debug diagnostics for findcopies
Patrick Mezard <pmezard@gmail.com> [Thu, 04 Oct 2007 14:26:34 +0200] rev 5370
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Oct 2007 14:23:28 +0200] rev 5369
test-convert-git: support older git client (1.4.4.4)
Matt Mackall <mpm@selenic.com> [Wed, 03 Oct 2007 17:17:28 -0500] rev 5368
changegroup: avoid large copies
- handle chunk headers separately rather than prepending them to
(potentially large) chunks
- break large chunks into 1M pieces for compression
- don't prepend file metadata onto (potentially large) file data
Matt Mackall <mpm@selenic.com> [Wed, 03 Oct 2007 17:17:27 -0500] rev 5367
revlog: generate trivial deltas against null revision
To avoid extra memory usage and performance issues with large files,
generate a trivial delta header for deltas against the null revision
rather than calling the usual delta generator.
We append the delta header to meta rather than prepending it to data
to avoid a large allocate and copy.
Matt Mackall <mpm@selenic.com> [Wed, 03 Oct 2007 16:50:32 -0500] rev 5366
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Oct 2007 21:08:37 +0200] rev 5365
Merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Wed, 03 Oct 2007 21:01:47 +0200] rev 5364
test-convert-cvs: handle older cvs client
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 21:01:00 -0700] rev 5363
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 21:00:38 -0700] rev 5362
convert: fix a few residual bugs in darcs importer
Matt Mackall <mpm@selenic.com> [Tue, 02 Oct 2007 18:04:18 -0500] rev 5361
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:49:36 -0700] rev 5360
Merge with crew.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:49:11 -0700] rev 5359
convert: support darcs as a source repo
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:48:52 -0700] rev 5358
convert: fail properly if we can't read a source hg repository
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:46:59 -0700] rev 5357
util: add default argument to strdate
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:46:17 -0700] rev 5356
convert: add before/after hooks for converter sources
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Oct 2007 20:25:35 +0200] rev 5355
merge with -stable
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 16:38:42 +0200] rev 5354
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 12:36:11 +0200] rev 5353
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Sat, 29 Sep 2007 21:10:54 -0700] rev 5352
Merge with crew-stable.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 29 Sep 2007 20:55:36 -0700] rev 5351
Merge with crew.
Terry Smith <terry@t11e.com> [Tue, 11 Sep 2007 13:30:37 -0400] rev 5350
darcs2hg: Added support for darcs tags.
Terry Smith <terry@t11e.com> [Tue, 11 Sep 2007 13:13:54 -0400] rev 5349
darcs2hg: Now detects and recovers from simple darcs conflicts.
Terry Smith <terry@t11e.com> [Tue, 11 Sep 2007 12:42:52 -0400] rev 5348
darcs2hg: Now understands files that were explicitly renamed in darcs.
Steve Borho <steve@ageia.com> [Tue, 02 Oct 2007 20:22:33 +0200] rev 5347
set_exec: do not chmod a symlink
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 16:36:22 +0200] rev 5346
Test debugindexdot
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 12:08:33 +0200] rev 5345
Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 12:08:33 +0200] rev 5344
convert: fix missing import
Bryan O'Sullivan <bos@serpentine.com> [Sat, 29 Sep 2007 21:08:14 -0700] rev 5343
convert: delete empty directories if deleting a file (bug 754)
Matt Mackall <mpm@selenic.com> [Thu, 27 Sep 2007 23:59:18 -0500] rev 5342
bdiff: switch to lyhash
lyhash is a very simple and fast hash function that had the fewest
hash collisions on a 3.9M line text corpus and 190k line binary corpus
and should have significantly fewer collisions than the current hash
function.
Matt Mackall <mpm@selenic.com> [Thu, 27 Sep 2007 23:59:02 -0500] rev 5341
bdiff: use INT_MAX to avoid some inner loop comparisons
Christoph Spiel <cspiel@freenet.de> [Thu, 27 Sep 2007 23:58:54 -0500] rev 5340
bdiff: simple splitlines optimization
Christoph Spiel <cspiel@freenet.de> [Thu, 27 Sep 2007 23:57:57 -0500] rev 5339
I have spotted the biggest bottleneck in "bdiff.c". Actually it was
pretty easy to find after I recompiled the python interpreter and
mercurial for profiling.
In "bdiff.c" function "equatelines" allocates the minimum hash table
size, which can lead to tons of collisions. I introduced an
"overcommit" factor of 16, this is, I allocate 16 times more memory
than the minimum value. Overcommiting 128 times does not improve the
performance over the 16-times case.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 26 Sep 2007 01:58:45 -0300] rev 5338
revlog: fix revlogio.packentry corner case
We want to store version information about the revlog in the first
entry of its index. The code in packentry was using some heuristics
to detect whether this was the first entry, but these heuristics could
fail in some cases (e.g. rev 0 was empty; rev 1 descends directly from
the nullid and is stored as a delta).
We now give the revision number to packentry to avoid heuristics.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 25 Sep 2007 19:05:34 +0200] rev 5337
Don't try to determine interactivity if ui() called with interactive=False.
WSGI applications are not supposed to refer to sys.stdin. In ed6df6b1c29a,
hgweb and hgwebdir were fixed to pass interactive=False to their ui()'s, but
sys.stdin.isatty() was still called by the ui objects. This change makes sure
only the ui.fixconfig() method will call ui.isatty() (by making the
ui._readline() method, which is currently only called from ui.prompt(),
private). ui.fixconfig() is changed to let config files override the initial
interactivity setting, but not check isatty() if interactive=False was
specified in the creation of the ui.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:14:18 -0300] rev 5336
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5335
convert_git: avoid returning two entries for the same file in getchanges
This could happen in merge changesets if the merged file was different
from both parents.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5334
mq: fix qrefresh -e with no patches applied
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5333
Push over HTTP: really tell the user the size of the bundle
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5332
hgwebdir: ignore hgrc parse errors while building the index page
An error in the .hg/hgrc file from a repository would prevent the
following repos from being shown in the index page.
The IOError handling was unnecessary - it's already handled in
readconfig.
This should fix issue731.
The error in the .hg/hgrc file will still prevent the repo from
being exported with hgweb.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5331
hgweb: don't raise an exception when displying empty repos
The nullid node claims it's in the default branch, but the branch dict
is empty. This fixes the main symptom from issue696, but we may want
to set branchtags()['default'] = nullid somewhere for empty repos.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5330
make identify an optionalrepo command
Fixes issue726.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Sep 2007 19:00:11 -0300] rev 5329
copy: if destination ends with "/", make sure it's a directory
Fixes issue724.
Matt Mackall <mpm@selenic.com> [Mon, 24 Sep 2007 12:42:25 -0500] rev 5328
manifest: minor performance tweak
Matt Mackall <mpm@selenic.com> [Mon, 24 Sep 2007 12:41:54 -0500] rev 5327
dirstate: speed up read and write
read:
- single call to len(st)
- fewer assignments for position tracking
- don't split apart tuple from unpack
- use a literal for the unpack spec
write:
- localize variables and functions
- avoid copied function call
- use % for string concatenation
Matt Mackall <mpm@selenic.com> [Mon, 24 Sep 2007 12:36:38 -0500] rev 5326
dirstate: make dir collision logic faster
- shortcircuit decpath if we haven't built the _dirs map
- increment only for leafnodes of directory tree
(this should make construction more like O(nlog n) than O(n^2))
Matt Mackall <mpm@selenic.com> [Mon, 24 Sep 2007 12:34:26 -0500] rev 5325
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 18:24:19 +0200] rev 5324
revlog: fix inlined revision transaction extra data (issue 749)
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 15:29:58 +0200] rev 5323
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Sep 2007 19:05:36 +0200] rev 5322
bisect: remove useless try/except
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Sep 2007 18:56:36 +0200] rev 5321
Merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 22 Sep 2007 18:35:53 +0200] rev 5320
bisect: don't write data on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 22 Sep 2007 18:23:56 +0200] rev 5319
bisect: do silent init if necessary
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 14:40:44 +0200] rev 5318
Test renaming files brought by merge second parent (issue 746)
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 14:40:44 +0200] rev 5317
localrepo: fix undelete() on merge working directory (issue 746)
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Sep 2007 18:52:26 +0200] rev 5316
Test static-http calls on '/' URI (issue 747)
Paul Bx <pb@e-scribe.com> [Sat, 22 Sep 2007 18:37:35 +0200] rev 5315
statichttprepo: fix calls on '/' URI (issue 747)
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:25:25 -0500] rev 5314
convert-cvs: update test to pass on Linux
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:18:06 -0500] rev 5313
verify: report first bad changeset
- add linkrev and file arguments to err
- track lowest reported linkrev in err
- find linkrev in a couple cases
- sort linkrevs when reporting a bunch of errors against a file
- tidy up lots of messages
- make more robust against damaged indexes
- report first bad changeset if an error is encountered
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:14:39 -0500] rev 5312
revlog: more robust for damaged indexes
- fix flag reporting
- make broken length reporting smarter
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:13:38 -0500] rev 5311
debugindex: more robust for damaged indexes
Patrick Mezard <pmezard@gmail.com> [Sat, 15 Sep 2007 16:07:05 +0200] rev 5310
debuginstall: stop looking for patch utility, just test it
Brendan Cully <brendan@kublai.com> [Fri, 14 Sep 2007 21:47:40 -0700] rev 5309
Updated zsh completion from issue722.
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 23:10:41 +0200] rev 5308
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:47:15 +0200] rev 5307
convert: test cvs repository conversion
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5306
convert: workaround for cvsps.cache under Windows
In non-cygwin environment, cvsps fails to create its cache directory and redirect its output to stderr. Just ignore the error and capture stderr as well.
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5305
convert: fix remote cvs file paths separator
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5304
convert: avoid interpreting Windows path as CVS connection strings.
CVS connection strings regexp detect colons to separate protocols from path and login. Unfortunately, Windows paths contains colons and were interpreted as rsh connection strings.
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5303
convert: call popen2 in binary mode, with a command string.
Patrick Mezard <pmezard@gmail.com> [Fri, 14 Sep 2007 22:17:53 +0200] rev 5302
hghave: detect cvs and cvsps availability
"cvsps -h" was returning 1 in cygwin, probably because CVSROOT was unset, which does not prevent it to work correctly.
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5301
hghave: wrap command output matching
Patrick Mezard <pmezard@gmail.com> [Tue, 11 Sep 2007 23:38:29 +0200] rev 5300
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 11 Sep 2007 23:05:30 +0200] rev 5299
Test parents behaviour with files.
Patrick Mezard <pmezard@gmail.com> [Tue, 11 Sep 2007 23:04:42 +0200] rev 5298
parents: make it match the doc when called on a file
parents used to return the parent revision of the last revision updating selected file, instead of the updating revision itself.
Brendan Cully <brendan@kublai.com> [Tue, 11 Sep 2007 13:24:52 -0700] rev 5297
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Tue, 11 Sep 2007 13:23:59 -0700] rev 5296
Document pseudo-tags "null" and ".".
Brendan Cully <brendan@kublai.com> [Mon, 10 Sep 2007 15:00:19 -0700] rev 5295
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 10 Sep 2007 15:00:05 -0700] rev 5294
mq: fix regression in 6fd953d5faea
It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate.
It should be marked added on the second pass.
Patrick Mezard <pmezard@gmail.com> [Mon, 10 Sep 2007 23:53:23 +0200] rev 5293
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 10 Sep 2007 23:34:33 +0200] rev 5292
sshrepo: fix Windows command quoting
Patrick Mezard <pmezard@gmail.com> [Mon, 10 Sep 2007 23:36:01 +0200] rev 5291
extdiff: avoid repr() doubling paths backslashes under Windows
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Sep 2007 17:54:38 +0200] rev 5290
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 07 Sep 2007 17:38:52 +0200] rev 5289
Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.
Edward Lee <edward.lee@engineering.uiuc.edu> [Fri, 07 Sep 2007 16:35:43 +0200] rev 5288
interhg: allow more flexible pattern specification (fixes 2/3 of issue699)
- something else than "pat" followed by a number can be used as key
- something else than "/" can be used as delimiter
- "ilmsux" flags (e.g. "i" for case insensitive) can be used
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Sep 2007 16:14:51 +0200] rev 5287
Don't decode unicode strings.
This does not work with python2.3 and is probably not useful anyway with 2.4.
Brendan Cully <brendan@kublai.com> [Thu, 06 Sep 2007 18:12:36 -0700] rev 5286
Update test-record for 3ef190234b55
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Sep 2007 10:52:54 -0700] rev 5285
record: change wording of initial per-file prompt
Steve Borho <steve@borho.org> [Wed, 05 Sep 2007 21:53:59 +0200] rev 5284
hgk: add repo root to window title
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 04 Sep 2007 18:37:28 +0200] rev 5283
Forgot to quote "6^" in test-parentrevspec (see 94e77a174f55)
Patrick Mezard <pmezard@gmail.com> [Tue, 04 Sep 2007 13:56:15 +0200] rev 5282
test-convert-hg-source: enforce conversion order with --date
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5281
convert: rename a class and a function
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5280
convert: mercurial_source: also search for copies in modified files
There are some corner cases where we may have a copy in a file that
isn't in the added list:
- the result of a hg copy --after --force
- after a merge across a (local) rename
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5279
convert: clear the dirstate before a conversion, invalidate it afterwards
Clearing it before the conversion protects us from whatever data were
there (file copies in particular).
Invalidating it after the conversion avoids writing a possibly
inconsistent dirstate to disk.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5278
convert: avoid dirstate checks; add a test
During a conversion, the dirstate contents are not consistent - there
are files that may be missing from the dirstate and there may be files
that shouldn't be in the dirstate.
While this is not fixed, don't mark files as added - put them directly
in state 'n'ormal.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 23:15:44 +0200] rev 5277
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 13:14:03 +0200] rev 5276
convert/subversion: Use util.set() instead of set() for python2.3 compatibility
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 12:54:07 +0200] rev 5275
Fix \ inside ` problem in test-convert-svn (avoids code duplication, too)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 12:40:23 +0200] rev 5274
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 11:18:29 +0200] rev 5273
hgweb: Show date of last change for each file in manifest
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 01:21:31 +0200] rev 5272
remove unneeded statement
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 30 Aug 2007 23:54:01 +0200] rev 5271
kill lonely docstring
Robert Bachmann <rbach@rbach.priv.at> [Thu, 30 Aug 2007 18:55:56 +0200] rev 5270
Atom support: replaced xhtml namespace prefix with default namespace
Robert Bachmann <rbach@rbach.priv.at> [Thu, 30 Aug 2007 16:42:17 +0200] rev 5269
Added support for the Atom syndication format
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 17:01:10 -0700] rev 5268
Include . in PYTHONPATH (makes testing unbundled extensions easier)
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 16:50:21 -0700] rev 5267
Make run-tests.py work when invoked outside of tests.
This makes it usable for unbundled extensions.
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 16:19:27 -0700] rev 5266
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 28 Aug 2007 23:02:41 -0300] rev 5265
Avoid a working dir walk while trying to detect copies for diff --git
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 28 Aug 2007 22:48:25 -0300] rev 5264
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 17:08:53 -0700] rev 5263
bundle: fix up lazy reads
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 15:48:21 -0700] rev 5262
Make bundlerepo lazier
This allows the localbranch extension to override sopener in time.
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 15:41:31 -0700] rev 5261
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 15:39:07 -0700] rev 5260
convert: new config variable hg.tagsbranch controls which branch tags are committed to
Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 14:48:08 -0700] rev 5259
Push capability checking into protocol-level code.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 14:16:04 -0700] rev 5258
Turn capabilities into a mutable set, instead of a fixed tuple.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 13:38:34 -0700] rev 5257
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 13:38:16 -0700] rev 5256
convert: document filemap.
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5255
Test svn repository conversion
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5254
hghave: detect subversion bindings availability
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5253
hghave: detect subversion client and admin tools availability
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5252
hghave: wrap command output matching
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5251
run-tests: append PYTHONPATH instead of overwriting it
Optional dependencies like svn bindings not necessarily live in site-packages.
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 11:56:53 -0700] rev 5250
convert: svn: check for branch movement in any log entry, not just the first.
This fixes, for example,
r4151
D /branches
A /project/branches (from /branches:4150)
A /project/tags (from /tags:4150)
A /project/trunk (from /trunk:4150)
D /tags
D /trunk
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:55:33 -0300] rev 5249
Merge with crew-stable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 02:21:58 -0300] rev 5248
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 19:13:24 +0200] rev 5247
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 16:49:26 +0200] rev 5246
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Sat, 25 Aug 2007 12:25:53 -0700] rev 5245
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