Maxim Dounin <mdounin@mdounin.ru> [Sat, 27 Oct 2007 16:27:55 +0400] rev 5483
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 26 Oct 2007 16:43:13 -0700] rev 5482
See if execute bit is honoured when we go back in time
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Oct 2007 12:37:59 +0200] rev 5481
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Oct 2007 12:01:14 +0200] rev 5480
patchbomb: fix traceback when diffstat isn't available
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Oct 2007 21:37:20 +0200] rev 5479
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Oct 2007 19:40:56 +0200] rev 5478
Only set mode of new patch if the target file was removed before.
If the file is writable by the user, but owned by a different user, the
chmod will otherwise fail with "Operation not permitted".
Additionally make very sure that the file is only written if either the number
of links is <= 1 or the file was successfully removed.
Maybe this minimal COW code should be replaced by something from util.
Patrick Mezard <pmezard@gmail.com> [Thu, 25 Oct 2007 00:09:13 +0200] rev 5477
Merge with crew-stable
Sebastian Hauer <sebastian.hauer@gmail.com> [Wed, 24 Oct 2007 22:15:45 +0200] rev 5476
httprepo: ignore environment proxies when proxies are disabled
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 20 Oct 2007 03:04:34 +0200] rev 5475
gpg: use the same log message format as hg tag
Matt Mackall <mpm@selenic.com> [Fri, 19 Oct 2007 18:25:28 -0500] rev 5474
Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb
Matt Mackall <mpm@selenic.com> [Fri, 19 Oct 2007 18:25:24 -0500] rev 5473
Added tag 0.9.5 for changeset 23889160905a
Christian Ebert <blacktrash@gmx.net> [Fri, 07 Sep 2007 16:48:42 +0200] rev 5472
Catch smtp exceptions
Jim Hague <jim.hague@acm.org> [Fri, 19 Oct 2007 19:20:33 +0000] rev 5471
tests: make test-mq-guards work with ksh
Matt Mackall <mpm@selenic.com> [Fri, 19 Oct 2007 12:53:43 -0500] rev 5470
tests: tidy up reporting of skipped tests
if not verbose:
- print 's' rather than '.'
- pass skipped test reports back to parent for -j
- report which tests were skipped at the end
- print '.' after test completion
Steve Borho <steve@borho.org> [Tue, 18 Sep 2007 19:53:01 -0500] rev 5469
Allow explicit disabling of extensions
If the first character of an extension path is '!', the extension
is silently skipped.
NIIMI Satoshi <sa2c@sa2c.net> [Thu, 11 Oct 2007 06:13:17 +0900] rev 5468
mq.el: define keymaps as convensions
NIIMI Satoshi <sa2c@sa2c.net> [Thu, 11 Oct 2007 06:10:45 +0900] rev 5467
mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs
NIIMI Satoshi <sa2c@sa2c.net> [Thu, 11 Oct 2007 06:01:30 +0900] rev 5466
mq.el: declare variable mq-top
NIIMI Satoshi <sa2c@sa2c.net> [Thu, 11 Oct 2007 05:58:54 +0900] rev 5465
mercurial.el, mq.el: remove runtime dependencies on CL package
* (require 'cl) at compile-time
* don't use map()
Georg.Koltermann@mscsoftware.com [Thu, 12 Apr 2007 13:11:30 +0200] rev 5464
hgk: colorize commits by authors
Color commits by author. Colors will be assigned to authors by using a configurable list of colors. The line corresponding to current id (the version currently in the working tree) is highlighted in a special font which is also configurable. There is provision to assign fixed colors to authors. See .gitk comment for details.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 15 Oct 2007 12:57:01 -0700] rev 5463
osutil: use fdopendir instead of dirfd
Kirill Smelkov <kirr@landau.phys.spbu.ru> [Sat, 13 Oct 2007 15:25:11 +0400] rev 5462
convert: svn -- fix tags handling
They were simply not detected.
Kirill Smelkov <kirr@landau.phys.spbu.ru> [Sat, 13 Oct 2007 15:22:03 +0400] rev 5461
convert: svn -- fix 'exists'
Previously 'exists' erroneously returned False for empty dirictories. This is
wrong since we want to detect even empty 'branches/' or 'tags/'.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 12 Oct 2007 11:23:03 +0200] rev 5460
merge with goto
Shun-ichi GOTO <shunichi.goto@gmail.com> [Fri, 12 Oct 2007 11:46:49 +0900] rev 5459
mpatch: Define Py_ssize_t for old pythons and use it instead of ssize_t.
See also PEP 353.
NOTE: Microsoft compilers (8 or earlier) does not have ssize_t.
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 17:47:04 -0500] rev 5458
mpatch: use int rather than ssize_t
We might need to be more clever than this to make Py2.5 happy.
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 17:46:06 -0500] rev 5457
osutil: improve portability
- manually inline mode_to_kind
- remove unused alloca include
- remove fstatat and associated bits
It's not obvious that there's an advantage to using fstatat in terms
of performance. The race-avoidance properties of fstatat aren't
terribly useful to us either. So best to avoid it until we figure out
how to use it portably.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 Oct 2007 16:28:30 +0200] rev 5456
fix typo
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 Oct 2007 16:26:14 +0200] rev 5455
import gettext since '_' is used
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 Oct 2007 16:19:12 +0200] rev 5454
explicitely use integer division
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 Oct 2007 12:16:55 +0200] rev 5453
fix UnboundLocalError, refactor a bit
bin wasn't defined in all branches (bug introduced in 82b4ff3abbcd
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:56 -0500] rev 5452
bdiff: tweaks for large files
- adjust the common line threshold to .1%
this speeds up a delta of 7M lines of source from 10m to 40s
- adjust the scaling of the hash array down a bit as it was raising the peak
memory usage significantly
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:54 -0500] rev 5451
revlog: break up compression of large deltas
Python's zlib apparently makes an internal copy of strings passed to
compress(). To avoid this, compress strings 1M at a time, then join
them at the end if the result would be smaller than the original.
For initial commits of large but compressible files, this cuts peak
memory usage nearly in half.
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:53 -0500] rev 5450
revlog: fix caching of buffer objects
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:52 -0500] rev 5449
chunkiter: handle large reads more efficiently
- for large reads, don't attempt to read more than necessary
- if we've gathered the exact number of bytes needed, avoid a string copy
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:51 -0500] rev 5448
revlog: avoid large yields in group()
Split large yields so that the downstream consumer (chunkbuffer) will avoid
some pain when reading ahead.
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:49 -0500] rev 5447
chunkiter: simplify iter logic
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:48 -0500] rev 5446
chunkbuffer: removed unused method and arg
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:47 -0500] rev 5445
revlog: reduce memory usage in addgroup
- use a buffer to extract the delta from a chunk
- avoid concatenating to a compressed delta
- use a buffer to directly extra full text from a trivial delta
- delete chunk and delta objects after use
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:45 -0500] rev 5444
mpatch: allow buffer objects for input
Matt Mackall <mpm@selenic.com> [Thu, 11 Oct 2007 00:46:40 -0500] rev 5443
Merge with crew
Those crew folks are getting lazy about pulling from upstream before
committing.
Matt Mackall <mpm@selenic.com> [Tue, 09 Oct 2007 17:44:44 -0500] rev 5442
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 09 Oct 2007 17:25:24 -0500] rev 5441
Merge with -stable
Matt Mackall <mpm@selenic.com> [Mon, 08 Oct 2007 18:47:22 -0500] rev 5440
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 5439
mq: clarify queue top message
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Oct 2007 15:48:08 -0700] rev 5438
test-convert-darcs: don't let $HOME/.darcs pollute the test environment
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Oct 2007 15:42:00 -0700] rev 5437
convert: refactor sink initialisation, to remove hardcoding of hg
We also introduce options to explicitly set the source and destination
repository types.
Improve testing of corner cases a little.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Oct 2007 15:30:00 -0700] rev 5436
convert: add default constructor for converter_sink
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Oct 2007 15:30:00 -0700] rev 5435
convert: make contents of "extra" dict available from sources, for sinks.
This breaks hash preservation for hg->hg conversion, as each converted
change gets a convert_revision item added to its extra dict. Ugh.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Oct 2007 15:30:00 -0700] rev 5434
convert: rename convert_svn to svn_source
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Oct 2007 00:15:33 -0700] rev 5433
convert: report errors more meaningfully if run with --traceback
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Oct 2007 08:39:37 -0700] rev 5432
osutil: Solaris build fix
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
Matt Mackall <mpm@selenic.com> [Wed, 03 Oct 2007 17:17:28 -0500] rev 5370
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 5369
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 5368
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 02 Oct 2007 18:04:18 -0500] rev 5367
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 27 Sep 2007 23:59:18 -0500] rev 5366
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 5365
bdiff: use INT_MAX to avoid some inner loop comparisons
Christoph Spiel <cspiel@freenet.de> [Thu, 27 Sep 2007 23:58:54 -0500] rev 5364
bdiff: simple splitlines optimization
Christoph Spiel <cspiel@freenet.de> [Thu, 27 Sep 2007 23:57:57 -0500] rev 5363
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.
Patrick Mezard <pmezard@gmail.com> [Thu, 04 Oct 2007 14:26:34 +0200] rev 5362
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 04 Oct 2007 14:23:28 +0200] rev 5361
test-convert-git: support older git client (1.4.4.4)
Patrick Mezard <pmezard@gmail.com> [Wed, 03 Oct 2007 21:08:37 +0200] rev 5360
Merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Wed, 03 Oct 2007 21:01:47 +0200] rev 5359
test-convert-cvs: handle older cvs client
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 21:01:00 -0700] rev 5358
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 21:00:38 -0700] rev 5357
convert: fix a few residual bugs in darcs importer
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:49:36 -0700] rev 5356
Merge with crew.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:49:11 -0700] rev 5355
convert: support darcs as a source repo
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:48:52 -0700] rev 5354
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 5353
util: add default argument to strdate
Bryan O'Sullivan <bos@serpentine.com> [Tue, 02 Oct 2007 13:46:17 -0700] rev 5352
convert: add before/after hooks for converter sources
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 02 Oct 2007 20:25:35 +0200] rev 5351
merge with -stable
Steve Borho <steve@ageia.com> [Tue, 02 Oct 2007 20:22:33 +0200] rev 5350
set_exec: do not chmod a symlink
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 16:38:42 +0200] rev 5349
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 16:36:22 +0200] rev 5348
Test debugindexdot
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 12:36:11 +0200] rev 5347
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 12:08:33 +0200] rev 5346
Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Sep 2007 12:08:33 +0200] rev 5345
convert: fix missing import
Bryan O'Sullivan <bos@serpentine.com> [Sat, 29 Sep 2007 21:10:54 -0700] rev 5344
Merge with crew-stable.
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)
Bryan O'Sullivan <bos@serpentine.com> [Sat, 29 Sep 2007 20:55:36 -0700] rev 5342
Merge with crew.
Terry Smith <terry@t11e.com> [Tue, 11 Sep 2007 13:30:37 -0400] rev 5341
darcs2hg: Added support for darcs tags.
Terry Smith <terry@t11e.com> [Tue, 11 Sep 2007 13:13:54 -0400] rev 5340
darcs2hg: Now detects and recovers from simple darcs conflicts.
Terry Smith <terry@t11e.com> [Tue, 11 Sep 2007 12:42:52 -0400] rev 5339
darcs2hg: Now understands files that were explicitly renamed in darcs.
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
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:25:25 -0500] rev 5324
convert-cvs: update test to pass on Linux
Matt Mackall <mpm@selenic.com> [Fri, 21 Sep 2007 17:18:06 -0500] rev 5323
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 5322
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 5321
debugindex: more robust for damaged indexes
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 18:24:19 +0200] rev 5320
revlog: fix inlined revision transaction extra data (issue 749)
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Sep 2007 15:29:58 +0200] rev 5319
Merge with crew-stable
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 19:05:36 +0200] rev 5316
bisect: remove useless try/except
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Sep 2007 18:56:36 +0200] rev 5315
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Sep 2007 18:52:26 +0200] rev 5314
Test static-http calls on '/' URI (issue 747)
Paul Bx <pb@e-scribe.com> [Sat, 22 Sep 2007 18:37:35 +0200] rev 5313
statichttprepo: fix calls on '/' URI (issue 747)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 22 Sep 2007 18:35:53 +0200] rev 5312
bisect: don't write data on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 22 Sep 2007 18:23:56 +0200] rev 5311
bisect: do silent init if necessary
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 22:31:43 +0200] rev 5276
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 22:31:03 +0200] rev 5275
fix the dummy 00changelog.i not being copied on clone
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 13:14:03 +0200] rev 5274
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 5273
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 5272
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 12:32:18 +0200] rev 5271
Make test-convert-git compatible with other git versions (tested with 1.4.4.3)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 11:18:29 +0200] rev 5270
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 5269
remove unneeded statement
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 30 Aug 2007 23:54:01 +0200] rev 5268
kill lonely docstring
Robert Bachmann <rbach@rbach.priv.at> [Thu, 30 Aug 2007 18:55:56 +0200] rev 5267
Atom support: replaced xhtml namespace prefix with default namespace
Robert Bachmann <rbach@rbach.priv.at> [Thu, 30 Aug 2007 16:42:17 +0200] rev 5266
Added support for the Atom syndication format
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 17:01:10 -0700] rev 5265
Include . in PYTHONPATH (makes testing unbundled extensions easier)
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 16:50:21 -0700] rev 5264
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 5263
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 16:15:23 -0700] rev 5262
When reverting a file which was renamed, also revert the old name
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 28 Aug 2007 23:02:41 -0300] rev 5261
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 5260
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 5259
bundle: fix up lazy reads
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 15:48:21 -0700] rev 5258
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 5257
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 15:39:07 -0700] rev 5256
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 5255
Push capability checking into protocol-level code.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 14:16:04 -0700] rev 5254
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 5253
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Mon, 27 Aug 2007 13:38:16 -0700] rev 5252
convert: document filemap.
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5251
Test svn repository conversion
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5250
hghave: detect subversion bindings availability
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5249
hghave: detect subversion client and admin tools availability
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5248
hghave: wrap command output matching
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5247
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 5246
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 5245
Merge with crew-stable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:21:04 -0300] rev 5244
correctly record file-level history when the local side renames a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:21:04 -0300] rev 5243
Fix theoretical issue in filecommit.
If the file was copied, we don't want to reuse the original entry.
I think this is mostly a theoretical issue - when there are copies,
fp1 == nullid, so it's very unlikely that the fl.cmp(fp1, t) would
think the file was unmodified. In any case, if there was a copy,
we should forcefully create a new entry.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:21:04 -0300] rev 5242
Avoid adding to the changelog executable files added by the second parent.
This was a regression introduced by b51a8138292a.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 02:21:58 -0300] rev 5241
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5240
avoid double slash problem mentioned in issue695
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5239
clone: remove "file://" before making the path absolute
This avoids writing bogus paths to .hgrc. Fixes issue695.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5238
pull -u: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5237
clone: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5236
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5235
pull -r: pass the revisions as the heads argument of findincoming
This can make a hg pull -r faster if the remote repo has many heads,
and fixes an "abort: received changelog group is empty".
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 19:13:24 +0200] rev 5234
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 19:05:19 +0200] rev 5233
convert: fix /dev/null redirections under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 16:49:26 +0200] rev 5232
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 15:07:13 +0200] rev 5231
Test git repository conversion
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
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5006
revlog: minor revdiff reorganization
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5005
revlog: move flag checking out of the offset fastpath
Matt Mackall <mpm@selenic.com> [Thu, 26 Jul 2007 12:02:58 -0500] rev 5004
dirstate: localize a bunch of methods in status fastpath