Thomas Arendsen Hein <thomas@intevation.de> [Mon, 04 Jun 2007 22:02:17 +0200] rev 4498
Fixed indentation in hgext/notify.py
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 04 Jun 2007 00:26:53 -0300] rev 4497
merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 04 Jun 2007 00:24:48 -0300] rev 4496
wsgicgi: change stdin to binary mode
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 04 Jun 2007 00:24:48 -0300] rev 4495
Also check the index file size when deciding whether to reload a revlog.
This should fix some spurious failures from test-clone-pull-corruption
(issue552).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 04 Jun 2007 00:24:48 -0300] rev 4494
use .extend instead of .append in readtags
TK Soh <teekaysoh@yahoo.com> [Fri, 20 Apr 2007 16:17:42 -0500] rev 4493
hbisect: fix a typo in error message
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Jun 2007 14:38:52 -0300] rev 4492
patch.diff: avoid calling workingctx().manifest()
Right now, to generate the manifest of the working dir, we have to
perform a full walk of the working dir, which will be very slow,
especially if we're interested in only a small part of it.
Since we use the manifest only to find out the mode of files for git
patches, manually build an execf function to do it.
This should fix issue567.
Patrick Mezard <pmezard@gmail.com> [Sun, 03 Jun 2007 17:18:48 +0200] rev 4491
Merge with crew-stable
"Andrei Vermel <avermel@mail.ru>" [Fri, 15 Dec 2006 10:32:57 +0300] rev 4490
hgk - fix CR issues on windows
Mathieu Clabaut <mathieu.clabaut@gmail.com> [Thu, 24 May 2007 16:32:38 +0200] rev 4489
Add sending date to notify message.
When using SMTP, no date field was set into the message, which causes it to be
displayed as being send on 1st january 1970 on most MUA.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 02 Jun 2007 09:04:23 -0700] rev 4488
Merge with crew.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:58:59 -0700] rev 4487
patchbomb: Fail early if no revs given to email
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:54:00 -0700] rev 4486
patchbomb: Fix typo.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:53:46 -0700] rev 4485
patchbomb: Hoist sender config higher.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:43:29 -0700] rev 4484
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:40:14 -0700] rev 4483
patchbomb: Validate email config before we start prompting for info.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 14:26:54 -0700] rev 4482
Introduce find_exe. Use instead of find_in_path for programs.
The behaviour of find_in_path was broken for config options containing
path names, because it always searched the given path, even when not
necessary. The find_exe function is more polite: if the name passed
to it contains a path component, it just returns it.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 13:50:59 -0700] rev 4481
ui: Rename has_config to has_section.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 13:41:35 -0700] rev 4480
patchbomb: Defer the import of readline.
If imported at the top of the module, the import appears to succeed,
but raw_input doesn't acquire magic editing fu. I suspect this has
something to do with the newish demandimport code, because the prior
code worked with demandload.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 27 May 2007 13:29:04 -0700] rev 4479
patchbomb: Don't prompt for headers until sure we have revs to export.
The prior behaviour was to always prompt for headers, and only then
bomb out if there were actually no revs to send.
Matt Mackall <mpm@selenic.com> [Fri, 01 Jun 2007 18:40:14 -0500] rev 4478
Add support for url#id syntax
This allows you to do:
hg clone http://server/repo#stable
which is equivalent to:
hg clone -r stable http://server/repo
Future incoming, outgoing, and push commands will default to using
this id because it's recorded in the default path.
Other commands that accept URLs (push, pull, bundle, incoming, and
outgoing) also accept this syntax.
Matt Mackall <mpm@selenic.com> [Fri, 01 Jun 2007 18:52:18 -0500] rev 4477
clone: checkout the "default" branch if available
Matt Mackall <mpm@selenic.com> [Sat, 02 Jun 2007 09:21:56 -0500] rev 4476
mq: pass a URL to clone
Matt Mackall <mpm@selenic.com> [Fri, 01 Jun 2007 14:07:42 -0500] rev 4475
Warn about large files on hg add
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 19:49:09 +0200] rev 4474
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 19:45:05 +0200] rev 4473
Make "hg incoming -r revision_number" work for remote repos (issue566)
Uses the remote repository's lookup method as pull does and only transfers
what is needed to calculate incoming changesets.
One minor problem:
As only the needed changesets are transfered and stored in a local bundle
repository, the tip tag of this bundle is shows despite not being the tip
changeset of the remote repository.
(see "+tag: tip" in tests/test-incoming-outgoing.out in this patch)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 16:02:49 +0200] rev 4472
Corrected similarity parameter used in test-addremove
0.5 meant 50% in the early stages of addremove -s, now 50 has to be used.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 16:00:40 +0200] rev 4471
addremove: comparing two empty files caused ZeroDivisionError
(found by Giorgos Keramidas)
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 13:03:21 +0200] rev 4470
Add archive download links to hgweb search template
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 01 Jun 2007 13:00:27 +0200] rev 4469
merge with crew
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