Thomas Arendsen Hein <thomas@intevation.de> [Wed, 13 Jun 2007 08:24:40 +0200] rev 4565
Correct tests/test-patchbomb* files:
mv test-patchbomb test-patchbomb.out
hg revert -r 1cf908c00479 test-patchbomb
Bryan O'Sullivan <bos@serpentine.com> [Tue, 12 Jun 2007 14:52:34 -0700] rev 4564
patchbomb: add --date option
Bryan O'Sullivan <bos@serpentine.com> [Tue, 12 Jun 2007 14:44:47 -0700] rev 4563
Don't validate email config if we're not sending email.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 12 Jun 2007 14:39:36 -0700] rev 4562
patchbomb: 0c61124ad877 moved setremoteconfig into cmdutil
Brendan Cully <brendan@kublai.com> [Tue, 12 Jun 2007 13:21:42 -0700] rev 4561
dispatch: restore a dropped shlex import
Add test-dispatch as a place for command parsing and dispatch tests.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Jun 2007 18:55:47 +0200] rev 4560
merge with main
Matt Mackall <mpm@selenic.com> [Tue, 12 Jun 2007 10:34:54 -0500] rev 4559
extensions: add missing sys import
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 12 Jun 2007 17:39:57 +0200] rev 4558
Revive commands.dispatch as a simple way to call hg from other pythons scripts.
This was already used by hg-ssh and others and is really convenient if you
just want a native equivalent of calling the command line version.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4557
dispatch: accept an abbreviation of --repository
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4556
dispatch: move findrepo to cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4555
localrepo: don't search from path
All current callers already pass in the repo root.
This normalizes things a bit. Now all repo types take a direct path to
repo root and only the command line interface (or the dispatcher)
searches from the current directory.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4554
dispatch: use the repo path found by early parsing
This lets us simplify things a bit.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4553
dispatch: parse and apply -R early
This allows us to use extensions specified in .hg/hgrc. Unfortunately,
this requires us to parse that file twice, but performance impact on
the version command appears to be less than 1%.
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4552
dispatch: parse and apply cwd opt early
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4551
dispatch: rename variables after code motion
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4550
dispatch: hoist debugging hook to runcatch
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4549
dispatch: move dispatching code to cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4548
dispatch: move runcommand to cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:24 -0500] rev 4547
dispatch: pull final command execution into its own function
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4546
dispatch: reduce nesting by moving parsing exceptions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4545
dispatch: move signal and exception handling to its own function
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4544
Create a separate module for managing extensions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4543
extensions: separate function for loading single extensions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4542
dispatch: reorder functions
Matt Mackall <mpm@selenic.com> [Mon, 11 Jun 2007 21:09:23 -0500] rev 4541
localrepo: break out the repo-finding walk into its own function
Brendan Cully <brendan@kublai.com> [Mon, 11 Jun 2007 12:14:31 -0700] rev 4540
Respect locale environment variables on darwin.
In python 2.4+ on darwin, locale.getpreferredencoding() returns
mac-roman regardless of what LC_CTYPE, LANG etc are set to. This can
produce hard-to-notice conversion errors if input text is not in
mac-roman. So this patch overrides it with setlocale/getlocale if the
environment has been customized, on the assumption that the user has
done so deliberately.
Brendan Cully <brendan@kublai.com> [Mon, 11 Jun 2007 11:06:42 -0700] rev 4539
Small cleanups for the new tag code
Josef "Jeff" Sipek <jeffpc@josefsipek.net> [Fri, 01 Jun 2007 19:56:39 -0400] rev 4538
gitweb: Display branch and tag labels
Pages which display labels:
- summary
- shortlog
- changelog
- changeset
- search
Brendan Cully <brendan@kublai.com> [Sun, 10 Jun 2007 21:05:01 -0700] rev 4537
Merge with mpm
Matt Mackall <mpm@selenic.com> [Sun, 10 Jun 2007 21:16:58 -0500] rev 4536
commit: fix bug where dirstate for removed file is confused
This fixes issue586
Matt Mackall <mpm@selenic.com> [Sun, 10 Jun 2007 19:16:20 -0500] rev 4535
hg serve: don't lookup user-supplied names/addresses
Brendan Cully <brendan@kublai.com> [Sun, 10 Jun 2007 20:08:47 -0700] rev 4534
Split convert extension into common and repository type modules
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Jun 2007 13:25:54 +0200] rev 4533
Removed trailing \n in calls to util.Abort()
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 09 Jun 2007 13:17:58 +0200] rev 4532
Some small cleanups for convert extension:
- repo doesn't need to be imported
- util.Abort doesn't need \n
- space after comma
- long lines
- spacing
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Jun 2007 01:04:28 -0300] rev 4531
Avoid extra filelogs entries.
Right now, there are some situations in which localrepo.filecommit can
create filelog entries even though they're not needed. For example:
- permissions for a file have changed;
- qrefresh can create a filelog entry identical to its parent (see the
added test);
- convert-repo creates extra filelog entries in every merge where the
first parent has added files (for example, changeset ebebe9577a1a of
the kernel repo added extra filelog entries to files in the
arch/blackfin directory, even though the merge should only touch the
drivers/ata directory). This makes "hg log file" in a converted repo
less useful than it could be, since it may mention many merges that
don't actually touch that specific file.
They all come from the same basic problem: localrepo.commit (through
filecommit) creates new filelog entries for all files passed to it
(except for some cases during a merge).
Patch and test case provided by Benoit.
This should fix issue351.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 09 Jun 2007 01:04:28 -0300] rev 4530
Make sure the changelog mentions files whose flags changed
These changes don't actually need a new filelog entry (see next patch),
but if we don't mention the files in the changelog, it becomes much
harder to find all changesets that touch a file (not even a
"hg log --removed file" will work).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4529
run-tests.py: set ui.slash = True
This should make things easier for pysh.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4528
test-config-case: print only the Section we're interested in.
This allows us to add additional settings to the global hgrc file
created by run-tests.py without breaking this test.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4527
Add ui.slash hgrc setting
This will make most commands print paths using "/", regardless of
the value of os.sep.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4526
docopy: use repo.pathto to format paths for printing
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4525
Add dirstate.pathto and localrepo.pathto.
Every time util.pathto is called, we have to pass the repo root and the
repo cwd.
dirstate.pathto is a simple convenience function that knows about the
root and the cwd arguments. It's still possible to pass the cwd as an
optimization.
localrepo.pathto is a convenience function that just calls
dirstate.pathto, just like localrepo.getcwd.
dirstate.pathto becomes a single point that converts most (all?) paths
from the internal representation to some OS-specific relative path for
display purposes.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4524
Use absolute paths in revert.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4523
Use absolute paths in docopy.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Jun 2007 23:49:12 -0300] rev 4522
Use absolute paths in addremove.
This is more consistent with other places in the code, which only use
the "relpath" returned by cmdutil.walk for display purposes.
Edouard Gomez <ed.gomez@free.fr> [Thu, 07 Jun 2007 23:16:10 +0200] rev 4521
Add some more smart when initializing destination repository
Edouard Gomez <ed.gomez@free.fr> [Thu, 07 Jun 2007 23:06:17 +0200] rev 4520
Fix hgext/convert/__init__.py rights
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 07 Jun 2007 22:28:52 +0200] rev 4519
Include convert extension in packages setup
(reported by Christian Ebert and Eric Hopper)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 07 Jun 2007 12:41:12 +0200] rev 4518
convert: map CVS HEAD to default branch
Patrick Mezard <pmezard@gmail.com> [Sun, 03 Jun 2007 22:11:25 +0200] rev 4517
ui: make readsections() abort when configuration cannot be read.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 20:22:52 +0200] rev 4516
Removed trailing whitespace and tabs from python files
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 20:17:03 +0200] rev 4515
Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension
Edouard Gomez <ed.gomez@free.fr> [Fri, 25 May 2007 08:12:33 +0200] rev 4514
Add a wrapper script for convert extension
Edouard Gomez <ed.gomez@free.fr> [Fri, 25 May 2007 00:56:48 +0200] rev 4513
Turns convert.py into a real extension
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 19:49:47 +0200] rev 4512
Move convert-repo to hgext/convert/__init__.py
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 19:06:43 +0200] rev 4511
Fixed test output for changed glog (. instead of @)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 19:05:18 +0200] rev 4510
Issue a warning if "-r ." is used with two working directory parents.
Rationale for not aborting instead:
The first parent is usually more important as it is the local branch
during a merge and commands like 'hg diff' and 'hg diff -r.' behave still
identically (except for the warning of course).
Added a test for log -r. with one and two parents.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Jun 2007 18:28:48 +0200] rev 4509
graphlog: Print . instead of @ for working directory parents
"." is accepted as an alias for the first working directory parent by -r/--rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 05 Jun 2007 19:55:27 -0300] rev 4508
Remove atomicfile class.
The interface provided by opener(atomic=True) is inherently unsafe:
if an exception is raised in the code using the atomic file, the
possibly incomplete file will be renamed to its final destination,
defeating the whole purpose of atomic files.
To get around this, we would either need some bad hacks involving
sys.exc_info (to make sure things work in except: blocks), or an
interface to say "file is complete; rename it".
This is the exact interface provided by atomictempfile. Since there
are no remaining users of the atomicfile class, just remove it.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 05 Jun 2007 19:55:27 -0300] rev 4507
Use atomictemp files to write the dirstate.
atomic files are not safe in all cases.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 05 Jun 2007 19:26:36 -0300] rev 4506
test-serve: let run-tests.py kill the daemons
If the daemons die while the tests are still running, we'll get additional
"killed!" messages, making the test fail.
Joel Rosdahl <joel@rosdahl.net> [Mon, 04 Jun 2007 21:49:01 +0200] rev 4505
Fix bug in "hg serve -v"
Joel Rosdahl <joel@rosdahl.net> [Mon, 04 Jun 2007 21:48:59 +0200] rev 4504
Add test reproducing a bug in "hg serve -v"
Patrick Mezard <pmezard@gmail.com> [Mon, 04 Jun 2007 22:56:42 +0200] rev 4503
Merge with crew-stable
TK Soh <teekaysoh@yahoo.com> [Mon, 04 Jun 2007 09:16:53 -0500] rev 4502
hgk: display tags that contain spaces
Bela Babik <teki321@gmail.com> [Mon, 04 Jun 2007 16:54:52 +1000] rev 4501
hgk: added -selectbackground grey to canvases
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 04 Jun 2007 22:08:42 +0200] rev 4500
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 04 Jun 2007 22:05:47 +0200] rev 4499
Obfuscate author in gitweb shortlog (issue578)
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
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