Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Thu, 31 May 2007 20:12:40 -0400] rev 4468
gitweb: Fixed-up search template
It seems that the search template has been forgoten over time, and needed
major revamping.
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Thu, 31 May 2007 19:59:02 -0400] rev 4467
gitweb: Add search box to the summary page
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 06:52:40 -0400] rev 4466
gitweb: file diff: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 11:16:57 -0400] rev 4465
gitweb: file annotate: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 11:10:28 -0400] rev 4464
gitweb: file rev template: Display metadata in same order as changeset does
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 11:07:33 -0400] rev 4463
gitweb: changeset template: remove manifest link from cset metadata
Emanuele Aina <em@nerd.ocracy.org> [Fri, 11 May 2007 17:05:44 +0200] rev 4462
purge: add --include and --exclude options
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 29 May 2007 16:42:05 +0200] rev 4461
hgweb: use generator to count parity of horizontal stripes for easier reading.
- use web.stripes in all places and consistently
- start with parity0 for lists generated in reverse (e.g. changelog)
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 07:00:36 -0400] rev 4460
gitweb: shortlog: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 07:00:26 -0400] rev 4459
gitweb: file log: display nav links near the bottom
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 06:35:45 -0400] rev 4458
gitweb: file log template: removed excesive whitespace
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 05:08:01 -0400] rev 4457
hgweb: manifest: pass parity for the '[up]' link
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 04:57:12 -0400] rev 4456
gitweb: manifest template: do not include trailing slash in directory names
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 03:37:03 -0400] rev 4455
gitweb: Add title separator to tags template
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 15:31:29 +0200] rev 4454
gitweb: changelog template: removed excessive whitespace
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 15:30:40 +0200] rev 4453
gitweb: shortlog template: removed excessive whitespace, added title bar.
The title bar is currently empty, this is just a preparation for filling it
with content.
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 03:27:02 -0400] rev 4452
gitweb: Fixed manifest template opening an extra div tag
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Tue, 29 May 2007 03:19:45 -0400] rev 4451
gitweb: Fix summary page ellipsis line colspans
Daniel Holth <dholth@fastmail.fm> [Thu, 17 May 2007 13:55:24 -0400] rev 4450
accept -r REV in more places
Commands affected:
* update
* merge
* backout
Patrick Mezard <pmezard@gmail.com> [Sun, 20 May 2007 19:32:22 +0200] rev 4449
Merge with crew-stable.
Henri Precheur <henry@precheur.org> [Sun, 20 May 2007 19:27:14 +0200] rev 4448
Fix issue 563: error in _hg_commit in the contrib/zsh_completion script.
Daniel Holth <dholth@fastmail.fm> [Wed, 16 May 2007 01:10:12 -0400] rev 4447
use documented convert-repo interface
Daniel Holth <dholth@fastmail.fm> [Wed, 16 May 2007 01:07:27 -0400] rev 4446
document conversion interface
Patrick Mezard <pmezard@gmail.com> [Sat, 19 May 2007 22:51:43 +0200] rev 4445
Merge with crew-stable.
Patrick Mezard <pmezard@gmail.com> [Sat, 19 May 2007 22:47:01 +0200] rev 4444
Fix issue 562: .hgignore requires newline at end.
End-of-lines characters where discarded without any check for existence.
Patrick Mezard <pmezard@gmail.com> [Sat, 19 May 2007 22:46:59 +0200] rev 4443
Test issue 562: .hgignore requires newline at end
Eric Hopper <hopper@omnifarious.org> [Thu, 17 May 2007 20:09:52 -0700] rev 4442
Make hg import --exact work when a new branch is created by an import.
Eric Hopper <hopper@omnifarious.org> [Thu, 17 May 2007 20:09:49 -0700] rev 4441
Alter test to test import --exact to make sure it works with branches.
Eric Hopper <hopper@omnifarious.org> [Thu, 17 May 2007 20:09:47 -0700] rev 4440
Add ability to parse branch information to hg import
Eric Hopper <hopper@omnifarious.org> [Thu, 17 May 2007 20:09:44 -0700] rev 4439
Add a test for the Branch header being in hg export.
Eric Hopper <hopper@omnifarious.org> [Thu, 17 May 2007 09:29:30 -0700] rev 4438
Fix hg import --exact bug that hangs hg on failure.
Brendan Cully <brendan@kublai.com> [Sun, 13 May 2007 19:15:54 -0700] rev 4437
Make mergepatch save queue now that qpush isn't.
Eric Hopper <hopper@omnifarious.org> [Thu, 10 May 2007 13:42:36 -0700] rev 4436
Add branch information to hg export.
Patrick Mezard <pmezard@gmail.com> [Sat, 12 May 2007 21:09:31 +0200] rev 4435
Add ui.patch option.
ui.patch overrides the default patch/gpatch command and options.
Patrick Mezard <pmezard@gmail.com> [Sat, 12 May 2007 21:09:29 +0200] rev 4434
Fix issue483 - mq does not work under windows with gnu-win32 patch.
Add --binary option to patch command under win32.
NIIMI Satoshi <sa2c@sa2c.net> [Mon, 07 May 2007 21:44:11 +0900] rev 4433
mercurial.el: fix error on hg-read-rev() with small tip, and cleanups
* Fix error if tip revision is smaller than hg-rev-completion-limit
If tip revision is 10, "hg log -r -100:tip" fails.
* Remove dependencies on cl package at runtime
Quote from GNU Emacs Lisp Reference Manual, Emacs Lisp Coding Conventions:
> * Please don't require the `cl' package of Common Lisp extensions at
> run time. Use of this package is optional, and it is not part of
> the standard Emacs namespace. If your package loads `cl' at run
> time, that could cause name clashes for users who don't use that
> package.
* Check XEmacs at compile time
Since byte-compiled file is not portable between GNU Emacs and
XEmacs, checking type of emacs can be done at compile time. This
reduces byte-compiler warnings.
* Defvar variables binded dynamically and used across functions
* Combine status output string to state symbol alist into a variable,
and use char instead of string for key of state alist
* Make hg-view-mode as minor-mode
* Define keymaps as conventions
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 13:10:27 -0700] rev 4432
mq: add qgoto command.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:51:16 -0700] rev 4431
Fix typo in bugzilla extension.
Brendan Cully <brendan@kublai.com> [Tue, 08 May 2007 13:08:20 -0700] rev 4430
Fix test-patchbomb for crew
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:54:39 -0700] rev 4429
mq.el: add mq-signoff, to sign off on a patch
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:54:39 -0700] rev 4428
mq.el: don't fill half the screen with a single line of output.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:54:39 -0700] rev 4427
mq.el: add hook to run when finishing the edit of a patch.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:54:39 -0700] rev 4426
imported patch mq-refresh-git.patch
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:54:39 -0700] rev 4425
mq.el: allow mq-diff to take a git option.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 08 May 2007 11:54:39 -0700] rev 4424
mq.el: add mq-diff function.
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