Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:54:39 -0700] rev 4423
mq.el: add mq-edit-series function.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:54:39 -0700] rev 4422
mq.el: add mq-new function.
Brendan Cully <brendan@kublai.com> [Tue, 08 May 2007 12:36:34 -0700] rev 4421
Fix up patchbomb test
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 12:20:13 -0700] rev 4420
add test for patchbomb extension.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:51:25 -0700] rev 4419
contrib/hgsh: Check for .hg/store as well as .hg/data.
This is required by the new repository layout.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 12:16:02 -0700] rev 4418
MQ: tidy up if a qpush is interrupted.
This aborts the transaction, makes sure the dirtied dirstate isn't
written out, and cleans up the working directory.
Matt Mackall <mpm@selenic.com> [Tue, 08 May 2007 11:42:48 -0500] rev 4417
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 08 May 2007 02:59:13 -0500] rev 4416
merge: fix spurious merges for copies in linear updates
We make better use of contexts to accurately identify copies that
don't need merges.
Add a simple test and update other tests.
Matt Mackall <mpm@selenic.com> [Tue, 08 May 2007 02:57:05 -0500] rev 4415
branch.cache: silently ignore I/O and OS errors
Matt Mackall <mpm@selenic.com> [Mon, 07 May 2007 22:30:36 -0500] rev 4414
context: fix workingfilectx._changectx
NIIMI Satoshi <sa2c@sa2c.net> [Sat, 05 May 2007 15:56:49 +0900] rev 4413
mercurial.el: don't raise an error from find-file-hook
find-file() shouldn't fail even if unreadable .hg directory is exists.
Not enabling hg-mode is sufficient for that senario.
NIIMI Satoshi <sa2c@sa2c.net> [Sat, 05 May 2007 15:50:40 +0900] rev 4412
mercurial.el: move defmacro of hg-do-across-repo before use
Macros must be defined before use to be byte-compiled properly.
Brendan Cully <brendan@kublai.com> [Mon, 07 May 2007 08:42:48 -0700] rev 4411
Unconfuse font-lock
Brendan Cully <brendan@kublai.com> [Sun, 06 May 2007 20:27:45 -0700] rev 4410
Add fast-forward branch merging
Patrick Mezard <pmezard@gmail.com> [Mon, 07 May 2007 00:12:35 +0200] rev 4409
Merge with crew-stable.
HG: changed hgext/mq.py
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 23:44:18 +0200] rev 4408
mq: fix qtop failure when the series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 18:19:25 +0200] rev 4407
Test qtop breaking when series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 16:40:53 +0200] rev 4406
simplemerge: flush stdout before writing to stderr.
Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 16:40:53 +0200] rev 4405
Move win32 find_in_files from util_win32 to util.
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:27:21 -0500] rev 4404
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:26:21 -0500] rev 4403
Merge with crew-stable
Lee Cantey <lcantey@gmail.com> [Thu, 03 May 2007 14:09:09 -0700] rev 4402
Update Windows build instructions.
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4401
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4400
merge: simplify a check in checkcopies
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4399
merge: expand and simplify the invalid handling for directory moves
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4398
merge: fix a bug detecting directory moves
When all the files in a directory are moved, it may be incorrectly marked as moved even if it contains subdirectories.
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4397
merge: clarify the findcopies code
Brendan Cully <brendan@kublai.com> [Tue, 01 May 2007 13:23:32 -0700] rev 4396
mq: account for readheaders munging in qrefresh
Matt Mackall <mpm@selenic.com> [Tue, 01 May 2007 14:42:54 -0500] rev 4395
verify: hold write lock
Verify will report spurious errors if commits or pulls happen during verify.
Brendan Cully <brendan@kublai.com> [Mon, 30 Apr 2007 09:32:44 -0700] rev 4394
Also restore old rm -A behavior for inexact patterns
Brendan Cully <brendan@kublai.com> [Mon, 30 Apr 2007 09:13:27 -0700] rev 4393
Fix rm -A with no patterns, which I just broke.
Brendan Cully <brendan@kublai.com> [Mon, 30 Apr 2007 08:51:59 -0700] rev 4392
Make rm --after simply mark files as removed, unless --force is also given
Michael Gebetsroither <michael.geb@gmx.at> [Sun, 29 Apr 2007 18:17:35 -0700] rev 4391
Add hgwebdir.fcgi to contrib
Brendan Cully <brendan@kublai.com> [Sun, 29 Apr 2007 17:35:03 -0700] rev 4390
Flesh out bisect help text
Matt Mackall <mpm@selenic.com> [Sun, 29 Apr 2007 12:33:24 -0500] rev 4389
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 26 Apr 2007 18:41:18 -0500] rev 4388
Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 25 Apr 2007 13:35:18 -0500] rev 4387
hg serve: don't do DNS lookups
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 28 Apr 2007 17:55:45 -0300] rev 4386
Fix minor mismerge.
The caching of umask ended up being duplicated.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 28 Apr 2007 17:55:45 -0300] rev 4385
run-tests.py: pass -L/--label to simplemerge
This should give us conflict markers that don't change from one run
to another.
Remove some sed's/egrep's from some tests.
Lee Cantey <lcantey@gmail.com> [Thu, 26 Apr 2007 23:58:18 -0700] rev 4384
Add notes about configuring a merge program
Lee Cantey <lcantey@gmail.com> [Fri, 27 Apr 2007 16:04:17 -0700] rev 4383
Update copyright year and change to range
Patrick Mezard <pmezard@gmail.com> [Sat, 28 Apr 2007 11:53:36 +0200] rev 4382
Use patch.patch() when checking for patch availability.
The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.
Brendan Cully <brendan@kublai.com> [Sat, 28 Apr 2007 09:03:47 -0700] rev 4381
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Sat, 28 Apr 2007 11:43:31 +0200] rev 4380
Fix find_in_path not including some file extension logic under win32.
Windows shell resolves utility path by combining PATH, the utility name and a set of file extensions from PATHEXT.
Joel Rosdahl <joel@rosdahl.net> [Sat, 28 Apr 2007 16:28:54 +0200] rev 4379
Fix bad reference to RepoError in import command
Bryan O'Sullivan <bos@serpentine.com> [Fri, 27 Apr 2007 21:30:55 -0700] rev 4378
Refactor commands.serve to allow other commands to run as services.
This introduces a new function, cmdutil.service.
Brendan Cully <brendan@kublai.com> [Wed, 25 Apr 2007 13:14:01 -0700] rev 4377
Do not automatically rename an atomicfile if a write to it has generated an exception.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 25 Apr 2007 18:43:55 +0200] rev 4376
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Jan 2007 23:07:06 +0100] rev 4375
Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize()
- fix off by 11 when checking if there are more hunks (found by Maris Fogels)
- bail out if start is greater than end
- check if new hunk starts after start/end/len block of current hunk as
the pointer can wrap around on very large values, reproducible with
import mpatch; mpatch.patchedsize(12, 'x'*12)
Brendan Cully <brendan@kublai.com> [Tue, 24 Apr 2007 18:43:18 -0700] rev 4374
Make copy --after work for files that have been hg added.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 24 Apr 2007 12:02:51 -0700] rev 4373
When reloading the dirstate, recompute ignore information if needed.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 24 Apr 2007 12:02:42 -0700] rev 4372
dirstate: speed up write by 50%.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 24 Apr 2007 11:46:15 -0700] rev 4371
dirstate: make parents() faster.
This allows localrepository.status() to avoid reading all but the
first 40 bytes of the dirstate in the common case of running "hg
status".
Bryan O'Sullivan <bos@serpentine.com> [Tue, 24 Apr 2007 11:05:39 -0700] rev 4370
localrepository.status: only acquire wlock if actually needed.
This speeds up the common case of not needing to update the dirstate,
and avoids the need to reload and parse the dirstate "just in case".
Bryan O'Sullivan <bos@serpentine.com> [Tue, 24 Apr 2007 10:53:25 -0700] rev 4369
util._matcher: speed up regexp matching.
In 4babaa52badf, Benoit made a change that substantially slows matching
when a big .hgignore file is in play, because it calls into the regexp
matching engine potentially hundreds of times per file to be matched.
I've partly rolled back his change, so that we only call into the matcher
once per file, but preserved the ability to report a meaningful error
message if there's a syntax error in the regexp.
Brendan Cully <brendan@kublai.com> [Tue, 24 Apr 2007 10:47:41 -0700] rev 4368
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Tue, 24 Apr 2007 10:44:13 -0700] rev 4367
Work around python 2.5.1 tarfile regression
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Apr 2007 17:54:43 +0200] rev 4366
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Apr 2007 17:52:42 +0200] rev 4365
Avoid float rounding errors when checking http protocol version.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Apr 2007 13:04:26 +0200] rev 4364
Work around problem where 'del os.environ["FOO"]' doesn't update environment.
test-hook failed since changeset 949516072388 because of this on Solaris 8.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 19 Apr 2007 12:47:55 +0200] rev 4363
Use python instead of shell printf with \x for test-simplemerge-cmd
Needed e.g. to be compatible with Solaris.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:23:45 -0300] rev 4362
Merge with crew.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4361
change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4360
polish the simplemerge command; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4359
actually port simplemerge to hg
- use bdiff instead of patiencediff; this is a larger change, since
bdiff works on 2 multi-line strings, while patiencediff works on 2
lists;
- rename the main class from Merge3 to Merge3Text and add a Merge3
class that derives from Merge3Text. This new Merge3 class has
the same interface from the original class, so that the tests
still work;
- Merge3 uses util.binary to detect binary data and raises
util.Abort instead of a specific exception;
- don't use the @decorator syntax, to keep python2.3 compatibility;
- the test uses unittest, which likes to print how long it took to
run. This obviously doesn't play too well with hg's test suite,
so we override time.time to fool unittest;
- one test has a different (but still valid) output because of the
different diff algorithm used;
- the TestCase class used by bzr has some extras to help debugging.
test-merge3.py used 2 of them:
- log method to log some data
- assertEqualDiff method to ease viewing diffs of diffs
We add a dummy log method and use regular assertEquals instead of
assertEqualDiff.
- make simplemerge executable and add "#!/usr/bin/env python" header
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4358
Import 3-way merge code from bzr
merge3.py is imported as contrib/simplemerge
test_merge3.py is imported as tests/test-simplemerge.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 20:17:39 -0300] rev 4357
add mdiff.get_matching_blocks
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 12:37:30 -0500] rev 4356
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 12:27:49 -0500] rev 4355
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 12:24:52 -0500] rev 4354
merge: fix quadratic behavior in find-copies
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 13:31:15 -0300] rev 4353
Merge with crew-stable.
TK Soh <teekaysoh@yahoo.com> [Tue, 10 Apr 2007 16:25:21 -0500] rev 4352
test-command-template: improve test coverage
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 13:00:23 -0300] rev 4351
command line templates: add formatnode filter
This will print a full hash node with --debug and a short one otherwise.
Use it with some default templates and in map-cmdline.default to print
the parents. This should fix issue538.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 16 Apr 2007 13:00:23 -0300] rev 4350
fix 'hg <not-log> -v --template foo' with revisions without copies
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 09:52:37 -0500] rev 4349
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 16 Apr 2007 09:51:50 -0500] rev 4348
hgweb: fix rfind bug in PATH_INFO handling
Matt Mackall <mpm@selenic.com> [Sun, 15 Apr 2007 18:42:51 -0500] rev 4347
Merge with crew
Matt Mackall <mpm@selenic.com> [Sun, 15 Apr 2007 18:42:38 -0500] rev 4346
Merge with stable
Matt Mackall <mpm@selenic.com> [Sun, 15 Apr 2007 18:40:22 -0500] rev 4345
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 12 Apr 2007 11:00:21 -0500] rev 4344
hgweb: make PATH_INFO handling slightly more robust
Matt Mackall <mpm@selenic.com> [Thu, 12 Apr 2007 12:42:22 -0500] rev 4343
Merge with crew
Brendan Cully <brendan@kublai.com> [Thu, 12 Apr 2007 16:05:28 -0700] rev 4342
Merge with Matt
Matt Mackall <mpm@selenic.com> [Tue, 10 Apr 2007 14:05:15 -0500] rev 4341
Merge with stable
Joel Rosdahl <joel@rosdahl.net> [Mon, 09 Apr 2007 10:39:28 +0200] rev 4340
Add graphlog extension
Brendan Cully <brendan@kublai.com> [Thu, 12 Apr 2007 15:07:05 -0700] rev 4339
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 12 Apr 2007 14:45:53 -0700] rev 4338
mq: fix qtop when some patches beneath are guarded
Patrick Mezard <pmezard@gmail.com> [Thu, 12 Apr 2007 22:41:50 +0200] rev 4337
mq: test qtop with holes in the patch sequence.
Brendan Cully <brendan@kublai.com> [Tue, 10 Apr 2007 10:34:43 -0700] rev 4336
Merge with crew-stable
TK Soh <teekaysoh@yahoo.com> [Tue, 10 Apr 2007 12:24:28 -0500] rev 4335
minor typo fix in templater's docstring
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 09 Apr 2007 04:57:25 -0300] rev 4334
Merge with crew-stable.
Patrick Mezard <pmezard@gmail.com> [Sat, 07 Apr 2007 19:42:26 +0100] rev 4333
Add test for issue 529 - "mq aborts when merging patch deleting files".
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 09 Apr 2007 04:24:17 -0300] rev 4332
mq: don't abort when merging a patch that removes files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 09 Apr 2007 04:24:17 -0300] rev 4331
atomicfile: don't copy the original file if it'll be truncated
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 09 Apr 2007 04:24:17 -0300] rev 4330
use atomictemp files to write the dirstate
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 09 Apr 2007 04:24:17 -0300] rev 4329
use atomictemp files to write branch.cache
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 09 Apr 2007 04:24:17 -0300] rev 4328
util.opener: if requested, use atomicfile even if the file doesn't exist
Right now, surprisingly enough, if you request an atomic file but the
file still doesn't exist, you get a regular file. AFAICS, the only time
this happens is during the initial creation of the dirstate.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 09 Apr 2007 04:24:17 -0300] rev 4327
cache os.umask even on windows
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:30 -0600] rev 4326
pull umask-checking up
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 07 Apr 2007 04:45:27 -0300] rev 4325
Merge with crew-stable.
TK Soh <teekaysoh@yahoo.com> [Thu, 29 Mar 2007 10:25:19 -0500] rev 4324
help: log --keyword is case-insensitive
TK Soh <teekaysoh@yahoo.com> [Thu, 29 Mar 2007 09:32:59 -0500] rev 4323
hgweb: expand keyword search to full list of files
TK Soh <teekaysoh@yahoo.com> [Thu, 29 Mar 2007 09:28:10 -0500] rev 4322
log: expand keyword search to full list of files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 07 Apr 2007 04:27:55 -0300] rev 4321
run-tests.py: use coverage.py with "#!/usr/bin/env python" tests
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 07 Apr 2007 04:27:55 -0300] rev 4320
run-tests.py: small cleanup
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 07 Apr 2007 04:27:55 -0300] rev 4319
run-tests.py: use coverage.py with *.py tests
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 07 Apr 2007 04:27:55 -0300] rev 4318
run-tests.py: tell coverage.py to ignore errors
Otherwise there'll be some IOErrors when it tries to open python
files created during the execution of e.g. test-hook.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 07 Apr 2007 04:27:55 -0300] rev 4317
test-bad-pull: try to avoid timing-related failures
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 07 Apr 2007 04:27:55 -0300] rev 4316
Try to find diffstat in PATH before calling it
At least on Solaris, /bin/sh will print a "command not found" message
even if we redirect stderr.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 07 Apr 2007 04:27:55 -0300] rev 4315
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
This should make it easier to discover global options.
As a bonus, they are no longer displayed by something like a
hg -v help dates
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 07 Apr 2007 04:27:55 -0300] rev 4314
revlog.py: fix/tweak read ahead code in lazyparser
Brendan Cully <brendan@kublai.com> [Thu, 05 Apr 2007 15:20:42 -0700] rev 4313
Merge with Matt
Matt Mackall <mpm@selenic.com> [Thu, 05 Apr 2007 17:09:31 -0500] rev 4312
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 05 Apr 2007 16:43:18 -0500] rev 4311
merge: fix a bug where copies were ignored
Brendan Cully <brendan@kublai.com> [Thu, 05 Apr 2007 14:55:27 -0700] rev 4310
Merge with Matt
Matt Mackall <mpm@selenic.com> [Thu, 05 Apr 2007 16:25:47 -0500] rev 4309
merge: fix a bug where copies were getting ignored
Emanuele Aina <em@nerd.ocracy.org> [Tue, 27 Feb 2007 09:05:36 +0100] rev 4308
Move back the purge extension in hgext
Emanuele Aina <em@nerd.ocracy.org> [Wed, 28 Mar 2007 21:34:12 +0200] rev 4307
purge: abort with missing files avoiding problems with name-mangling fs
In a name mangling filesystem (e.g. a case insensitive one)
dirstate.walk() can yield filenames different from the ones
stored in the dirstate. This already confuses the status and
add commands, but with purge this may cause data loss.
To prevent this purge refuses to work if there are missing
files and has a 'force' option if the user knows it is safe.
Even with the force option purge checks if any of the missing
files is still available in the working dir: if so there
may be some problem with the underlying filesystem, so it
unconditionally aborts.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 04 Apr 2007 04:22:08 -0300] rev 4306
Merge last few matcher/locate fixes.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 04 Apr 2007 04:22:06 -0300] rev 4305
locate: don't print "file not found" messages.
This should fix issue204.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 04 Apr 2007 04:22:06 -0300] rev 4304
change relglob: patterns to be consistent with glob: patterns
With this change, you have to use "hg locate 'hgweb/**'" to locate
all the files in directories named hgweb. OTOH, "hg locate '*l'"
will locate only files that end with "l" - e.g. a file called "hg.py"
will not be matched just because it's in a directory whose name ends
with "l" (e.g. "mercurial").
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 04 Apr 2007 04:22:05 -0300] rev 4303
Revert changeset ef1f1a4b2efb; add another test for glob: patterns
With that changeset, it's impossible to use a glob: pattern to match
e.g. all files ending in .py - glob:**.py would also match all files
in a directory called dir.py.
Matt Mackall <mpm@selenic.com> [Mon, 02 Apr 2007 14:16:44 -0500] rev 4302
Fixups for recent changes in revlog version handling
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:25 -0300] rev 4301
hgweb: don't display heads in gitweb-style summary page
greg@maptuit.com [Fri, 16 Mar 2007 17:55:42 -0400] rev 4300
hgweb: display named branches in gitweb-style summary page
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:23 -0300] rev 4299
test-ssh-clone-r: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:22 -0300] rev 4298
test-ssh: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:21 -0300] rev 4297
test-init: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:20 -0300] rev 4296
test-rename-merge2: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:18 -0300] rev 4295
test-merge6: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:17 -0300] rev 4294
test-merge1: avoid a shell script
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 27 Mar 2007 01:41:16 -0300] rev 4293
test-filebranch: avoid a shell script
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 30 Dec 2006 21:33:45 +0200] rev 4292
Use printf(1) instead of using bash-specific shell code.
Submitted by: Benoit Boissinot <bboissin@gmail.com>
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:50:04 -0300] rev 4291
test-ssh: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:50:03 -0300] rev 4290
test-static-http: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:50:01 -0300] rev 4289
test-http: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:50:00 -0300] rev 4288
test-push-http: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:49:59 -0300] rev 4287
test-bundle: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:49:58 -0300] rev 4286
test-hook: use printenv.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 23:49:56 -0300] rev 4285
Add tests/printenv.py
This is a small script that can be used as a hook to print the
HG_* environment variables without relying on the shell.
John Goerzen <jgoerzen@complete.org> [Mon, 26 Mar 2007 20:49:57 -0500] rev 4284
Add a filename for the bundle
John Goerzen <jgoerzen@complete.org> [Mon, 26 Mar 2007 20:46:49 -0500] rev 4283
Slight refining to help text in patchbomb.py
Christian Ebert <blacktrash@gmx.net> [Tue, 13 Mar 2007 13:17:26 +0100] rev 4282
hgweb: short hash for tip archive name
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 26 Mar 2007 21:36:26 -0300] rev 4281
add util.lexists
John Goerzen <jgoerzen@complete.org> [Thu, 22 Mar 2007 14:02:39 -0500] rev 4280
Improve documentation for patchbomb and email
John Goerzen <jgoerzen@complete.org> [Mon, 26 Mar 2007 13:57:49 -0500] rev 4279
Add common bundle/outgoing options to hg email
John Goerzen <jgoerzen@complete.org> [Mon, 26 Mar 2007 13:37:48 -0500] rev 4278
Add ability to send bundles to patchbomb extension
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 24 Mar 2007 13:31:43 +0100] rev 4277
Fixed spacing in assignment of REVLOG_DEFAULT_VERSION
Matt Mackall <mpm@selenic.com> [Sat, 24 Mar 2007 02:57:27 -0500] rev 4276
Merge with crew
Matt Mackall <mpm@selenic.com> [Sat, 24 Mar 2007 02:47:33 -0500] rev 4275
changelog: optimize delayed updates for clone vs pull
pull index updates get redirected to memory, then appended on finalize
clone index updates get sent to 00changelog.i.a, then renamed on finalize
Matt Mackall <mpm@selenic.com> [Sat, 24 Mar 2007 02:45:08 -0500] rev 4274
Merge with -stable
Matt Mackall <mpm@selenic.com> [Fri, 23 Mar 2007 00:12:28 -0500] rev 4273
tags: require -f to replace an existing tag
based on a patch from Johan Herland <johherla@online.no>
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 23:52:50 -0500] rev 4272
tags: fix abababa case, with test case
Matt Mackall <mpm@selenic.com> [Fri, 23 Mar 2007 01:04:21 -0500] rev 4271
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 23:37:44 -0500] rev 4270
restructure changelog file appending
- make appending code proper part of changelog with delayupdate/finalize
- use simplified appender that tracks pending data in memory
- eliminate old appendfile and helper classes
- update addchangegroup to use new interface and reuse the existing changelog
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 20:10:46 -0500] rev 4269
appendfile: handle only changelog.i file
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 19:54:15 -0500] rev 4268
appendfile: remove unused manifest code
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 19:52:38 -0500] rev 4267
revlog: simplify revlog version handling
- pass the default version as an attribute on the opener
- eliminate config option mess
Matt Mackall <mpm@selenic.com> [Thu, 22 Mar 2007 19:12:03 -0500] rev 4266
revlog: don't pass datafile as an argument
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 23 Mar 2007 23:40:25 -0300] rev 4265
use os.path.islink instead of util.is_link; remove util.is_link
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 23 Mar 2007 23:40:24 -0300] rev 4264
Add some tests for symlink tracking
Eric St-Jean <esj@wwd.ca> [Wed, 21 Mar 2007 23:20:56 -0400] rev 4263
Fix localrepo.copy to deal with symbolic links.
Eric St-Jean <esj@wwd.ca> [Wed, 21 Mar 2007 23:20:56 -0400] rev 4262
Backup symbolic links when reverting
Eric St-Jean <esj@wwd.ca> [Wed, 21 Mar 2007 23:20:56 -0400] rev 4261
fix util.copyfile to deal with symlinks
Brendan Cully <brendan@kublai.com> [Fri, 23 Mar 2007 14:11:31 -0700] rev 4260
hg-relink: do not compare .d files
Brendan Cully <brendan@kublai.com> [Wed, 21 Mar 2007 14:06:25 -0700] rev 4259
Make import opportunistically use merge information
Brendan Cully <brendan@kublai.com> [Thu, 22 Mar 2007 10:44:59 -0700] rev 4258
Add import --exact.
When this option is set, import will apply the patch (which must
be generated by export) to the parents specified in the patch,
and check that the node produced by the patch matches the node
ID in the patch.
Brendan Cully <brendan@kublai.com> [Thu, 22 Mar 2007 10:40:28 -0700] rev 4257
Add --outgoing option to patchbomb
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Mar 2007 22:21:05 -0300] rev 4256
Merge additional fixes for my matcher changes
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Mar 2007 22:09:55 -0300] rev 4255
glob:<directory> patterns match the files in that directory.
This makes the behaviour of glob: patterns more consistent:
hg status glob:dir and hg status -I glob:dir will match
the same files.
It's also consistent with the fact that {rel,}path patterns
recursively match the contents of a directory.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Mar 2007 22:09:53 -0300] rev 4254
Pass normalized directory names to the ignore function
This fixes a bad performance regression caused by dd0d9bd91e0a.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sun, 18 Mar 2007 22:49:05 +0200] rev 4253
tests: expand test-commit a bit to test 'hg commit .' too
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Mar 2007 22:09:51 -0300] rev 4252
fix hg commit . in the repo root
Brendan Cully <brendan@kublai.com> [Tue, 20 Mar 2007 13:13:39 -0700] rev 4251
transplant: fix ignoring empty changesets (eg after filter)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:16:35 -0300] rev 4250
Merge with crew-stable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:40 -0300] rev 4249
debugsetparents: wlock the repo before updating the dirstate
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:39 -0300] rev 4248
avoid _wsgioutputfile <-> _wsgirequest circular reference
We use the _wsgirequest object itself as the output file object.
To avoid a "self.out = self" which would create another circular
reference, we make the "out" attribute a trivial property.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:38 -0300] rev 4247
avoid wsgiapplication <-> MercurialHTTPServer circular reference
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:37 -0300] rev 4246
hgwebdir: break templater -> templater circular reference
This is essentially another instance of the same problem fixed
by the parent changeset. See its commit message for the details.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 19 Mar 2007 19:07:35 -0300] rev 4245
hgweb: break templater -> templater circular reference
The problem were some functions passed in the "defaults" argument
during the templater creation which use "self.t" directly. This
creates the cycle:
hgweb object
-> templater object
-> defaults dict
-> footer function
-> hgweb object
Instead of completely avoding the cycle, we break it after using
the templater.
Brendan Cully <brendan@kublai.com> [Mon, 19 Mar 2007 09:36:06 -0700] rev 4244
Add hg-relink script to contrib
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 20:44:58 +0100] rev 4243
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 20:39:25 +0100] rev 4242
Fixed synopsis for some mq commands
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 20:37:47 +0100] rev 4241
hg qseries -m: guards file was not ignored
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 19:41:28 +0100] rev 4240
Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 18 Mar 2007 12:20:15 +0100] rev 4239
Simplified qseries and hg qapplied to fix some bugs caused by optimization:
- hg qapplied -v now works consistendly to hg qunapplied -v, i.e. showing
guarded (or unapplied because they were guarded during hg qpush) patches.
- hg qapplied <patchname> now works again
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 17 Mar 2007 18:46:52 +0100] rev 4238
Fix issue443: inconsistent output of "hg qunapplied -v"
1. Don't skip over unpushable (guarded) unapplied patches.
2. Don't display unpushable patches, unless -v is given, otherwise
guarded and unguarded patches can't be distinguished.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:58:49 -0300] rev 4237
Merge some matcher fixes/cleanups and add some more hg locate tests
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:48:23 -0300] rev 4236
util._matcher: remove superfluous variable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:48:22 -0300] rev 4235
add some more tests to hg locate
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:48:21 -0300] rev 4234
make the output of test-locate more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 22:48:20 -0300] rev 4233
util._matcher: use "." as the root of empty {rel,}path patterns
Should fix issue332. Really.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:45:18 -0300] rev 4232
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:59 -0300] rev 4231
avoid a traceback with hg branch newbranch; hg up
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:58 -0300] rev 4230
Fix handling of paths when run outside the repo.
The main problem was that dirstate.getcwd() returned just "",
which was interpreted as "we're at the repo root". It now returns
an absolute path.
The util.pathto function was also changed to deal with the "cwd is
an absolute path" case.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:57 -0300] rev 4229
pass repo.root to util.pathto() in preparation for the next patch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:55 -0300] rev 4228
hgweb: handle IOErrors and OSErrors during unbundle
This allows the client to display a reasonable message to the user
(e.g. "Permission denied: .hg/lock"), instead of the current
"<url> does not appear to be an hg repository".
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 22 Oct 2006 13:54:43 -0300] rev 4227
hgweb.unbundle: call req.httphdr only after the last possible call to bail
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:53 -0300] rev 4226
Work around a urllib2 bug in Python < 2.4.2
When urllib2 base64-encodes the password needed for the Proxy-authorization
header, it forgets to remove the trailing "\n". Later, a "\r\n" sequence
is appended to every header, as required by the standard.
Some proxies interpret the resulting "\n\r\n" sequence in the same way as
"\r\n\r\n": end of headers. This usually doesn't cause trouble for this
request, but when the proxy tries to read the next one, it thinks the
request starts with some garbage and returns a "400 - Bad Request" error.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Mar 2007 00:22:52 -0300] rev 4225
Fix confusing message from hg revert (issue332)
% mkdir sub1
% touch sub1/file1
% hg add sub1/
adding sub1/file1
% hg rev sub1
sub1: No such file in rev e4c586763258
forgetting sub1/file1
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2007 18:57:47 -0500] rev 4224
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2007 18:55:53 -0500] rev 4223
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 15 Mar 2007 18:38:46 -0500] rev 4222
revlog: attempt to gracefully handle some interleaved damage
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 15 Mar 2007 09:51:44 +0100] rev 4221
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 15 Mar 2007 09:49:45 +0100] rev 4220
Merge with hg-stable
Brendan Cully <brendan@kublai.com> [Wed, 14 Mar 2007 18:01:24 -0700] rev 4219
Merge with mpm
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 19:17:40 -0500] rev 4218
Merge with -stable
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 19:13:04 -0500] rev 4217
tags: add --remove
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 18:49:10 -0500] rev 4216
tags: remove unused variables
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 18:47:29 -0500] rev 4215
Make the tags algorithm smarter
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 16:40:47 -0500] rev 4214
Refactor tags code to prepare for improving the algorithm
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 14 Mar 2007 22:43:57 +0100] rev 4213
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 14 Mar 2007 22:38:40 +0100] rev 4212
Only hg repositories override [paths], not simple directories (fixes issue510)
Brendan Cully <brendan@kublai.com> [Wed, 14 Mar 2007 11:46:07 -0700] rev 4211
git-send-email compatibility: stop reading changelog after ^---$
Brendan Cully <brendan@kublai.com> [Wed, 14 Mar 2007 10:45:18 -0700] rev 4210
mq: add qparent tag (first parent of qbase)
Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2007 01:26:09 -0500] rev 4209
Merge with -stable, fix small test failure
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 18:53:23 -0500] rev 4208
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 18:50:02 -0500] rev 4207
Move branch read/write to dirstate where it belongs
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 15:47:55 -0500] rev 4206
Minor default branch cleanups
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2007 15:18:10 -0500] rev 4205
Move branches.cache to branch.cache
Keeps old clients from conflicting with new caches, makes features
logic unnecessary.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Mar 2007 15:02:33 -0300] rev 4204
"default" is the default branch name
Brendan Cully <brendan@kublai.com> [Tue, 13 Mar 2007 21:54:34 -0700] rev 4203
Make [PATCH] removal slightly more robust
Brendan Cully <brendan@kublai.com> [Tue, 13 Mar 2007 21:50:42 -0700] rev 4202
Remove undo log after mq operations that rollback would break
Brendan Cully <brendan@kublai.com> [Tue, 13 Mar 2007 16:27:34 -0700] rev 4201
Refresh file size after partial qrefresh.
This makes a subsequent hg revert; hg status work.
Brendan Cully <brendan@kublai.com> [Sun, 11 Mar 2007 14:21:09 -0700] rev 4200
Clarify update help text for update without an explicit revision
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 15:02:59 -0700] rev 4199
Improve hg branch -f help text
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 14:50:19 -0700] rev 4198
Add test for branch shadowing
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 14:44:14 -0700] rev 4197
branch: require --force to shadow existing branches
Brendan Cully <brendan@kublai.com> [Mon, 12 Mar 2007 13:58:06 -0700] rev 4196
Strip [PATCH...] from message subject when importing patches
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:21:33 -0300] rev 4195
Merge a bunch of matcher and locate fixes.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:01:02 -0300] rev 4194
Optimize return value of util._matcher for hgignore case
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:01:00 -0300] rev 4193
Optimize return value of util._matcher for common command line case
This will trigger every time somebody runs something like "hg diff"
or "hg status" without any arguments.
The important part here is returning util.always as the match function,
which is a much simpler (and faster) function than the usual return
value, and allows other code to just skip the filtering if it knows
all files will match.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:59 -0300] rev 4192
remove unused "head" hack from util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:58 -0300] rev 4191
locate: exit(1) if we didn't print any file
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:57 -0300] rev 4190
change locate to use relglobs by default
This makes its default behaviour useful again (issue108), and
changes it search the entire repository by default (instead
of just the cwd), just like all other commands.
It also hides issue204 by default, but you'll still see the
same behaviour if you give it a relpath: pattern.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:55 -0300] rev 4189
localrepo.walk: if we're walking a specific revision, sort the files
This is more consistent with our behaviour while walking the working directory.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:54 -0300] rev 4188
dirstate.statwalk: explicitly test for ignored directories
This removes a hack where we appended '/' to a dirname so that:
- it would not appear on the "dc" dict
- it would always be matched by the match function
This was a contorted way of checking if the directory was matched by
some hgignore pattern, and it would still fail with some uses of
--include/--exclude patterns.
Things would still work fine if we removed the check altogether and
just appended things to "work" directly, but then we would end up
walking ignored directories too, which could be quite a bit of work.
This allows further simplification of the match function returned by
util._matcher, and fixes walking the working directory with a
--include pattern that matches only the end of a name.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:53 -0300] rev 4187
util._matcher: unify pattern normalization
This should fix issue347.
It also highlights one issue with the directory walking code when
you have an --include pattern that matches the end of a filename.
This is fixed by the next patch.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:52 -0300] rev 4186
make the output of test-walk more readable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:51 -0300] rev 4185
util.*matcher: change default "names" argument
names=['.'] means "include (recursively) only files from the current subdir";
the function then did a hack to walk the whole tree. Clean that up.
This also fixes a problem where "--include ." works in a subdir, but not
on the tree root.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:49 -0300] rev 4184
util._matcher: fix handling of path: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:48 -0300] rev 4183
util._matcher: fix handling of relglob: patterns
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:47 -0300] rev 4182
A 'glob:foo?bar' pattern determines a root - the tree root
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:46 -0300] rev 4181
Leave normalization of patterns to util._matcher
Passing [] to util.cmdmatcher accidentally fixes walking of files
with "\n" in the name.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:45 -0300] rev 4180
util._matcher: update comments
This should match the code better. Except for bugs...
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:43 -0300] rev 4179
remove obsolete code from patch.diff
repo.status already does this filtering. If the caller supplies a set of
changes, it's his responsibility to filter out what he doesn't want.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 23:00:42 -0300] rev 4178
small globprefix fix
Brendan Cully <brendan@kublai.com> [Sat, 10 Mar 2007 17:45:32 -0800] rev 4177
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Sat, 10 Mar 2007 17:36:29 -0800] rev 4176
Test update to branch tip
Brendan Cully <brendan@kublai.com> [Sat, 10 Mar 2007 17:36:27 -0800] rev 4175
Make update with no node jump to the tip of the current branch
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:23 -0300] rev 4174
fix qrefresh'ing an empty patch
This is not superefficient (the commit will have to walk the whole tree),
but it works.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:22 -0300] rev 4173
statwalk: don't put self.root in the files list
That list is supposed to contain internal, normalized names ("/"-separated,
relative to the repo root), not OS-native paths.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:21 -0300] rev 4172
fix qclone to a remote repo
This fixes issue467. -stable still needs something like revision
55578a8d7e84 - mq: allow push if -r is given explicitly.
In the meantime, hg qpop -a; hg qclone . ssh://... is a workaround.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 10 Mar 2007 22:03:20 -0300] rev 4171
Save an absolute path in repo.path
This should keep things working if the process changes directories
after creating a repo object.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 20:08:13 +0100] rev 4170
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 19:57:26 +0100] rev 4169
Add tests for .hg/branches.cache feature list.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 19:12:03 +0100] rev 4168
Add a features list to branches.cache to detect caches of old hg versions.
The leading space in the written file makes sure that the feature list never
can match an existing version, even if the first feature can be read as hex.
Additionally old hg versions display the id with --debug, too.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 09 Mar 2007 18:09:02 +0100] rev 4167
Store empty (default) branch in branch cache, too.
Operations on this branch don't work otherwise.
Reading branches.cache had to be adjusted to allow an empty label.
Adjusted reading of the cache tip for symmetry, no functional change here.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 08 Mar 2007 20:08:24 -0300] rev 4166
small fixes for the parent patch
- format.usestore is a boolean option
- python wart: ("revlogv1") is a string, not a tuple
- only create a dummy changelog if we're using a store
- add a test
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2007 16:13:16 -0600] rev 4165
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 08 Mar 2007 16:12:52 -0600] rev 4164
Allow disabling store format to work with absurdly long filenames
Michael Gebetsroither <michael.geb@gmx.at> [Thu, 08 Mar 2007 22:36:12 +0100] rev 4163
hgweb: use the given revision in the name of the archive
If you ask for an archive in hgweb by tagname the directory in the archive
should include the tagname not the changeset-id.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:26:03 -0300] rev 4162
incoming/outgoing: print the name of the other repo
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:26:00 -0300] rev 4161
localrepo.status: use manifest.find on "lookup" files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:25:59 -0300] rev 4160
localrepo.status: fcmp gets a getnode function instead of the manifest
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 07 Mar 2007 15:25:58 -0300] rev 4159
fix manifest.find
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 07 Mar 2007 15:06:57 +0100] rev 4158
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 07 Mar 2007 15:06:32 +0100] rev 4157
Fix sed expression in test-notify to be more portable.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 06 Mar 2007 12:52:07 +0100] rev 4156
Fix help text for hg status -i
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Mar 2007 17:45:50 -0300] rev 4155
purge.py: fix invocation of statwalk
Emanuele Aina <em@nerd.ocracy.org> [Tue, 27 Feb 2007 09:05:36 +0100] rev 4154
Delete the README for purge, putting the useful informations in comments
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:47 -0300] rev 4153
Delete the Purge class, refactoring Purge.purge() in dopurge()
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:46 -0300] rev 4152
Do not use 'self' in the purge() method
Avoid any reference to 'self' in Purge.purge() to allow its refactoring
in a simple function.
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:45 -0300] rev 4151
Use nested functions instead of object methods
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:44 -0300] rev 4150
Merge _remove_file() and _remove_dir() in a single function
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:43 -0300] rev 4149
Use "f in dirstate" instead of "dirstate.state(f) == '?'"
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:41 -0300] rev 4148
Reduce the absolute/relative path conversion in the purge extension
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:40 -0300] rev 4147
Make the purge extension use the statwalk walker from the dirstate object
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:39 -0300] rev 4146
Yield directories in dirstate.statwalk()
Emanuele Aina <faina.mail@tiscali.it> [Tue, 06 Mar 2007 17:45:38 -0300] rev 4145
Add a test for the purge extension
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 05 Mar 2007 19:54:21 +0100] rev 4144
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 05 Mar 2007 19:48:21 +0100] rev 4143
Don't truncate tag and branch names after 30 chars (introduced 73860ffbe798)
with test added for a long (local) tag name.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 04 Mar 2007 18:42:31 +0100] rev 4142
patchbomb: Strip more than one trailing dot (and spaces between them)
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 04 Mar 2007 18:40:08 +0100] rev 4141
patchbomb: Allow to specify subject of single-patch-series (issue475)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 04 Mar 2007 14:35:11 -0300] rev 4140
test-abort-checkin: use a hook to abort the commit
This should make it more portable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 04 Mar 2007 14:09:29 -0300] rev 4139
test-bad-extension: avoid printing the file name
This should make it simpler on windows
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 04 Mar 2007 14:04:42 -0300] rev 4138
make test-acl a bit more digestable for windows
Giorgos Keramidas <keramida@ceid.upatras.gr> [Fri, 23 Feb 2007 17:54:34 +0200] rev 4137
Create the parent directory when checking out symlinks.
Giorgos Keramidas <keramida@ceid.upatras.gr> [Fri, 05 Jan 2007 21:28:49 +0200] rev 4136
Fix addremove for symlinks to non-existent files
Erling Ellingsen <erlingalf@gmail.com> [Sun, 18 Feb 2007 20:39:25 +0100] rev 4135
Avoid some false positives for addremove -s
The original code uses the similary score
1 - len(diff(after, before)) / len(after)
The diff can at most be the size of the 'before' file, so any small
'before' file would be considered very similar. Removing an empty file
would cause all files added in the same revision to be considered
copies of the removed file.
This changes the metric to
bytes_overlap(before, after) / len(before + after)
i.e. the actual percentage of bytes shared between the two files.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 04 Mar 2007 09:03:21 -0300] rev 4134
Merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Sat, 03 Mar 2007 17:54:13 +0100] rev 4133
mq: abort cleanly when invalid patch name is given to qguard
Andrei Vermel <avermel@mail.ru> [Mon, 19 Feb 2007 12:38:58 +0300] rev 4132
Close keepalive connections to fix server traceback
Erling Ellingsen <erlingalf@gmail.com> [Tue, 20 Feb 2007 22:20:16 +0100] rev 4131
don't return uninitialized memory from bdiff.blocks()
bdiff.blocks() returns a dummy match at the end of both files; the
length of that chunk is never set, so it will sometimes contain random
heap garbage. There are apparently workarounds for this elsewhere:
# bdiff sometimes gives huge matches past eof, this check eats them,
Patrick Mezard <pmezard@gmail.com> [Mon, 19 Feb 2007 10:08:59 +0100] rev 4130
web/server: disable address reuse option for BaseHTTPServer on windows
On windows, a socket with the SO_REUSEADDR option set is able to bind to
any port, even if there's already an active socket listening on it.
test-http: check server address cannot be reused.
Patrick Mezard <pmezard@gmail.com> [Mon, 19 Feb 2007 10:32:46 +0100] rev 4129
stdout raises EINVAL when flush() is called on a closed pipe under win32.
Maybe the exception should be caught and translated at raise location instead (sshserver.py).
Patrick Mezard <pmezard@gmail.com> [Mon, 19 Feb 2007 10:29:05 +0100] rev 4128
localrepo: stream_in may raise ZeroDivisionError with nul float elapsed argument.
Patrick Mezard <pmezard@gmail.com> [Mon, 19 Feb 2007 09:59:37 +0100] rev 4127
streamclone: stream_out tried to decodefilename non-normalized paths
Brendan Cully <brendan@kublai.com> [Sat, 03 Mar 2007 18:59:54 -0800] rev 4126
Add _xmlplus to the demandimport blacklist. (HGCIA was failing to load.)
Brendan Cully <brendan@kublai.com> [Fri, 02 Mar 2007 14:03:30 -0800] rev 4125
Suppress <stdout> before hg export -v (regression from previous patch).
Brendan Cully <brendan@kublai.com> [Thu, 01 Mar 2007 20:53:38 -0800] rev 4124
Let patch.export handle any fp-like object
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2007 22:15:56 +0100] rev 4123
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2007 22:15:17 +0100] rev 4122
Unified #! paths for python scripts and removed them for test modules.
Emanuele Aina <em@nerd.ocracy.org> [Tue, 27 Feb 2007 09:05:36 +0100] rev 4121
Use the mercurial i18n infrastructure in the purge extension
Emanuele Aina <em@nerd.ocracy.org> [Tue, 27 Feb 2007 09:05:36 +0100] rev 4120
Print relative names in the purge extension
Matt Mackall <mpm@selenic.com> [Tue, 27 Feb 2007 16:48:17 -0600] rev 4119
Merge with crew
Matt Mackall <mpm@selenic.com> [Tue, 27 Feb 2007 16:47:16 -0600] rev 4118
Merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 27 Feb 2007 16:20:06 -0600] rev 4117
merge: fix renaming of subdirectories under renamed directories
Brendan Cully <brendan@kublai.com> [Tue, 27 Feb 2007 12:58:40 -0800] rev 4116
Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 26 Feb 2007 21:57:33 +0100] rev 4115
Use only integer part of mtime in workingfilectx.date(), fixes test-context.py
Similar to what is done in dirstate.status() (changeset 882e703eaa94)
and has to be removed when Mercurial switches to subsecond granularity.
Matt Mackall <mpm@selenic.com> [Mon, 26 Feb 2007 12:12:29 -0600] rev 4114
Merge with crew
Matt Mackall <mpm@selenic.com> [Fri, 23 Feb 2007 14:16:50 -0600] rev 4113
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 22 Feb 2007 19:00:05 -0600] rev 4112
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 21 Feb 2007 11:02:37 -0600] rev 4111
convert-repo: use .git/objects/ rather than .git/HEAD to detect git repos
Edouard Gomez <ed.gomez@free.fr> [Wed, 21 Feb 2007 00:38:06 +0100] rev 4110
Don't keep trailing white space in cvs tags
Edouard Gomez <ed.gomez@free.fr> [Wed, 21 Feb 2007 00:38:06 +0100] rev 4109
Change a bit cvsps arguments
- Force updating the cache
- Use internal cvs implementation, reducing overhead
- Use quiet mode
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 23 Feb 2007 17:31:00 +0100] rev 4108
Fixed workingfilectx.date() (found by Thomas Waldmann) with test.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 20 Feb 2007 20:55:23 +0100] rev 4107
merge with crew-stable
Christian Ebert <blacktrash@gmx.net> [Sat, 17 Feb 2007 09:54:44 +0100] rev 4106
test-notify: adapt to sed shipped with MacOS
MacOS X' sed does not have the \? repetition operator.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 09:55:00 -0200] rev 4105
git binary patches: don't print the header for identical files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 09:54:59 -0200] rev 4104
git binary patches: use hashes to detect identical files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 09:54:58 -0200] rev 4103
add test for diffing identical binary files
tailgunner@smtp.ru [Sat, 17 Feb 2007 09:54:56 -0200] rev 4102
Don't lie that "binary file has changed"
Without -a option to "hg diff", mdiff.unidiff reported that "Binary
file foo has changed" without even trying to compare things. Now it
computes MD5 of old and new files, compares them and makes the conclusion.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 04:50:06 -0200] rev 4101
add some tests for qpush/qpop error codes
Ben Thomas <bthomas@virtualiron.com> [Tue, 13 Feb 2007 08:54:48 -0500] rev 4100
Modify qpush/qpop idempotent operations to return success
Modify qpush/qpop such that idempotent instances of the operations
return success. That is, repeated qpush -a, qpop -a, qpush patch-name
or qpop patch-name will return success. The end goal of each of these
operations is to reach a particular state. Whether or not the patches
were already applied does not affect that state or operation status.
Likewise, be careful to retain the error status on a qpush/qpop
without arguments when the end/beginning of the series has been
reached.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 17 Feb 2007 04:50:03 -0200] rev 4099
mq: propagate the return error of pop
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 05:53:03 -0200] rev 4098
util_win32.py: fix user_rcpath
Fixes issue504.
Shane Holloway <shane.holloway@ieee.org> [Thu, 15 Feb 2007 09:51:57 -0700] rev 4097
Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py
The os_rcpath method delegates to system_rcpath and user_rcpath from the
different platform implementations.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 05:27:37 -0200] rev 4096
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 05:10:43 -0200] rev 4095
hgweb: catch util.Abort raised by addchangegroup
Right now, if a pretxnchangegroup hook fails, we send some HTML
error message to the client and the transaction is not rolled back
(issue499).
Catching util.Abort allows us to send a decent message to the client
and for some reason makes the rollback complete.
This patch is not perfect since it doesn't fix the reason why the
transaction wasn't rolled back (maybe some circular references?).
Also, the transaction is aborted only after we've sent the response
back to the client and the "transaction aborted" message ends up in
the logs of the web server.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 04:54:49 -0200] rev 4094
notify: don't try to fix addresses if notify.domain is not set
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 04:54:47 -0200] rev 4093
mail.py: don't try to use TLS if python doesn't have SSL support
This should hide the traceback from issue501.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Feb 2007 04:54:46 -0200] rev 4092
git patches: handle renames of binary files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 08:49:20 -0200] rev 4091
hgweb/server.py: use hg.repository to create a repo object
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 08:44:08 -0200] rev 4090
qclone: don't call reposetup manually
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 08:14:03 -0200] rev 4089
extdiff: open files in binary mode
Problem noticed by Darrell Gallion.
Andrei Vermel <avermel@mail.ru> [Thu, 15 Feb 2007 12:51:43 +0300] rev 4088
Make extdiff work at root directory
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 05:38:00 -0200] rev 4087
Fix util.shellquote on windows.
Jun Inoue <jun.lambda@gmail.com> [Thu, 15 Feb 2007 05:18:23 -0200] rev 4086
Fix accessing the repo through a symlink.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 10:15:08 -0200] rev 4085
Fix hg showconfig traceback with values that aren't strings
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 15 Feb 2007 08:51:32 -0200] rev 4084
hgweb: allow static files to be served directly by the HTTP server
Shane Holloway <shane.holloway@ieee.org> [Wed, 14 Feb 2007 15:20:06 -0700] rev 4083
Unified *_rcpath so the interface is similar across operating systems
Changed os_rcpath to combine system_rcpath and user_rcpath. Changed
system_rcpath and user_rcpath to both return a list of paths to add to the
combined rcpath for both Windows NT and other platforms.
Daniel Holth <dholth@fastmail.fm> [Tue, 30 Jan 2007 23:09:06 -0500] rev 4082
convert-repo converts symlinks from git
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 10:25:45 -0200] rev 4081
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 10:02:07 -0200] rev 4080
hgwebdir: try to get web.style and web.motd from the ui.config system
This finishes fixing issue253. As a bonus, web.style and web.motd
settings from ~/.hgrc will be used for the hgwebdir index page.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 10:01:44 -0200] rev 4079
Pass a ui from create_server to hgwebdir and a repo from hgwebdir to hgweb
This allows repo pages to respect hg serve --webdir-conf <file> --style=gitweb
(part of issue253).
Since we're creating a ui object anyway, use it as the parentui of the ui
objects created for every repo entry. This has the unintended side-effect
that --name=foo on the command line will set the name of all repos.
If one of the repos being served has a .hg/hgrc owned by a user that is not
trusted, hg will now print the "Not trusting file..." warning when reading
it. This is consistent with the behaviour from a hg serve from inside the
repo.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 10:00:17 -0200] rev 4078
hg serve: call setconfig on the parentui
It makes sense to do this on the "global" ui object, since command line
options should affect the whole process.
This should fix hg serve --style=gitweb inside a repo (part of issue253).
Sean Dague <sean@dague.net> [Tue, 30 Jan 2007 10:35:25 -0500] rev 4077
Prevent type exception on concatenation if diffstat returns None.
This will most often occur if diffstat is not installed in the
target platform, though may also happen in other cases where
diffstat fails to execute.
Signed-off-by: Sean Dague <sean@dague.net>
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 13 Feb 2007 06:50:00 -0200] rev 4076
Switch CGI stdout to binary on windows
Problem diagnosed by Andrei Vermel.
Andrei Vermel <avermel@mail.ru> [Fri, 09 Feb 2007 20:50:41 +0300] rev 4075
Fix dirstate fail at drive root on Windows
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 08 Feb 2007 16:31:21 -0200] rev 4074
Try to pass repo.ui to reposetup hooks
The ui object we received in this function may belong to another repo,
which could be confusing from the hook point of view. Trying to use
the ui object from the newly created repo should avoid this confusion.
Andrew Bachmann <andrewbachmann@gmail.com> [Tue, 02 Jan 2007 21:40:20 -0800] rev 4073
BeOS compatibility support
Patrick Mezard <pmezard@gmail.com> [Sun, 11 Feb 2007 18:37:23 +0100] rev 4072
transplant: remote bundle source was not closed before deleting the fetched bundle.
It fails under win32 because "normal" opened files cannot be removed.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 09 Feb 2007 03:48:30 -0200] rev 4071
mq: qinit -c creates a repo even after a regular qinit
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 09 Feb 2007 03:48:28 -0200] rev 4070
Handle functions as the value of a hooks.<name> config variable
This should make it easier for extensions to add a hook when
they're loaded.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 09 Feb 2007 03:48:26 -0200] rev 4069
allow values that aren't strings in util.configparser
Matt Mackall <mpm@selenic.com> [Tue, 06 Feb 2007 16:12:22 -0600] rev 4068
Merge with stable
Andrei Vermel <avermel@mail.ru> [Tue, 06 Feb 2007 00:09:36 +0300] rev 4067
Fix wrong module reference in copyfile exception
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Feb 2007 15:55:20 -0200] rev 4066
setup.py: reload __version__.py after writing it.
write_version loads __version__.py before writing it (see 7eb694a1c1af),
so we have to explicitly reload it to use the correct version.
Problem diagnosed by Christian Ebert.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Feb 2007 15:54:58 -0200] rev 4065
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Feb 2007 15:43:01 -0200] rev 4064
install reposetup hook right after loading the extension
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 30 Jan 2007 20:37:58 -0200] rev 4063
Open bundle files in binary mode
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 06 Feb 2007 15:23:40 -0200] rev 4062
convert-repo: handle packed git tags
Brendan Cully <brendan@kublai.com> [Sun, 04 Feb 2007 16:08:56 -0800] rev 4061
lazyindex: handle __delitem__ in loadblock
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 30 Jan 2007 21:11:10 -0200] rev 4060
commit: catch IOError
filecommit can still raise IOError if we're on a filesystem without
support for symlinks.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 30 Jan 2007 19:36:56 -0200] rev 4059
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 30 Jan 2007 19:09:08 -0200] rev 4058
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 30 Jan 2007 18:32:23 -0200] rev 4057
Fallback to ascii if getpreferredencoding raises an exception
Fixes issue478.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 30 Jan 2007 18:32:21 -0200] rev 4056
unbundle: don't use urllib if it's a local file
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 30 Jan 2007 18:32:20 -0200] rev 4055
docopy: deal with globs on windows in a better way
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 30 Jan 2007 18:32:18 -0200] rev 4054
Explicitly expand globs on Windows
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 30 Jan 2007 00:26:19 +0100] rev 4053
mtime can be -1 after a merge and cause tracebacks on win32.
Output "unset" instead.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Jan 2007 17:57:51 +0100] rev 4052
Adjust documentation for 78a0dd93db0b (empty username to force specifying it)
Michael Gebetsroither <michael.geb@gmx.at> [Tue, 30 Jan 2007 22:07:22 +0100] rev 4051
hgwebdir: class hgwebdir should also accept a configparser instance
Brendan Cully <brendan@kublai.com> [Tue, 30 Jan 2007 11:40:17 -0800] rev 4050
transplant: test non-local source
Brendan Cully <brendan@kublai.com> [Tue, 30 Jan 2007 11:39:47 -0800] rev 4049
transplant: update to current writebundle API
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 29 Jan 2007 17:33:09 +0100] rev 4048
mq: Mention usage of hg add/remove/copy/rename in qrefresh help text.
csaba.henk@creo.hu [Sat, 27 Jan 2007 15:53:31 -0800] rev 4047
add pserver support to convert_repo
Brendan Cully <brendan@kublai.com> [Sat, 27 Jan 2007 15:43:16 -0800] rev 4046
gitweb: prevent wrapping of "changeset | manifest" links
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 24 Jan 2007 23:07:09 +0100] rev 4045
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 24 Jan 2007 23:04:51 +0100] rev 4044
Abort on empty username so specifying a username can be forced.
This behaviour was introduced by c3345b0f2fcd and broken by 98f2507c5551.
Added test for this.
Patrick Mezard <pmezard@gmail.com> [Sun, 14 Jan 2007 19:10:35 +0100] rev 4043
Copied files sources were not shown by status -C under Win32.
repo.dirstate.copied() takes a normalized paths while local paths were passed.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 15 Jan 2007 16:13:50 -0200] rev 4042
add test for 540d1059c802
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 24 Jan 2007 23:06:45 +0100] rev 4041
merge with upstream
Matt Mackall <mpm@selenic.com> [Tue, 23 Jan 2007 17:41:53 -0600] rev 4040
hgk: remove embedded nulls in descriptions
Brendan Cully <brendan@kublai.com> [Mon, 22 Jan 2007 20:22:25 -0800] rev 4039
mq: allow push if -r is given explicitly
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 18 Jan 2007 22:16:26 -0200] rev 4038
Don't use ints in HTTP headers
Patrick Mezard <pmezard@gmail.com> [Wed, 17 Jan 2007 22:19:36 +0100] rev 4037
Enforce unixish style for all generated patch names.
User supplied names are left unchanged (including those loaded from series).
Brendan Cully <brendan@kublai.com> [Tue, 16 Jan 2007 12:52:03 -0800] rev 4036
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com> [Tue, 16 Jan 2007 12:51:02 -0800] rev 4035
Update transplant's merge.update call
Brendan Cully <brendan@kublai.com> [Tue, 16 Jan 2007 12:38:26 -0800] rev 4034
Minor test-transplant cleanup
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Jan 2007 22:46:03 +0100] rev 4033
merge with jsmith
Jonathan Smith <https://issues.rpath.com/> [Mon, 15 Jan 2007 15:49:06 -0500] rev 4032
use DESTDIR both places its needed
Jonathan Smith <https://issues.rpath.com/> [Mon, 15 Jan 2007 15:31:38 -0500] rev 4031
honor DESTDIR env variable for docs' make install
Jonathan Smith <https://issues.rpath.com/> [Mon, 15 Jan 2007 15:30:50 -0500] rev 4030
install man pages by default into $(PREFIX)/share/man not $(PREFIX)/man since the FHS puts them there
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Jan 2007 18:23:21 +0100] rev 4029
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 15 Jan 2007 17:56:20 +0100] rev 4028
bundlerepo: it was meant to be revdiff() instead of chunk()
Christian Ebert <blacktrash@gmx.net> [Sat, 13 Jan 2007 02:15:49 +0100] rev 4027
patchbomb: fix timezone offset in message date header
Use mercurial.util instead of time to set and format dates.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Jan 2007 16:18:29 +0100] rev 4026
fix for digest auth when using keepalive.py
The problem was with python > 2.3 which stores part of the
headers in unredirected_hdrs.
Furthermore, we simplify the code to use httplib directly.
fix issue473
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Jan 2007 16:12:35 +0100] rev 4025
Subclass file with a __len__ method instead of setting Content-length
This is necessary for the next patch to work with python2.3
Refactor the subclassing of send()
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 12 Jan 2007 14:27:59 +0100] rev 4024
hgweb: add raw template to hgwebdir
Patrick Mezard <pmezard@gmail.com> [Wed, 10 Jan 2007 20:35:27 +0100] rev 4023
Flush stderr after write.
stderr can be buffered under win32 when redirected to a file,
including stdout.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 11 Jan 2007 23:13:32 +0100] rev 4022
Merge branchname changes in localrepo.commit.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 11 Jan 2007 23:12:21 +0100] rev 4021
Use local encoding for "HG: branch" line in commit editor.
Simon 'corecode' Schubert <corecode@fs.ei.tum.de> [Thu, 11 Jan 2007 19:47:51 +0100] rev 4020
Add branch name to editor text.
Simon 'corecode' Schubert <corecode@fs.ei.tum.de> [Thu, 11 Jan 2007 19:33:34 +0100] rev 4019
When committing, record the changeset in the branchcache.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 05 Jan 2007 00:01:53 -0200] rev 4018
Allow adding symlinks that don't point to files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 05 Jan 2007 00:01:51 -0200] rev 4017
catch AttributeError in util.checklink
There's no symlink function in the os module on windows.
Fixes issue468
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 02 Jan 2007 22:40:52 +0100] rev 4016
sync with -stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 02 Jan 2007 22:12:38 +0100] rev 4015
Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Dec 2006 06:37:43 +0100] rev 4014
various doc fixes
- update can no longer be used to merge
- short summary start with lowercase
- add merge to short help list
- fix tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Dec 2006 06:08:46 +0100] rev 4013
catch socket.error
fix issue394
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Dec 2006 05:27:48 +0100] rev 4012
fix handling of multiple Content-type headers
This can happen if an error happens while sending
application/mercurial-0.1 content. The error page will
be sent resulting (for at least lighttpd) in the following
headers:
Content-type: application/mercurial-0.1
Content-type: text/html
which result in req.proto = 'application/mercurial-0.1, text/html'
fix issue344
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 29 Dec 2006 04:22:31 +0100] rev 4011
add [diff] section to hgrc documentation
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 28 Dec 2006 01:14:12 +0100] rev 4010
inst.reason isn't alway in the form (errno, strerror)
urllib2.urlopen("foobar://foo") is an example
where inst.reason is a string
fix issue383
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 21:59:01 +0100] rev 4009
fix hg help <ext> for extension that do not define any command
solve issue462
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 21:57:20 +0100] rev 4008
mq: fix strip failing to unlink a bundle
os.unlink doesn't know how to deal with urls
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 4007
symlinks: minimal support for symlinks in merge/update
This will get angry, confused, and sad if you try to merge a symlink
with a regular file.
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 4006
symlinks: add flags param to wwrite
Now wwrite can set symlink and exec for files
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 4005
replace filehandle version of wwrite with wwritedata
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 4004
unify encode/decode filter routines
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 4003
symlinks: add _link checking function
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 4002
symlinks: use is_link wherever is_exec is used
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 4001
symlinks: don't complain about symlinks
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 4000
symlinks: add a linkfunc
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 3999
symlinks: add basic symlink functions to util.py
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 3998
symlinks: check whether a filesystem supports symlinks
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:31 -0600] rev 3997
exec: remove last flag from is_exec
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:30 -0600] rev 3996
exec: add execfunc to simplify exec flag support on non-exec filesystems
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:30 -0600] rev 3995
pull umask-checking up
Matt Mackall <mpm@selenic.com> [Fri, 29 Dec 2006 20:04:30 -0600] rev 3994
exec: checkexec checks whether filesystem supports exec flags
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Dec 2006 20:08:09 +0100] rev 3993
expanded bash_completion for transplant extension
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Dec 2006 19:56:42 +0100] rev 3992
Yield entries from [paths], too, when completing -R/--repository.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Dec 2006 15:42:40 +0100] rev 3991
Corrected synopsis for transplant.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Dec 2006 15:33:50 +0100] rev 3990
Improved error message for extensions overriding commands (with test):
- Old text "module foo overrides bar" was misread as overriding module bar.
- Only print a single warning line per extension instead of one for each
command.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Dec 2006 14:54:48 +0100] rev 3989
sync with stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 26 Dec 2006 14:17:48 +0100] rev 3988
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Dec 2006 22:28:01 +0100] rev 3987
test-manifest-merging: we only need to remove files
Brendan Cully <brendan@kublai.com> [Fri, 22 Dec 2006 16:29:35 -0800] rev 3986
Make test-manifest-merging less likely to delete the whole filesystem
Edouard Gomez <ed.gomez@free.fr> [Thu, 21 Dec 2006 20:41:56 +0100] rev 3985
Send encoding information in rss header
Matt Mackall <mpm@selenic.com> [Thu, 14 Dec 2006 17:32:25 -0600] rev 3984
Fix a pygettext complaint
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 14 Dec 2006 00:41:11 +0100] rev 3983
spelling fix
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:29:45 +0100] rev 3982
mq: remove unecessary code, duplicate with util.opener
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:42:17 +0100] rev 3981
hgk: (re)optimize reading of changelog and manifest
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:29:00 +0100] rev 3980
mq: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:27:24 +0100] rev 3979
hgk: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:26:23 +0100] rev 3978
hgk: remove unused code, node2 is always set
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:25:44 +0100] rev 3977
extdiff: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:25:13 +0100] rev 3976
bugzilla: use contexts, simplify
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:24:51 +0100] rev 3975
acl: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:17:34 +0100] rev 3974
hgweb: fix unused import
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:16:54 +0100] rev 3973
hgweb: use contexts, fix coding style
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:13:57 +0100] rev 3972
commands.py: use contexts in various places (debug*state, revert)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:12:51 +0100] rev 3971
cmdutil.py: use contexts in findrenames
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:12:23 +0100] rev 3970
commands.py: use contexts in export
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 03:11:37 +0100] rev 3969
add possibility to pass flags when testing with the Makefile
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 Dec 2006 00:40:28 +0100] rev 3968
archival.py: use contexts
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 25 Dec 2006 17:43:49 +0100] rev 3967
patch: use contexts for diff
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 25 Dec 2006 18:57:55 +0100] rev 3966
context: create a filectxt with filelog reuse
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 25 Dec 2006 17:43:47 +0100] rev 3965
context: fix a bug in workingfilectx.renamed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 25 Dec 2006 17:43:44 +0100] rev 3964
make it possible to use changectx to create a filectx
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 25 Dec 2006 13:37:00 +0100] rev 3963
remove various unused import
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Dec 2006 22:55:34 +0100] rev 3962
add date attribute to workingfilectx
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Dec 2006 22:29:29 +0100] rev 3961
fix tab vs space
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 24 Dec 2006 22:28:01 +0100] rev 3960
test-manifest-merging: we only need to remove files
Brendan Cully <brendan@kublai.com> [Fri, 22 Dec 2006 17:05:10 -0800] rev 3959
Merge with mpm
Matt Mackall <mpm@selenic.com> [Fri, 22 Dec 2006 17:59:40 -0600] rev 3958
convert-repo: add option to attempt to sort by date
Matt Mackall <mpm@selenic.com> [Fri, 22 Dec 2006 17:59:39 -0600] rev 3957
convert-repo: add CVS exec bit support
Matt Mackall <mpm@selenic.com> [Fri, 22 Dec 2006 17:59:37 -0600] rev 3956
Fix removed file cornercase for CVS convert-repo
Matt Mackall <mpm@selenic.com> [Fri, 22 Dec 2006 17:59:34 -0600] rev 3955
convert-repo: add CVS branch support
Matt Mackall <mpm@selenic.com> [Fri, 22 Dec 2006 17:59:34 -0600] rev 3954
convert-repo: add basic CVS import support
Brendan Cully <brendan@kublai.com> [Fri, 22 Dec 2006 16:29:35 -0800] rev 3953
Make test-manifest-merging less likely to delete the whole filesystem
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 22 Dec 2006 22:53:16 +0100] rev 3952
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 22 Dec 2006 22:51:39 +0100] rev 3951
grep: remove count handling, simplify, fix issue337
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 22 Dec 2006 22:16:05 +0100] rev 3950
grep: incrementing is always False during 'iter'
Matt Mackall <mpm@selenic.com> [Thu, 21 Dec 2006 23:17:20 -0600] rev 3949
Merge with crew
Matt Mackall <mpm@selenic.com> [Wed, 20 Dec 2006 17:04:07 -0600] rev 3948
Update convert-repo usage comments
Matt Mackall <mpm@selenic.com> [Wed, 20 Dec 2006 16:31:46 -0600] rev 3947
convert-repo: add some smarts
autodetect source and destination repo types
autodetect read and write capabilities of converters
default destination directory (<src>-hg)
default map file (<dest>/.hg/shamap)
more verbose by default
add a -q switch
add IO functions
Edouard Gomez <ed.gomez@free.fr> [Thu, 21 Dec 2006 20:41:56 +0100] rev 3946
Send encoding information in rss header
Edouard Gomez <ed.gomez@free.fr> [Wed, 20 Dec 2006 23:41:27 +0100] rev 3945
pass the extra dict in rawcommit
Brendan Cully <brendan@kublai.com> [Wed, 20 Dec 2006 12:07:02 -0800] rev 3944
Merge with mpm