Lee Cantey <lcantey@gmail.com> [Thu, 06 Jul 2006 09:26:31 -0700] rev 2575
Redirect MacPython link to point to python.org
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 15:04:10 -0700] rev 2574
merge with mpm.
Matt Mackall <mpm@selenic.com> [Thu, 06 Jul 2006 14:15:24 -0500] rev 2573
Fix annotate breakage
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 15:03:34 -0700] rev 2572
fix problems with external module handling. found by benoit boissinot.
first fix is to not store module objects in commands.external dict,
instead use module names for key into sys.modules. this prevents circular
reference during cleanup of aborted transaction.
second is to get name right during import of external module.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 11:49:19 -0700] rev 2571
tests: record few more daemon pids to be safe
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 11:45:34 -0700] rev 2570
tests: add timeouts, make run-tests.py clean up dead daemon processes
test timeout feature is needed for test with python 2.5 beta. if test
does not complete in time (30 seconds is default), it is killed.
some times daemon process used in test can be alive after the test
is killed by user or by timeout. tests now record daemon pids into
$DAEMON_PIDS and run-tests.py kills all living daemons after every test.
final little change is to add newline to end of pid file printed by
"hg serve", else "cat hg.pid >> $DAEMON_FILES" gives garbage.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 06 Jul 2006 10:09:24 -0700] rev 2569
run-tests.py: make tests use same python interpreter as test harness.
this is wanted because some tests run python interpreter directly.
must use same python interpreter in tests as in main harness or problems
will happen because of e.g. different python abi if run-tests.py run
with python 2.5 but system python is 2.4.
fix is to see if system python is used and is named python. if no,
put symlink called python at front of shell search path.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 06 Jul 2006 03:14:55 -0300] rev 2568
HTTPS: fix python2.3, persistent connections, don't explode if SSL is not available
The urllib2 differences between python 2.3 and 2.4 are hidden by
using keepalive.py, which also gives us support for persistent
connections.
Support for HTTPS is enabled only if there's a HTTPSHandler class in
urllib2.
It's not possible to have separate classes as handlers for HTTP and
HTTPS: to support persistent HTTPS connections, we need a class that
inherits from both keepalive.HTTPHandler and urllib2.HTTPSHandler. If
we try to pass (an instance of) this class and (an instance of) the
httphandler class to urllib2.build_opener, this function ends up getting
confused, since both classes are subclasses of the HTTPHandler default
handler, and raises an exception.
Matt Mackall <mpm@selenic.com> [Wed, 05 Jul 2006 13:28:25 -0500] rev 2567
Merge context patches
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:42:17 -0500] rev 2566
Convert hg annotate to context api
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:11:42 -0500] rev 2565
convert hg cat to new context api
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:08:10 -0500] rev 2564
Add context helper functions to localrepo
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:07:46 -0500] rev 2563
Add context.py: changeset and file revision contexts
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 17:06:56 -0500] rev 2562
simplify make_filename, fix hg cat bug
hg cat was using file-level rev/node ids for generating filename
templates. This simplifies make_filename to only use changeset
rev/node ids.
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 16:52:42 -0500] rev 2561
revlog: make lookup handle binary nodes
Matt Mackall <mpm@selenic.com> [Wed, 28 Jun 2006 15:49:33 -0500] rev 2560
revlog: handle integer arguments to lookup
Brendan Cully <brendan@kublai.com> [Tue, 04 Jul 2006 15:36:05 -0700] rev 2559
templater.firstline should handle empty strings
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 03 Jul 2006 00:33:19 -0300] rev 2558
hgweb: fix unbundle.
After the WSGI changes, even if a push over HTTP succeeds, apache
complains about "Premature end of script headers: hgwebdir.cgi" and
returns a "HTTP Error 500: Internal Server Error", making the local hg
abort.
The change to either of the files touched by this patch is enough to fix
this, but I think changing both is a more robust solution.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 03 Jul 2006 00:23:58 -0300] rev 2557
Fix push over https.
Without this patch, python gives me a
TypeError: write() argument 1 must be string or read-only buffer, not file
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 03 Jul 2006 00:23:56 -0300] rev 2556
Allow http://user@example.com URLs (i.e. without passwords)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 02 Jul 2006 22:39:39 -0300] rev 2555
hg.py: move exception handling code to try to avoid hiding errors
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 03 Jul 2006 14:30:38 -0700] rev 2554
help: add help to mq extension
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 03 Jul 2006 14:30:24 -0700] rev 2553
help: make "hg help EXTENSION" work
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 03 Jul 2006 19:28:31 +0200] rev 2552
Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 03 Jul 2006 10:19:09 -0700] rev 2551
merge with crew.
Raphael Marmier <raphael@marmier.net> [Mon, 03 Jul 2006 10:18:46 -0700] rev 2550
Disable automatic line endings conversion on windows
The rationale behind this is that such conversion implies a particular
situation in which all files in the repo are terminated by only LF. This
is documented nowhere and it bit me sharply when I upgraded.
Furthermore, it works on the assumption that a file containing no NULL
characters are actually a text file. Therefore it cannot guarantee that
no binary file will be harmed in the process.
Currently, if a file already contains CRLF line endings when it is
copied to the working dir from the repo, then the version in the working
dir will be corrupted by an extra CR.
I'm working on a patch that will turn this into a warning. But as a side
effect, committing such a file back will strip it from its CR.
In all case, unrequested data modification can occur under the feet of
the user, which is bad(tm), ihmo.
Sean Meiners <sean.meiners@linspire.com> [Fri, 30 Jun 2006 19:24:02 -0700] rev 2549
Added ability to clone from a local repository to a (new) remote one.
Rearranged the clone command a good bit to make sure it validates that
the source does exist and that the destination doesn't before doing anything.
Before I moved the source repo check it would create the destination
repository before it verified the source existed.
Moved the responsibility for creating the destination repo root directory
entirly into the localrepo class so that local to local cloning doesn't break.
This also simplifies the code a bit since it's no longer being done in both
clone and init.
Changed the names of the 'repo' and 'other' variables to 'dest_repo' and
'src_repo' to maintain my sanity.
Passes 82/83 tests. The only failure is the version number test, which I
suspect is supposed to fail since it comes from a generated file.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 03 Jul 2006 19:14:29 +0200] rev 2548
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 30 Jun 2006 22:04:02 -0700] rev 2547
test-webraw: do not store hostname in test output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 30 Jun 2006 23:02:08 +0200] rev 2546
str.rsplit does not exist in python 2.3
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 30 Jun 2006 22:09:43 +0200] rev 2545
Merge with crew.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 30 Jun 2006 21:57:57 +0200] rev 2544
Added missing space in continued string.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 30 Jun 2006 21:41:46 +0200] rev 2543
Include inttypes.h instead of stdint.h (fixes issue299)
Many projects use inttypes.h, too. stdint.h isn't available everywhere, e.g.
on some versions of Solaris, while inttypes.h is available everywhere where
stdint.h is.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 30 Jun 2006 21:41:24 +0200] rev 2542
Use more compatible `cmd` instead of $(cmd) in test-http-proxy
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 30 Jun 2006 21:40:56 +0200] rev 2541
Don't change $PATH (breaks python in other locations) and $PWD in test-oldcgi
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 30 Jun 2006 21:40:20 +0200] rev 2540
Don't use non-sh declare in test-oldcgi.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 30 Jun 2006 21:36:45 +0200] rev 2539
Merged WSGI fixes from http://hg.omnifarious.org/~hopper/webmerc/
Eric Hopper <hopper@omnifarious.org> [Fri, 30 Jun 2006 09:50:25 -0700] rev 2538
Cleanup hgweb and hgwebdir's run method a bit.
Eric Hopper <hopper@omnifarious.org> [Fri, 30 Jun 2006 08:47:41 -0700] rev 2537
Fix hgwebdir to run hgweb using run_wsgi.
Eric Hopper <hopper@omnifarious.org> [Fri, 30 Jun 2006 08:45:52 -0700] rev 2536
Fix new tests to be better. In particular, fix webraw test to
specify a date on commit to be less brittle, and fix test-oldcgi to test
fetching a subdirectory of a webdir instance.
Eric Hopper <hopper@omnifarious.org> [Thu, 29 Jun 2006 19:06:18 -0700] rev 2535
Arrange for old copies of CGI scripts to still work.
Eric Hopper <hopper@omnifarious.org> [Thu, 29 Jun 2006 18:34:26 -0700] rev 2534
Fix raw files in the web UI.
Eric Hopper <hopper@omnifarious.org> [Thu, 29 Jun 2006 18:31:17 -0700] rev 2533
Create a test to make sure old CGI scripts will still work.
Eric Hopper <hopper@omnifarious.org> [Thu, 29 Jun 2006 16:44:23 -0700] rev 2532
Add a test for getting raw files via the web UI.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 30 Jun 2006 21:35:28 +0200] rev 2531
Merge with crew.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 28 Jun 2006 12:29:48 +0200] rev 2530
Wait for first pull to be completed before doing verify.
Sascha Wilde <wilde@sha-bang.de> [Tue, 27 Jun 2006 22:50:33 +0200] rev 2529
Some systems are slower ... give 'em some time/
Sascha Wilde <wilde@sha-bang.de> [Tue, 27 Jun 2006 21:56:11 +0200] rev 2528
Workaround to work with less sophisticated sed versions.
For example NetBSD sed doesn't know about '\|'.
Sascha Wilde <wilde@sha-bang.de> [Tue, 27 Jun 2006 09:57:06 +0200] rev 2527
Split installation targets into install-bin and install-doc.
install-bin will only install the program, and install-doc will install
the documentation. The main install target still installs both.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 28 Jun 2006 08:56:01 +0200] rev 2526
mq: Added help for qcommit, consistently talk about queue repository.
Brendan Cully <brendan@kublai.com> [Fri, 30 Jun 2006 21:35:22 +0200] rev 2525
hgk: Don't choke on empty changelogs
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 30 Jun 2006 18:57:04 +0200] rev 2524
add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 30 Jun 2006 18:48:06 +0200] rev 2523
validate the resulting date in parsedate
Jose M. Prieto <jmprieto@gmx.net> [Fri, 30 Jun 2006 18:47:35 +0200] rev 2522
Allow the use of human readable dates (issue 251)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 30 Jun 2006 16:16:35 +0200] rev 2521
add -r/--rev arguments to incoming and outgoing
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 30 Jun 2006 10:16:38 +0200] rev 2520
make changeset outputted by the raw template to be closer to 'hg export'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 30 Jun 2006 10:15:18 +0200] rev 2519
add a new template function 'hgdate'
'hgdate' turns a date into a cset timestamp as printed by 'hg export'
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 29 Jun 2006 10:35:15 -0700] rev 2518
mercurial.el: fix misleading indent of code.
code was correct, indent was wrong.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 29 Jun 2006 10:27:09 -0700] rev 2517
mercurial.el: inhibit backups for files managed by mercurial
Lee Cantey <lcantey@gmail.com> [Tue, 27 Jun 2006 11:32:37 -0700] rev 2516
Update Mac OSX installer to 0.9 with Universal Python build
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 27 Jun 2006 09:41:05 -0700] rev 2515
import: make help clearer. suggested by asak.
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Jun 2006 09:33:12 -0700] rev 2514
Really fix http headers for web UI and issue 254.
This also arranges for static content to allow a keepalive connection.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 27 Jun 2006 09:30:50 -0700] rev 2513
import: added tests, fixed bugs found by tests and asak.
Chris Mason <mason@suse.com> [Tue, 27 Jun 2006 10:49:46 -0400] rev 2512
mq: fix qparents to return the correct parent when no patches are applied
Chris Mason <mason@suse.com> [Tue, 27 Jun 2006 11:23:06 -0400] rev 2511
mq: hg qnew -f should refresh the new patch
qnew -f was originally meant to just skip the localchanges check.
But, it currently discards the local changes, which is not at all what
people expect.
This patch changes qnew -f to create the new patch and then
run hg qrefresh on it. The local changes will be in the new
patch.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 27 Jun 2006 00:13:44 -0700] rev 2510
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 27 Jun 2006 00:10:41 -0700] rev 2509
merge with wsgi changes.
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Jun 2006 00:09:37 -0700] rev 2508
Put support for persistent connections back in.
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Jun 2006 00:09:35 -0700] rev 2507
Fix two small bugs that would've prevented the web interface and IPv6
from working.
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Jun 2006 00:09:33 -0700] rev 2506
This patch make several WSGI related alterations.
First, it changes the server to be almost a generic WSGI server.
Second, it changes request.py to have wsgiapplication and
_wsgirequest. wsgiapplication is a class that creates _wsgirequests
when called by a WSGI compliant server. It needs to know whether
or not it should create hgwebdir or hgweb requests.
Lastly, wsgicgi.py is added, and the CGI scripts are altered to
use it to launch wsgiapplications in a WSGI compliant way.
As a side effect, all the keepalive code has been removed from
request.py. This code needs to be moved so that it is exclusively
in server.py
Eric Hopper <hopper@omnifarious.org> [Tue, 27 Jun 2006 00:09:31 -0700] rev 2505
Fix server to set up a more WSGI compliant environment.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 27 Jun 2006 00:09:13 -0700] rev 2504
import: parse email messages
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 27 Jun 2006 08:31:03 +0200] rev 2503
Don't require opts['dry_run'] to be set to fix external tools like tailor.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 26 Jun 2006 22:44:48 +0200] rev 2502
Allow using default values with ui.configlist, too, and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 26 Jun 2006 16:47:24 +0200] rev 2501
Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 26 Jun 2006 14:56:14 +0200] rev 2500
Fixed [web] allow_archive for comma separated parameters by using ui.configlist.
Changed tests/test-archive to use allow_archive instead of the deprecated
allowzip, allowgz and allowbz2.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 26 Jun 2006 14:52:26 +0200] rev 2499
Added ui.configlist method to get comma/space separated lists of strings.
For example:
users = alice, bob
colors = red green blue
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 26 Jun 2006 14:49:18 +0200] rev 2498
Fix ui.expandpath problem and broken test introduced by 4a2a4d988ead.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 23 Jun 2006 19:20:22 -0700] rev 2497
do not try to package lsprof if not available.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 23 Jun 2006 18:23:42 -0700] rev 2496
add test for default-push.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 23 Jun 2006 18:23:32 -0700] rev 2495
make ui.expandpath better with default path.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 23 Jun 2006 18:09:44 -0700] rev 2494
push, outgoing, bundle: fall back to "default" if "default-push" not defined
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 23 Jun 2006 17:33:10 -0700] rev 2493
print message after backout that tells that backout adds new head.
Brendan Cully <brendan@kublai.com> [Fri, 23 Jun 2006 17:21:04 -0700] rev 2492
Test case for #295
Chris Mason <mason@suse.com> [Fri, 23 Jun 2006 16:42:48 -0700] rev 2491
Fix localrepo.changes() Correctly decide if we are diffing the working dir
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Jun 2006 15:02:23 -0300] rev 2490
Change revlog.heads to walk the revision graph using revision numbers
On the kernel repo:
$ hg heads -q
before after
RevlogNG 1.11 0.52
Revlogv0 0.80 0.69
Since the current code for tags has to find all the heads of the repo,
this also helps there:
$ hg tags
before after
RevlogNG 2.35 1.76
Revlogv0 2.04 1.90
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 20 Jun 2006 14:57:30 -0300] rev 2489
Add revlog.parentrevs function.
This allows one to walk the revision graph using only revision numbers,
which can be faster than using revision hashes, especially for
RevlogNG, where the parents of a revision are stored as revision
numbers.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 23 Jun 2006 12:52:42 -0700] rev 2488
mq: add qimported patches if patch dir is a repo
Brendan Cully <brendan@kublai.com> [Fri, 23 Jun 2006 08:10:06 +0200] rev 2487
Test case for #294
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 23 Jun 2006 08:09:48 +0200] rev 2486
simplify filterfiles when filtering based on a directory
since an unkown files cannot be an exact match, we bisect
for a <path>/ instead of <path> and we get only the files
below the directory.
Brendan Cully <brendan@kublai.com> [Fri, 23 Jun 2006 00:11:53 +0200] rev 2485
filterfiles: Search as long as the target is a prefix of current.
filterfiles was failing to find files for directory arguments if
another file existed that started with the directory name and
sorted earlier. For example, a manifest of ('foo.h', 'foo/foo')
would cause filterfiles('foo') to return nothing. This resolves
issue #294.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 22:45:29 -0700] rev 2484
remove duplicate code.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 22 Jun 2006 13:19:52 +0900] rev 2483
Fixed conditional include of stdint.h for windows/msvc6/python2.3 environment.
andrea@suse.de [Thu, 22 Jun 2006 02:44:39 +0200] rev 2482
Fix hg diff regression
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 17:55:11 -0700] rev 2481
add tests for push over http.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 17:30:31 -0700] rev 2480
fix -I/-X when relative paths used or in subdir
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 17:09:29 -0700] rev 2479
hg.repository: many routines expect path to be a string even if empty.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 16:20:21 -0700] rev 2478
fix bug in localrepo.changes.
caused by 1e32e2fe8a677c391049d40b8794478976a0a914.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 15:31:23 -0700] rev 2477
use commit time as mtime for file archives.
now output from two run of "hg archive -t zip" is same.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 15:15:06 -0700] rev 2476
archive: make "hg archive -t XXX -" to write to stdout
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 09:32:31 -0700] rev 2475
merge with crew.
Chris Mason <mason@suse.com> [Wed, 21 Jun 2006 09:28:48 -0700] rev 2474
Fix cold cache diff performance
cold cache diff performance has regressed in two ways. localrepo.changes
has optimizations for diffing against the working dir parent that expect
node1 to be None. commands.revpair() usage means that commands.dodiff()
never sends node1 == None. This is fixed in localrepo.changes by checking
against the dirstate parents.
In the non-dirstate parents case, localrepo.changes does a loop comparing
files without first sorting the file names, leading to random access
across the disk.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 09:15:42 -0700] rev 2473
change some repo messages in small ways.
move "pushing" and "pulling" after repo create so error message and exit
happens before messages printed.
fix sshrepo parse error message.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 21 Jun 2006 09:14:36 -0700] rev 2472
make repo scheme table driven.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 23:58:45 -0700] rev 2471
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 23:58:21 -0700] rev 2470
use demandload more.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 18:39:52 -0700] rev 2469
hg.repository: make protocol table driven.
allows extensions to add new protocols.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 17:51:39 -0700] rev 2468
mac os x: fixes for 10.2 from chris monson <monpublic@gmail.com>
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 15:23:54 -0700] rev 2467
http client: better work with authorization errors, broken sockets.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 15:23:01 -0700] rev 2466
push over http: server side authorization support.
new hgrc entries allow_push, deny_push, push_ssl control push over http.
allow_push list controls push. if empty or not set, no user can push.
if "*", any user (incl. unauthenticated user) can push. if list of user
names, only authenticated users in list can push.
deny_push list examined before allow_push. if "*", no user can push.
if list of user names, no unauthenticated user can push, and no users
in list can push.
push_ssl requires https connection for push. default is true, so password
sniffing can not be done.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 15:17:28 -0700] rev 2465
push over http: client support.
stream bundle data using PUT request.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 15:16:50 -0700] rev 2464
push over http: server support.
write "unbundle" verb for http.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 15:14:12 -0700] rev 2463
localrepository.push: propagate return value
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 15:13:17 -0700] rev 2462
util: add limit to amount filechunkiter will read
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 20 Jun 2006 09:11:41 -0700] rev 2461
tidy up mtime patch of andrea, get back half of performance loss.
this makes diff < 3% slower than before.
andrea@suse.de [Tue, 20 Jun 2006 15:37:41 +0200] rev 2460
report correct mtime in the hg diff output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 19 Jun 2006 20:37:36 +0200] rev 2459
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 18 Jun 2006 19:10:48 +0200] rev 2458
change log message creation when using 'hg import'
if found cmdline is used
else if found patch header is used
else launch hgeditor
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 18 Jun 2006 21:15:01 -0700] rev 2457
merge emacs changes.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 18 Jun 2006 21:04:42 -0700] rev 2456
merge with crew.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 18 Jun 2006 04:13:33 +0900] rev 2455
Emacs: follow the revision usage policy of "hg diff" command.
This patche makes "parent" as default revision of diff command.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 18 Jun 2006 04:02:56 +0900] rev 2454
Emacs: change directory of output buffer to the root of the repository.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 18 Jun 2006 03:46:00 +0900] rev 2453
Emacs: use `default-directory' if `buffer-file-name' is null.
This patch allows you to co-operate with Mercurial in dired buffer.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 17 Jun 2006 00:06:28 +0900] rev 2452
Emacs: use delete-region instead of kill-* functions.
This patch eliminates `kill-line' which taints kill-ring,
and `kill-entire-line' which is specific for XEmacs.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 17 Jun 2006 18:36:04 +0200] rev 2451
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 17 Jun 2006 18:20:09 +0200] rev 2450
fix an undefined variable spotted by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 17 Jun 2006 18:15:48 +0200] rev 2449
fix unused variable warning from pychecker
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 16 Jun 2006 12:58:24 -0700] rev 2448
replace os.stat with os.lstat in some where.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 16 Jun 2006 10:19:45 -0700] rev 2447
httprepo: make "http://user:pass@host/" urls work
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 16 Jun 2006 10:02:59 -0700] rev 2446
httprepo: fix small bug in authentication.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 16 Jun 2006 08:52:28 -0700] rev 2445
merge with crew.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 16 Jun 2006 10:00:37 -0300] rev 2444
Update keepalive.py to current CVS version of urlgrabber.
This fixes a bug where the output of test-bad-pull would differ
between python 2.3 and 2.4. Also update the expected output of
this test.
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Fri, 16 Jun 2006 07:07:11 -0700] rev 2443
patchbomb does not handle email time stamp plattform independent
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 15 Jun 2006 17:07:30 -0700] rev 2442
http: query server for capabilities
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 15 Jun 2006 16:41:49 -0700] rev 2441
remove use of undefined variable.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 15 Jun 2006 16:38:23 -0700] rev 2440
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 15 Jun 2006 16:37:23 -0700] rev 2439
extend network protocol to stop clients from locking servers
now all repositories have capabilities slot, tuple with list of names.
if 'unbundle' capability present, repo supports push where client does
not need to lock server. repository classes that have unbundle capability
also have unbundle method.
implemented for ssh now, will be base for push over http.
unbundle protocol acts this way. server tells client what heads it
has during normal negotiate step. client starts unbundle by repeat
server's heads back to it. if server has new heads, abort immediately.
otherwise, transfer changes to server. once data transferred, server
locks and checks heads again. if heads same, changes can be added.
else someone else added heads, and server aborts.
if client wants to force server to add heads, sends special heads list of
'force'.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 15 Jun 2006 15:42:16 -0700] rev 2438
test-bad-pull: fix change in error output.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 15 Jun 2006 15:36:23 -0700] rev 2437
sshrepo: fix bug in error formatting.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 15 Jun 2006 13:27:57 -0700] rev 2436
hgweb: split "verbs" into methods.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 15 Jun 2006 12:57:59 -0700] rev 2435
http client: support persistent connections.
uses keepalive module from urlgrabber package. tested against "hg serve",
cgi server, and through http proxy. used ethereal to verify that only
one tcp connection used during entire "hg pull" sequence.
if server supports keepalive, this makes latency of "hg pull" much lower.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 15 Jun 2006 12:55:58 -0700] rev 2434
http server: support persistent connections.
only "hg serve" affected yet. http server running cgi script will not
use persistent connections. support for fastcgi will help that.
clients that support keepalive can use one tcp connection for all
commands during clone and pull. this makes latency of binary search
during pull much lower over wan.
if server does not know content-length, it will force connection to
close at end. right fix is to use chunked transfer-encoding but this is
easier and does not hurt performance. only command that is affected is
"changegroup" which is always last command during a pull.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 14 Jun 2006 15:41:37 -0700] rev 2433
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 14 Jun 2006 15:41:06 -0700] rev 2432
move hgk.py into hgext. now to enable "hg view" is one less step.
edit ~/.hgrc:
[extensions]
hgext.hgk =
cp contrib/hgk ~/bin
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 14 Jun 2006 21:53:42 +0200] rev 2431
replace old-http:// syntax by static-http:// and deprecate the redundant hg://
"Daniel Santa Cruz <byteshack@gmail.com>" [Wed, 14 Jun 2006 18:27:30 +0000] rev 2430
Add web.contact to the hgrc documentation.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 13 Jun 2006 14:56:01 -0700] rev 2429
dirstate: fix call to os.lstat when st is None
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 13 Jun 2006 08:56:23 -0700] rev 2428
honor signals during load of extensions.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 12 Jun 2006 22:09:50 -0700] rev 2427
dirstate.read: make 15% faster.
time to read dirstate for my kernel repo goes from 0.22s to 0.18s.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 12 Jun 2006 09:36:44 -0700] rev 2426
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 12 Jun 2006 09:36:23 -0700] rev 2425
dirstate: speed up inner loop of read.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 10 Jun 2006 17:39:29 +0200] rev 2424
Report on push/pull if heads are merged, too, like for new heads.
Use case: If a remote repo has two heads and I _want_ to merge them, I merge
and push. Meanwhile someone else pushed on top of one of the heads. He won't
get a warning, because he doesn't create a new head, I won't notice that I
don't close a head, because I don't get a message telling me.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 10 Jun 2006 11:28:40 +0200] rev 2423
merge with upstream
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 09 Jun 2006 12:05:17 -0700] rev 2422
add --lsprof option. 3x faster than --profile, more useful output.
results include calls to c code and nested calls.
requires python 2.5 or lsprof installed from svn at
http://codespeak.net/svn/user/arigo/hack/misc/lsprof/
Matt Mackall <mpm@selenic.com> [Fri, 09 Jun 2006 18:03:35 -0500] rev 2421
ssh: add capability detection at startup
Because older servers don't return any output for unknown commands,
it's tricky to add new commands. The approach is this: we add a
"hello" command that reports any interesting capabilities (and other
things that might be of interest in the future). To detect whether
this new command is supported, we issue both it and our startup
detection command ("between") at the beginning of a connection.
Matt Mackall <mpm@selenic.com> [Fri, 09 Jun 2006 17:48:14 -0500] rev 2420
ssh: gather initial output so we can do capability detection
Matt Mackall <mpm@selenic.com> [Fri, 09 Jun 2006 17:47:38 -0500] rev 2419
Initial implementation of hello command for ssh
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 09 Jun 2006 09:14:52 -0700] rev 2418
update test-help output after new options.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 09 Jun 2006 09:14:30 -0700] rev 2417
copy: fix introduced bug.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 09 Jun 2006 09:09:17 -0700] rev 2416
make description of -n option better.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 09 Jun 2006 09:06:40 -0700] rev 2415
revert: add -n/--dry-run option
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 09 Jun 2006 09:00:08 -0700] rev 2414
remove: add -n/--dry-run option
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 09 Jun 2006 08:48:30 -0700] rev 2413
copy: add -n/--dry-run option
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 09 Jun 2006 08:42:36 -0700] rev 2412
addremove: add -n/--dry-run option
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 09 Jun 2006 08:40:06 -0700] rev 2411
add: add -n/--dry-run option
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 08 Jun 2006 11:28:27 -0700] rev 2410
debugconfig: allow to print by section and exact item name
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 08 Jun 2006 15:06:31 +0200] rev 2409
Fix diff header (line endings) for failed test output in run-tests.py.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 08 Jun 2006 14:56:40 +0200] rev 2408
Don't run tests with dots in their name (e.g. test-foo.orig)
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 07 Jun 2006 13:16:25 -0700] rev 2407
revert: better fix for not printing 'reverting' message
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 07 Jun 2006 10:33:26 -0700] rev 2406
revert: check for changes against target rev
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 07 Jun 2006 18:33:15 +0200] rev 2405
pick a non-conflicting module name when loading an extension
prefix the module name by 'hgext_' so that it doesn't conflict
with any core python module (for example bisect -> hgext_bisect)
fix issue271
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 05 Jun 2006 16:48:24 +0200] rev 2404
Fixed 'hg serve --webdir-conf foo' which broke due to split of hgweb.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 05 Jun 2006 12:24:00 +0200] rev 2403
Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names).
Eung-Ju PARK <eungju@gmail.com> [Fri, 02 Jun 2006 16:19:47 +0900] rev 2402
packagescan can't scan nested packages
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 04 Jun 2006 17:08:02 -0700] rev 2401
move purge extension out of hgext.
it is not as clean as other modules in hgext.
can move back after rewrite.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 04 Jun 2006 16:47:46 -0700] rev 2400
import: allow to import stdin with file name "-"
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 04 Jun 2006 10:32:13 -0700] rev 2399
fix comment.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 04 Jun 2006 10:30:46 -0700] rev 2398
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 04 Jun 2006 10:29:34 -0700] rev 2397
merge change to ssh protocol.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 04 Jun 2006 10:26:05 -0700] rev 2396
refactor ssh server.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 04 Jun 2006 17:46:33 +0200] rev 2395
remove appendfile for the manifest when adding a changegroup
Since the changelog is using appendfile, the manifest entries cannot
be referenced, so we don't need to use append file for the manifest.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 04 Jun 2006 12:19:51 +0200] rev 2394
hgweb: fix errors and warnings found by pychecker
- fix missing import
- use type_ instead of type
- remove unused variable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 04 Jun 2006 02:25:27 +0200] rev 2393
dirstate: refactor the dirstate binary format, remove magic numbers
Eric Hopper <hopper@omnifarious.org> [Fri, 02 Jun 2006 08:25:02 -0700] rev 2392
Adjusting hgweb splitup to be a little cleaner.
Eric Hopper <hopper@omnifarious.org> [Fri, 02 Jun 2006 08:05:01 -0700] rev 2391
Fixing up comment headers for split up code.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 01 Jun 2006 15:55:09 -0700] rev 2390
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 01 Jun 2006 15:54:54 -0700] rev 2389
merge with crew.
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Thu, 01 Jun 2006 15:54:31 -0700] rev 2388
Cleanup: unifiy the coding style in the ui.py configitems forwarders.
No functional changes.
Markus F.X.J. Oberhumer <markus@oberhumer.com> [Thu, 01 Jun 2006 15:53:43 -0700] rev 2387
Expand '~' in path to extensions.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 01 Jun 2006 13:47:34 -0700] rev 2386
merge with crew.
Marco Barisione <marco@barisione.org> [Mon, 22 May 2006 16:47:40 +0200] rev 2385
The line used to ignore the setup file for win32 is a regexp but it was after a "syntax: glob"
Marco Barisione <marco@barisione.org> [Mon, 22 May 2006 14:12:41 +0200] rev 2384
Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org> [Mon, 22 May 2006 14:06:12 +0200] rev 2383
Ignore the .exe setup file for Windows
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 02 Jun 2006 00:33:42 +0200] rev 2382
Make indentation of purge's cmdtable match to mercurial/commands.py
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 02 Jun 2006 00:28:28 +0200] rev 2381
Rewritten install instructions for hg-purge to match new situation, fixed typos.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Jun 2006 23:58:43 +0200] rev 2380
Merged hg-purge
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Jun 2006 23:58:06 +0200] rev 2379
Reorganized files in hg-purge repo to push them into Mercurial.
README -> hgext/purge/README
purge.py -> hgext/purge/__init__.py
removed COPYING.GPL and .hgignore (already in the Mercurial repo)
Marco Barisione <marco@barisione.org> [Fri, 26 May 2006 13:13:39 +0200] rev 2378
Removed --nothing, added --print and --print0
Marco Barisione <marco@barisione.org> [Tue, 16 May 2006 22:36:31 +0200] rev 2377
The meaning of the directories on the command line is now explained correctly
Marco Barisione <marco@barisione.org> [Tue, 16 May 2006 22:00:38 +0200] rev 2376
Marked strings for translation
Marco Barisione <marco@barisione.org> [Tue, 16 May 2006 21:43:21 +0200] rev 2375
Added some comments
demian@gaudron.lan [Tue, 16 May 2006 21:05:00 +0200] rev 2374
Even on Windows self._repo.dirstate.state() wants '/' in paths
demian@gaudron.lan [Tue, 16 May 2006 21:03:07 +0200] rev 2373
Some functions were called as globals (i.e. I forgot some "self.")
demian@gaudron.lan [Tue, 16 May 2006 18:55:22 +0200] rev 2372
Changset de893ad6bd17 wrongly reversed the meaning of --nothing
demian@gaudron.lan [Tue, 16 May 2006 14:54:34 +0200] rev 2371
Use self._ui.note(...) instead of if self._ui.verbose: self._ui.status(...)
demian@gaudron.lan [Tue, 16 May 2006 13:40:45 +0200] rev 2370
Command line options are read in a saner way
demian@gaudron.lan [Tue, 16 May 2006 13:37:48 +0200] rev 2369
Purge.from_command is now a function called purge
demian@gaudron.lan [Sat, 13 May 2006 14:57:16 +0200] rev 2368
Added a link to the home page of hg purge
demian@gaudron.lan [Sat, 13 May 2006 14:36:03 +0200] rev 2367
Added a link to the page for CVS utilities
demian@gaudron.lan [Sat, 13 May 2006 14:24:18 +0200] rev 2366
Added some lines on the requirements for purge
demian@gaudron.lan [Sat, 13 May 2006 14:12:13 +0200] rev 2365
Added an explanation on how to enable the extension in "~/.hgrc"
demian@gaudron.lan [Fri, 12 May 2006 20:26:19 +0200] rev 2364
Initial commit
Matt Mackall <mpm@selenic.com> [Sun, 04 Jun 2006 18:05:52 +0100] rev 2363
Give a response to unknown SSH commands
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Jun 2006 19:08:29 +0200] rev 2362
Renamed localrepo.undo() to rollback() and talk about "rollback information".
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Jun 2006 18:36:32 +0200] rev 2361
Fix automatic decompression of tarballs with Firefox.
The encoding was set to gzip/bzip2, so Firefox (correctly) assumed, that this
has to be "decoded" (i.e. decompressed).
TK Soh <teekaysoh@yahoo.com> [Thu, 01 Jun 2006 09:14:27 -0500] rev 2360
hgweb: fix tracebacks on both index and repo pages
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Jun 2006 17:51:40 +0200] rev 2359
Allow comma to separate types in allow_archive, too. Use longer variable name.
TK Soh <teekaysoh@yahoo.com> [Thu, 01 Jun 2006 10:02:24 -0500] rev 2358
hgweb: add allow_archive support to [web] section of hgrc
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 31 May 2006 14:16:21 -0700] rev 2357
merge with crew.
Eric Hopper <hopper@omnifarious.org> [Wed, 31 May 2006 10:42:44 -0700] rev 2356
Final stage of the hgweb split up.
hgweb and hgwebdir now have their own modules.
Eric Hopper <hopper@omnifarious.org> [Wed, 31 May 2006 08:03:29 -0700] rev 2355
Splitting up hgweb so it's easier to change.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 May 2006 22:25:20 +0200] rev 2354
Manifest groups may be empty, so don't abort in this case (fixes issue210).
Only abort on empty changelog and file revlogs.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 31 May 2006 19:41:01 +0200] rev 2353
Pass filename to decoder for 'hg archive' (fixes issue267)
Despite writing to a file descriptor, the check in the
[decode] section needs a filename.
localrepo.wwrite() still writes to the file descriptor.
TK Soh <teekaysoh@yahoo.com> [Mon, 29 May 2006 16:46:31 +0800] rev 2352
various fixes to darcs conversion script
1. removed files were missed
2. hidden files in top directory were not added/removed correctly
3. suppressed spurious warning on adding new files.
4. hg changeset now checked in with original author and date
5. __file__ not supported by pdb.py
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 27 May 2006 20:45:22 -0700] rev 2351
contrib: move hg-menu.vim into contrib/vim directory
Manpreet Singh <junkblocker@yahoo.com> [Sat, 27 May 2006 20:44:53 -0700] rev 2350
contrib: patch review plugin for vim 7.0
The plugin takes an 'hg export'ed patch (in fact any
single or multi file patch) and opens multiple tabs
containing vim diff/merge windows for each affected
file in the patch allowing full visual code reviews.
Sébastien Pierre <sebastien@xprima.com> [Sat, 27 May 2006 15:04:40 -0700] rev 2349
darcs2hg.py: import darcs project into mercurial
For now, the tags are not taken into account (so you have to reenter
the tags by hand)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 May 2006 22:17:43 +0200] rev 2348
better ui for the bisect extension
(and update to i18n)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 24 May 2006 10:59:30 +0200] rev 2347
use a more reliable way to find what are the new changesets on pull/unbundle
The number of csets and the hooks where wrong (negative number of csets) when
we unbundled a bundle which contains csets we already had.
Remove unused variables.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 24 May 2006 09:27:16 +0200] rev 2346
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 24 May 2006 01:01:39 +0200] rev 2345
n is always 'True', we can only stop the loop with the break statement
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 23 May 2006 14:58:30 -0700] rev 2344
add acl extension, to limit who can push to subdirs of central repo.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 23 May 2006 14:57:45 -0700] rev 2343
add ui.has_config method.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 23 May 2006 09:34:30 -0700] rev 2342
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 23 May 2006 09:33:09 -0700] rev 2341
contrib: add restricted shell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 23 May 2006 18:10:40 +0200] rev 2340
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 23 May 2006 10:44:40 +0200] rev 2339
document and fix findincoming
- add documentation about what the function does, notably
the fact that it updates 'base'
- transform the workflow to a more simple 'if elif elif else'
- do not call remote.branches if not necessary
- some nodes where missing in 'base' (from what I understand,
if the root of a branch is missing but one parent is present,
the parent should be in 'base')
- add a testcase for an incorrect outgoing that is fixed by
this cset
- add a testcase for an empty group bug, it needs fixing
"Daniel Santa Cruz <dansan@vikus.com>" [Mon, 22 May 2006 12:17:44 -0400] rev 2338
Minor typo change to reflect actual values used.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 22 May 2006 15:42:49 -0700] rev 2337
http: fix many problems with url parsing and auth. added proxy test.
problems fixed:
- https scheme handled properly for real and proxy urls.
- url of form "http://user:password@host:port/path" now ok.
- no-proxy check uses proper host names.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 22 May 2006 09:00:24 -0700] rev 2336
http: print better error if exception happens.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 22 May 2006 08:47:53 -0700] rev 2335
add ui.print_exc(), make all traceback printing central.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 21 May 2006 23:39:25 -0700] rev 2334
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 21 May 2006 23:39:07 -0700] rev 2333
new extension: extdiff. allows to use external diff program.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 21 May 2006 23:07:50 -0700] rev 2332
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 21 May 2006 23:07:19 -0700] rev 2331
diff: allow to use -rA:B syntax as well as -rA -rB
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 21 May 2006 22:14:11 -0700] rev 2330
add 'uisetup' function to extension module protocol.
if uisetup functin exists in extension, is called before cmdtable examined.
called with ui object as parameter. lets module modify cmdtable before
commands.py sees it.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 20 May 2006 12:52:02 -0700] rev 2329
notify: add debug output. do not fail if no config file.
use --debug to see debug output.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 20 May 2006 15:34:19 -0300] rev 2328
hgweb.manifest: revno of manifest and changelog aren't always the same
In the v4l-dvb repo, the manifest revno and the changelog revno are not
in sync. This happened because the same patch was applied to the same
revision in two different branches, resulting in the same manifest text,
with the same parents and so the first revision was reused.
Since hgweb.manifest was assuming the revnos of the manifest and of the
changelog were always the same, clicking on manifest -> bz2 in the
v4l-dvb site would download the wrong revision.
Use the linkrev to go from manifest revision to changelog revision.
This still won't be perfect since the page will still talk about
"manifest for changeset XYZ", where XYZ was the first changeset to have
this manifest, which is not necessarily the same changeset that the user
clicked to get to this page - but at least the contents will be the
same.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 19 May 2006 14:58:13 -0700] rev 2327
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 19 May 2006 14:57:45 -0700] rev 2326
notify: fix off by one error.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 19 May 2006 08:57:26 -0700] rev 2325
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 19 May 2006 08:57:12 -0700] rev 2324
merge with crew.
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Fri, 19 May 2006 08:54:28 -0700] rev 2323
setup.py: install packagescan before any mercurial modules is imported
Further the installation of packagescan over demandload is moved to the
packagescan module.
I added as well few more comments in the packagescan module to avoid
the wrong use of package scan in the future.
Reason:
mercurial.packagescan acts as fake mercurial.demandload during a py2exe
run. Unfortunatly the import of mercurial.version in setup.py is done
before mercurial.packagescan is installed. This results in few imports
without mercurial.packagescan in charge and therefore not all dependend
modules are detected when running mercurial.packagescan.getmodules
later e.g. winerror is missed.
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Fri, 19 May 2006 08:51:58 -0700] rev 2322
packagescan: handle demandload module naming changes.
Lee Cantey <lcantey@gmail.com> [Thu, 18 May 2006 11:48:03 -0700] rev 2321
Update configuration note with mercurial.ini change from Thomas
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 18 May 2006 23:31:12 -0700] rev 2320
fix parsing of tags. make parse errors useful. add new tag tests.
old code read every head of .hgtags. delete and recreate of .hgtags gave
new head, but if error in deleted rev, .hgtags had error messages every
time it was parsed. this was very hard to fix, because deleted revs hard
to get back and update, needed merges too.
new code reads .hgtags on every head. advantage is if parse error
happens with new code, is possible to fix them by editing .hgtags on a
head and committing.
NOTE: new code uses binary search of manifest of each head to be fast,
but still much slower than old code. best thing would be to have delete
record stored in filelog so we never touch manifest. could find live
heads directly from filelog. this is more work than i want now.
new tests check for parse of tags on different heads, and inaccessible
heads created by delete and recreate of .hgtags.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 18 May 2006 23:02:24 -0700] rev 2319
test-globalopts: make sed expression better.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 18 May 2006 22:52:19 -0700] rev 2318
If HOME is defined on Windows, Mercurial uses it. Document this.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 18 May 2006 22:46:27 -0700] rev 2317
merge emacs patches.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 18 May 2006 22:44:36 -0700] rev 2316
Emacs: separate limitations of revision range and shown changesets.
For revision range limitation,
use "-r" opt with range notation at "hg log" invocation, and
use hg-rev-completion-limit as default value.
For shown changesets limitation,
use "-l" opt at "hg log" invocation, and
use hg-log-limit as default value.
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 18 May 2006 22:43:09 -0700] rev 2315
Emacs: adapt read-file-name invocation for (non-X)Emacs 21.4.
this patch deters hg-read-file-name from passing hg-file-history to
read-file-name as 6th parameter in non-X Emacs environment.
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Thu, 18 May 2006 22:35:41 -0700] rev 2314
Remove quotes from patch command.
When the gpatch fix for solaris was introduced in 67a0a3852024 the
patch command was "". For some strange reason windows 2000 is
not happy with those quotes when given in os.popen.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 19 May 2006 06:10:59 +0200] rev 2313
Fixed typo (qshell instead of shell) in win98 code (see issue244).
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 18 May 2006 16:49:45 -0700] rev 2312
merge with crew.
Eric Hopper <hopper@omnifarious.org> [Thu, 18 May 2006 11:48:33 -0700] rev 2311
Moving hgweb.py into it's own module in preparation for breaking it up.
John Arbash Meinel <john@arbash-meinel.com> [Thu, 18 May 2006 13:52:55 -0700] rev 2310
demandload: implement __call__
demandload can now load functions and classes, and not just modules.
(So if you access foo() rather than just foo.* it still works).
demandload still doesn't work for constants.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 18 May 2006 13:48:12 -0700] rev 2309
remove: rewrite to be ~400x faster, bit more friendly
old remove code called localrepo.changes for each file.
was very expensive:
$ hg --time rm arch>/dev/null
Time: real 1066.120 secs (user 1014.450+0.000 sys 18.090+0.000)
new code, same files:
$ hg --time rm arch>/dev/null
Time: real 2.770 secs (user 2.190+0.000 sys 0.580+0.000)
also mention "-f" if not removing files. also allow "-f" to forget
added files.
make test a bit better.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 May 2006 21:01:38 +0200] rev 2308
Use platform path for renaming file in util.atomictempfile.rename()
Lee Cantey <lcantey@gmail.com> [Thu, 18 May 2006 10:09:16 -0700] rev 2307
Add section for configuration notes with initial note about the default editor
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 18 May 2006 09:23:43 -0700] rev 2306
bugzilla: allow to map between committer email and bugzilla user name.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 May 2006 08:03:51 +0200] rev 2305
Removed extra space in bisect output.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 17 May 2006 21:52:51 +0200] rev 2304
Merge with main
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 17 May 2006 19:59:15 +0200] rev 2303
Corrected tests for commit now consistently stripping last newline.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 17 May 2006 19:58:22 +0200] rev 2302
Corrected test for date in output of 'hg export'.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 17 May 2006 19:38:41 +0200] rev 2301
Strip empty lines and trailing spaces around commit messages.
Fixes issue213 and part of issue249 (trying to keep node id on import)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 17 May 2006 19:00:16 +0200] rev 2300
Use "# Date" instead of "# Timestamp" for dated export/import of patches.
And don't break up list for % formatting.
Danek Duvall <danek.duvall@sun.com> [Wed, 17 May 2006 18:54:30 +0200] rev 2299
Add timestamp field to export format. Make import and mq use it.
Matt Mackall <mpm@selenic.com> [Wed, 17 May 2006 13:21:36 -0500] rev 2298
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 17 May 2006 14:46:12 +0200] rev 2297
Fix hg view if author's name contains unmatched quotes. (issue248)
This was caused by the often seen Tcl list vs. string programming error.
"Aurelien Jacobs <aurel@gnuage.org>" [Tue, 16 May 2006 14:17:45 -0700] rev 2296
notify changeset diff should be against current node instead of tip
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 16 May 2006 11:07:56 +0200] rev 2295
fix a typo in an error message
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 16 May 2006 09:35:38 +0200] rev 2294
Catch urllib's HTTPException and give a meaningful error message to the user.
Usually urllib only throws HTTPError exceptions, which already are a subclass
of IOError.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 15 May 2006 11:16:32 -0700] rev 2293
add --config global option. allows to set hgrc option on command line.
syntax: --config section.name=value
also add new test-globalopts to test all global options in one place.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 15 May 2006 10:25:17 -0700] rev 2292
allow to send email using sendmail.
default is still smtp.
update hgrc doc with sendmail info.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 15 May 2006 09:27:27 -0700] rev 2291
merge with crew.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 14 May 2006 18:37:50 -0300] rev 2290
add test for revlog.parseindex
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 14 May 2006 18:22:12 -0300] rev 2289
Fix revlog.parseindex
parseindex could fail if read returns too little data in the right
moment (e.g. when there's still leftover data from the previous
iteration and read returns less than "s" bytes).
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 15 May 2006 09:13:00 -0700] rev 2288
remove non-prefixed environment variables from hooks.
Samuel Masham <samuel.masham@gmail.com> [Mon, 15 May 2006 08:53:32 -0700] rev 2287
Update debugindexdot to work with RevlogNG.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 15 May 2006 08:47:42 -0700] rev 2286
do not set smtp host by default - raise error instead
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Sun, 14 May 2006 23:49:31 -0700] rev 2285
win98: fall back to win32api.GetModuleFileName if needed.
Volker Kleinfeld <Volker.Kleinfeld@gmx.de> [Sun, 14 May 2006 23:44:50 -0700] rev 2284
On win98 os.path.expanuser('~') does not result in a useable directory.
The MSDN recommendation for user specific directories is the use of
shell.ShGetSpecialFolder, so use it.
For details see:
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/functions/shgetspecialfolderpath.asp
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 14 May 2006 21:07:34 -0700] rev 2283
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 14 May 2006 17:37:34 -0700] rev 2282
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 14 May 2006 17:37:17 -0700] rev 2281
prompt user for http authentication info
in interactive mode, mercurial now asks the user for the username and
password when the server requires it. the previous behavior was to fail
with an http 401.
based on patch from eric jaffe <jaffe.eric@gmail.com>.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 14 May 2006 18:24:32 +0200] rev 2280
On Windows look for mercurial.ini in $USERPROFILE, too, if available
as os.path.expanduser('~') does not always yield a useful directory.
Based on a patch from Edouard Gomez <ed.gomez@free.fr>
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 13 May 2006 23:00:46 -0700] rev 2279
merge with crew.
Manpreet Singh <junkblocker@yahoo.com> [Sat, 13 May 2006 23:00:05 -0700] rev 2278
Make hg status work for repositories in root directory on windows (issue 228)
Daniel <byteshack@gmail.com> [Sat, 13 May 2006 20:41:53 +0200] rev 2277
Add more specific documentation about defaults for the [paths] section
of the hgrc(5) document.
Lee Cantey <lcantey@gmail.com> [Fri, 12 May 2006 21:25:58 -0700] rev 2276
Update Windows release notes and install script for v0.9
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 12 May 2006 21:25:07 -0700] rev 2275
Fix hgweb.filediff
The third argument to hgweb.diff should be a list, not a string.
This fixes a bug found by xorAxAx, where hgweb would also show the diff
for "README" when you ask for the diff for "Demo/cgi/README".
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 12 May 2006 18:39:37 +0200] rev 2274
tests for bundles and bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 12 May 2006 18:38:56 +0200] rev 2273
add support for compressed bundle repositories
we simply create a uncompressed bundle in a tempfile
in .hg
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 11 May 2006 22:10:47 -0700] rev 2272
revert: fix corner case found by faheem mitha.
if file not in dest manifest, remove only if in source manifest.
Manpreet Singh <junkblocker@yahoo.com> [Thu, 11 May 2006 21:55:15 -0700] rev 2271
Make it possible to use the root directory as the root of a repository.
Danek Duvall <danek.duvall@sun.com> [Thu, 11 May 2006 18:24:58 -0700] rev 2270
Fix issue240: mq: qpush fails on Solaris
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 11 May 2006 14:46:24 -0700] rev 2269
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 11 May 2006 14:41:52 -0700] rev 2268
fix coding style of backout editor change.
john.levon@sun.com [Thu, 11 May 2006 14:32:09 -0700] rev 2267
Force editor to appear for an 'hg backout' if a message or logfile aren't
supplied. Pre-fill the commit message with the changeset being backed out.
Fixes bug 238.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 11 May 2006 10:14:48 -0700] rev 2266
hooks: add preupdate and update hooks.
preupdate run before working dir updated. can prevent update.
update run after working dir updated.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 11 May 2006 09:44:11 -0700] rev 2265
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 11 May 2006 09:43:50 -0700] rev 2264
localrepo.update: abort if outstanding merges, instead of warn/return 1
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 11 May 2006 09:01:32 -0700] rev 2263
make reason for sys.argv change obvious in code.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 11 May 2006 08:48:52 -0700] rev 2262
merge with crew.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 11 May 2006 08:48:36 -0700] rev 2261
Check existance of sys.argv for the use from mod_python.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 May 2006 16:19:44 +0200] rev 2260
add tests for incoming and outgoing
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 May 2006 15:01:30 +0200] rev 2259
fix a traceback when unbundling does not add any changesets
only run the hooks when some changesets has been added
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 May 2006 14:06:18 +0200] rev 2258
catch KeyboardInterrupt in run-tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 May 2006 11:24:28 +0200] rev 2257
indent: fix alignment
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 11 May 2006 11:15:23 +0200] rev 2256
fix errors spotted by pychecker (mostly scope problems)
mason@suse.com [Wed, 10 May 2006 15:26:56 -0700] rev 2255
Reduce ram used for very large inlined index files
During a clone, an inline index is not converted to a split index
file until the very end. When the conversion happens, the index
can be very large, and the inline index loading functions always load
the entire index file into ram.
This changes the revlog code to read the index in smaller chunks.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 10 May 2006 15:24:26 -0700] rev 2254
backout command: better help.
Matt Mackall <mpm@selenic.com> [Wed, 10 May 2006 17:05:43 -0500] rev 2253
Added signature for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37
Matt Mackall <mpm@selenic.com> [Wed, 10 May 2006 16:55:55 -0500] rev 2252
Added tag 0.9 for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 10 May 2006 13:39:12 -0700] rev 2251
fix speed regression in mdiff caused by line split bugfix.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 10 May 2006 11:10:18 -0700] rev 2250
windows: revlog.lazyparser not always safe to use.
can not use on windows < nt or if win32 api not available.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 10 May 2006 10:32:24 -0700] rev 2249
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 10 May 2006 10:31:54 -0700] rev 2248
fix diffs containing embedded "\r".
add test to make sure fix stays fixed.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 10 May 2006 10:31:22 -0700] rev 2247
run-tests.py: fix handling of newlines.
old code could not handle embedded "\r" or files that ended without newline.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 10 May 2006 10:07:53 -0700] rev 2246
run-tests.py: print diff if reference output not existing.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 May 2006 19:23:19 +0200] rev 2245
Added -A as an alias for --after to hg remove, like for other commands.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 10 May 2006 18:53:32 +0200] rev 2244
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
Christian Boos <cboos@neuf.fr> [Wed, 10 May 2006 11:53:56 +0200] rev 2243
The posixfile implemented using the win32 API should be iterable.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 May 2006 20:56:57 -0700] rev 2242
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 09 May 2006 20:56:13 -0700] rev 2241
hide deprecated undo command by making it an alias for debugundo.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 09 May 2006 14:40:13 -0700] rev 2240
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 09 May 2006 14:39:56 -0700] rev 2239
bugzilla hook: skip empty groups.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 09 May 2006 13:29:55 -0700] rev 2238
undo: add "deprecated" message to output.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 09 May 2006 11:12:45 -0700] rev 2237
reduce memory used by util.opener when making a temp copy of a file.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 09 May 2006 11:08:06 -0700] rev 2236
reduce memory used when appendfile appends to real file.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 May 2006 18:03:15 +0200] rev 2235
New make targets:
local: build extensions inplace (the former "all" target")
all: "local" (for people who expect this) and build everything else
install: install pre-built things (so root doesn't have to write to $HOME)
install-home: use setup.py's --home option instead of --prefix
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 May 2006 17:21:53 +0200] rev 2234
New make target "dist-notests" to create tarballs without running tests first.
wilde@trapperkeeper.sha-bang.de [Tue, 09 May 2006 17:05:49 +0200] rev 2233
Added install target.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 May 2006 17:03:00 +0200] rev 2232
Always remove appendopener tmp files (fixes issue235).
test-hup triggered this bug by killing "hg serve --stdio".
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 09 May 2006 13:26:16 +0200] rev 2231
gpg extension: Always remove temporary files created by 'hg sigcheck'.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 16:50:27 -0700] rev 2230
localrepository.addchangegroup: add more source infos to hooks
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 16:07:56 -0700] rev 2229
changegroup hooks: add source to hook parameters
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 14:20:37 -0700] rev 2228
merge with mainline.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 14:19:05 -0700] rev 2227
deprecate undo command, replace with rollback command.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 14:18:19 -0700] rev 2226
fix test-help output.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 12:27:30 -0700] rev 2225
notify: add 'to' header to message.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 11:16:09 -0700] rev 2224
notify extension: generate right number of diffs
Matt Mackall <mpm@selenic.com> [Mon, 08 May 2006 14:32:43 -0500] rev 2223
Update tests for revlogng
mason@suse.com [Mon, 08 May 2006 14:26:18 -0500] rev 2222
Use revlogng and inlined data files by default
This changes revlog specify revlogng by default. Inlined
data files are also used unless a flags option is found in the .hgrc.
Some example hgrc files:
[revlog]
# use the original revlog format
format=0
[revlog]
# use revlogng. Because no flags are included, inlined data files
# also be selected
format=1
[revlog]
# use revlogng but do not inline the data files with the index
flags=
[revlog]
# the new default
format=1
flags=inline
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 10:59:58 -0700] rev 2221
reverse sense of return value from python hooks.
old scheme (False/None/0/'' == fail) made coding style
unnatural, did not allow use of mercurial commands as hooks.
new scheme (False/None/0 == pass) is pythonic, does not require peculiar
"return True" at ends of hooks, allows hooks like this:
[hooks]
# update working dir after push into this repo
changegroup.update = python:mercurial.commands.update
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 08:20:56 -0700] rev 2220
add filename to IOError if read of file fails.
if file replaced with directory or symlink, IOError not fully filled out.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 08 May 2006 08:04:46 -0700] rev 2219
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 03 May 2006 14:56:07 -0700] rev 2218
only import mysql module if hook used.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 06 May 2006 16:43:16 +0200] rev 2217
Fixed tests for changed help output
Lee Cantey <lcantey@gmail.com> [Fri, 05 May 2006 22:13:56 -0700] rev 2216
Update release notes and copyright year for Windows installer.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 05 May 2006 11:07:29 -0700] rev 2215
revert: remove word "modified" from description.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 05 May 2006 10:45:08 -0700] rev 2214
make test-confused-revert check working dir with two parents.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 05 May 2006 10:41:38 -0700] rev 2213
run-tests.py must print changed test output no matter what exit code is.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 05 May 2006 10:31:03 -0700] rev 2212
revert: require explicit revision when working dir has two parents.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 22:38:14 -0700] rev 2211
document [extensions] in doc/hgrc.5.txt.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 22:23:18 -0700] rev 2210
add tests/coverage.py to MANIFEST.in.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 22:20:02 -0700] rev 2209
document hgignore syntax in new file doc/hgignore.5.txt.
fix issue 162.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 21:44:09 -0700] rev 2208
update README.
fix issue 225.
do not use deprecated commands in examples.
Stephen Darnell <stephen@darnell.plus.com> [Thu, 04 May 2006 15:47:18 -0700] rev 2207
Delete the shell version of run-tests
Use the python version instead
Stephen Darnell <stephen@darnell.plus.com> [Thu, 04 May 2006 15:42:14 -0700] rev 2206
Use text rather than binary mode for editing commit messages
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 15:25:24 -0700] rev 2205
update test-help.out after fixing revert docs.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 15:23:58 -0700] rev 2204
fix doc comments for revert command. people found them confusing.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 15:07:35 -0700] rev 2203
add email notification hook. hook written in python.
email headers and body can be customized using template code.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 14:45:57 -0700] rev 2202
make templater.stringio a tiny bit more use.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 04 May 2006 12:25:10 -0700] rev 2201
patch queue: notify.patch
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 12:23:01 -0700] rev 2200
move mail sending code into core, so extensions can share it.
document hgrc settings used.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 12:02:32 -0700] rev 2199
move stringio class from bugzilla extension into templater module.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 12:00:45 -0700] rev 2198
rename [patchbomb] section to [email] section in hgrc. old name still ok.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 04 May 2006 11:32:00 -0700] rev 2197
define standard name for base url to use when printing hgweb urls.
useful for bugzilla integration, email notifications, other stuffs.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 04 May 2006 14:05:44 +0200] rev 2196
merge with crew
TK Soh <teekaysoh@yahoo.com> [Thu, 04 May 2006 14:01:55 +0200] rev 2195
gitweb: strip leading & trailing blank lines in changeset description
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 03 May 2006 22:47:57 -0700] rev 2194
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 03 May 2006 22:47:08 -0700] rev 2193
add util.samestat function for windows.
windows does not have os.path.samestat, and stat().st_ino is always zero,
so util.samestat always returns false on windows.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 03 May 2006 14:40:39 -0700] rev 2192
add bugzilla integration hook. example of writing hook in python.
hook updates bugzilla bugs when it sees commit comments that mention
bug id, such as "i fixed bug 77".
only bugzilla 2.16 supported yet, but easy to extend. bugzilla versions
have different schema, i have not used later than 2.16.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 03 May 2006 14:35:17 -0700] rev 2191
make templater bit more flexible and efficient for external users.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 03 May 2006 11:00:24 -0700] rev 2190
fix minor bugs in localrepo.hook.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 03 May 2006 10:25:28 -0700] rev 2189
move changeset_templater into templater module.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 03 May 2006 13:12:34 +0200] rev 2188
merge with crew
TK Soh <teekaysoh@yahoo.com> [Wed, 03 May 2006 11:25:36 +0200] rev 2187
tests: support older version of bunzip2 and, possibly, gunzip too
TK Soh <teekaysoh@yahoo.com> [Wed, 03 May 2006 11:25:25 +0200] rev 2186
tests: fix compatibility on Solaris
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 May 2006 11:57:14 +0200] rev 2185
Better help for mq: Corrected synopses, get qcommit options from commands.py.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 May 2006 10:53:51 +0200] rev 2184
Add debugaddremove alias to addremove, so it doesn't show up in 'hg help'.
Add an explicit description of 'hg commit --addremove'.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 May 2006 10:45:20 +0200] rev 2183
Always clean the build directory before installing for running the tests.
Otherwise tests might run an old version, when e.g. commands.py.orig is
moved back after a revert (old timestamp).
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 May 2006 10:18:52 +0200] rev 2182
Corrected test output for deprecated addremove command.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 02 May 2006 21:50:53 -0700] rev 2181
deprecate addremove command.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 02 May 2006 21:45:53 -0700] rev 2180
make test-remove check some more cases.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 02 May 2006 21:44:24 -0700] rev 2179
add --after option to remove command.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 02 May 2006 14:38:32 -0700] rev 2178
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 02 May 2006 14:37:55 -0700] rev 2177
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 02 May 2006 14:30:00 -0700] rev 2176
fix file handling bugs on windows.
add util.posixfile class that has posix semantics on windows.
fix util.rename so it works with stupid windows delete semantics.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 02 May 2006 18:44:02 +0200] rev 2175
Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
with the exception of backout --merge)
Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved
Inform the user what to do after a merge:
(branch merge, don't forget to commit)
Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
hg update -C X
hg merge Y
Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 01 May 2006 19:17:34 +0200] rev 2174
If default sorting is name, offer name-descending with one click.
Additionally no longer ignore case when sorting by name to match default
sorting. This makes e.g. a repository "FOO" being listed before "bar".
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 01 May 2006 18:38:25 +0200] rev 2173
Make hgwebdir columns sortable.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 01 May 2006 10:04:25 +0200] rev 2172
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 01 May 2006 10:02:17 +0200] rev 2171
Add download links to hgwebdir index page for allowed archive types.
Based on a patch by Colin McMillen <mcmillen@cs.cmu.edu>
Colin McMillen <mcmillen@cs.cmu.edu> [Mon, 01 May 2006 09:01:59 +0200] rev 2170
Add archive download links to tip on main changeset list page
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 30 Apr 2006 22:46:54 +0200] rev 2169
Combine catching exceptions added in dd4ec4576cc8 in one except statement.
Colin McMillen <mcmillen@cs.cmu.edu> [Sun, 30 Apr 2006 22:43:41 +0200] rev 2168
Proper check to see if zip dest needs to be wrapped in tellable
From hgweb, calling archival.zipit fails with the error message
"Illegal seek". This happens because sys.stdout.tell() throws an
exception:
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/mercurial/archival.py", line 99, in addfile
self.z.writestr(i, data)
File "/usr/lib/python2.4/zipfile.py", line 468, in writestr
zinfo.header_offset = self.fp.tell() # Start of header bytes
Checking whether hasattr(dest, 'tell') is insufficient, because
sys.stdout has a tell() method; you just can't call it.
This patch instead determines whether a fileobj is tellable by trying
to tell(), wrapping the fileobj if an exception is generated.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 30 Apr 2006 16:30:57 -0700] rev 2167
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 30 Apr 2006 16:30:39 -0700] rev 2166
do not check sys.argv from localrepo when running hooks.
instead add traceback field to ui class.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 30 Apr 2006 21:11:22 +0200] rev 2165
Use better names (hg-{usage}-{random}.{suffix}) for temporary files.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 30 Apr 2006 19:30:59 +0200] rev 2164
Applied $PWD fix (changeset 278f9b13c39a) to tests/test-hook, too.
Sascha Wilde <wilde@sha-bang.de> [Sun, 30 Apr 2006 19:29:57 +0200] rev 2163
SunOS fix: Replaced $PWD with `pwd`
under certain conditioins $PWD isn't up to date,
observed on SunOS 5.8
Colin McMillen <mcmillen@cs.cmu.edu> [Sun, 30 Apr 2006 18:52:34 +0200] rev 2162
Add self to CONTRIBUTORS
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 30 Apr 2006 18:50:53 +0200] rev 2161
Fix just introduced possible old-http bug
My last patch changed httprangereader.read to read only the specified
amount of data from the connection, to prevent it from returning more
than what was asked.
I just realized that this could lead to the connection not being closed.
In practice, it looks like the connection is closed just fine, but it's
probably safer to read everything and then return only what's necessary.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 30 Apr 2006 18:46:49 +0200] rev 2160
Cleanup archive command: Don't overwrite gettext, quoting in cmd table entry.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 30 Apr 2006 18:40:30 +0200] rev 2159
Small cleanups to backout command:
- Accept -m for --message (like commit and similar commands), too.
- Don't ignore --logfile option.
- Fix command table entry (synopsis, group commit related option)
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 29 Apr 2006 20:56:46 -0700] rev 2158
add backout command.
command undoes effect of an earlier commit, commits new changeset
as result.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 29 Apr 2006 20:39:28 -0700] rev 2157
make test-revert check executable bit.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 28 Apr 2006 15:50:56 -0700] rev 2156
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 28 Apr 2006 15:50:22 -0700] rev 2155
support hooks written in python.
to write hook in python, create module with hook function inside.
make sure mercurial can import module (put it in $PYTHONPATH or load it
as extension). hook function should look like this:
def myhook(ui, repo, hooktype, **kwargs):
if hook_passes:
return True
elif hook_explicitly_fails:
return False
elif some_other_failure:
import util
raise util.Abort('helpful failure message')
else:
return
# implicit return of None makes hook fail!
then in .hgrc, add hook with "python:" prefix:
[hooks]
commit = python:mymodule.myhook
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 28 Apr 2006 14:51:36 -0700] rev 2154
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 28 Apr 2006 14:50:23 -0700] rev 2153
move SignalInterrupt class into util module.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Apr 2006 21:52:08 +0200] rev 2152
Show repo's revlog format on verify only if it doesn't match the default format.
This makes it easier to run the tests with different revlog formats.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Apr 2006 12:38:11 +0200] rev 2151
Ignore annotated coverage output of run-tests.py -C
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 28 Apr 2006 11:36:33 +0200] rev 2150
fix a NameError in changegroupsubset
Vincent Danjean <vdanjean@free.fr> [Thu, 27 Apr 2006 22:29:02 -0700] rev 2149
allow to pull from an empty repo without getting a backtrace
Colin McMillen <mcmillen@cs.cmu.edu> [Thu, 27 Apr 2006 22:11:13 -0700] rev 2148
Add MOTD display to hgweb and hgwebdir.
The hgweb "footer" template now has space for an optional message of
the day (MOTD). This is used in two contexts:
1) On the hgwebdir index page
2) On various pages of each individual repo
For both cases, the MOTD is read out of an entry named "motd" in the
[web] section of a config file -- the only difference is which file is
used. For #1, you need to add the section to hgweb.config; for #2, you
need to add to the repo's .hgrc file.
I suggest something like this:
[web]
motd = <p>To download these repositories, <a href="http://www.selenic.com/mercurial">get Mercurial</a> and then type something like:</p><p><pre>hg clone http://gs3080.sp.cs.cmu.edu/hg.cgi/cpmpy</pre></p>You can also click the Download links to get an archive of the latest revision.
An online sample is available here:
http://gs3080.sp.cs.cmu.edu/hg.cgi
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Apr 2006 22:10:45 -0700] rev 2147
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Apr 2006 22:01:57 -0700] rev 2146
run-tests.py: remove trailing white space
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 27 Apr 2006 22:01:28 -0700] rev 2145
make indentation of coverage code in run-tests.py nicer.
Stephen Darnell <stephen@darnell.plus.com> [Thu, 27 Apr 2006 21:59:44 -0700] rev 2144
Add code coverage to the python version of run-tests (inc. annotation)
Also include a minor work-around to coverage.py to avoid errors about /<string>
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Apr 2006 21:58:47 +0200] rev 2143
Show repo's revlog format on verify. Warn if some files use a different format.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Apr 2006 21:16:46 +0200] rev 2142
Replaced 0 with REVLOGV0 where this meaning is used.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Apr 2006 21:03:07 +0200] rev 2141
Corrected error message for incompatible revision flags.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Apr 2006 13:11:23 +0200] rev 2140
Make the deprecated forget an alias of debugforget.
This way it doesn't show up in the non-debug help.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Apr 2006 13:05:02 +0200] rev 2139
Fixed test output for not using the deprecated 'hg forget'.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 26 Apr 2006 22:42:07 -0700] rev 2138
Fix revlog-ng interaction with old-http.
revlog.py wasn't trying to detect the version of a revlog file that
doesn't exist on the filesystem (as is the case with old-http).
Additionally, there was an off-by-one error in httprangereader.read
(ranges in HTTP Range headers are inclusive), making it get more data
than what was asked for. This made a struct.unpack complain that
"unpack str size does not match format".
Finally, with the two fixes above, test-static-http fails, since
BaseHTTPServer doesn't understand ranges and returns too much data.
Work around that by reading only the specified amount.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 26 Apr 2006 22:15:01 -0700] rev 2137
Fix timezone check.
According to http://en.wikipedia.org/wiki/List_of_time_zones
timezones go from UTC-12 to UTC+14.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 26 Apr 2006 12:06:21 -0700] rev 2136
mke test-nested-repo use "revert" instead of "forget"
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 26 Apr 2006 12:05:16 -0700] rev 2135
mark forget command as deprecated.
will be removed after 0.9 released.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 26 Apr 2006 10:57:40 -0700] rev 2134
write to stderr with a single write call.
this works around issue88.
Stephen Darnell <stephen@darnell.plus.com> [Wed, 26 Apr 2006 16:54:07 +0200] rev 2133
Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 26 Apr 2006 07:31:04 +0200] rev 2132
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 26 Apr 2006 07:03:10 +0200] rev 2131
Try harder to display node hashes in tags view in monospaced font.
Used to work around Firefox's behaviour if "Allow pages to choose their
own fonts" is disabled.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 26 Apr 2006 06:12:42 +0200] rev 2130
hgweb templates: Don't word wrap "foo bar ago" (e.g. "3 months\nago")
This made log entries or hgwebdir index look ugly with certain browser widths.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 25 Apr 2006 23:28:40 +0200] rev 2129
cached data was wrong: rev is different from self.rev(node) in bundlerepo.py
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 25 Apr 2006 19:38:45 +0200] rev 2128
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 25 Apr 2006 19:38:19 +0200] rev 2127
Allow 'hg serve --webdir-conf foo' to be run outside a repository.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 25 Apr 2006 18:50:40 +0200] rev 2126
Use <link> tag instead if CDATA import for CSS stylesheets. Fixes issue200.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 25 Apr 2006 09:00:09 +0200] rev 2125
Use string literal concatenation for optlist and import -p option
Alexander Schremmer <alex AT alexanderweb DOT de> [Tue, 25 Apr 2006 00:43:40 +0200] rev 2124
Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf.
Alexander Schremmer <alex AT alexanderweb DOT de> [Sun, 23 Apr 2006 00:34:07 +0200] rev 2123
Fixed path handling of the standalone server, fixed typo.
Alexander Schremmer <alex AT alexanderweb DOT de> [Sun, 23 Apr 2006 00:31:09 +0200] rev 2122
Added hgwebdir support to hg serve.
Alexander Schremmer <alex AT alexanderweb DOT de> [Sun, 23 Apr 2006 00:27:46 +0200] rev 2121
Added threading support to hg serve.
Alexander Schremmer <alex AT alexanderweb DOT de> [Sun, 23 Apr 2006 00:18:58 +0200] rev 2120
Added my name to the contributors list.
Alexander Schremmer <alex AT alexanderweb DOT de> [Sun, 23 Apr 2006 00:15:30 +0200] rev 2119
Cleaned hgweb.py a little bit
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 25 Apr 2006 08:38:15 -0700] rev 2118
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 25 Apr 2006 08:37:05 -0700] rev 2117
fix issue 217.
fall back to fixed path if windows >= nt function not present.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 22 Apr 2006 09:19:27 +0200] rev 2116
Merge with upstream
Jim Meyering <list+hg@meyering.net> [Fri, 21 Apr 2006 16:09:43 -0700] rev 2115
Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 21 Apr 2006 15:47:27 -0700] rev 2114
update tests after changing archival code.
test-archive now contains tests for archive command.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 21 Apr 2006 15:28:50 -0700] rev 2113
make hgweb use new archival module.
also use "x-gzip" encoding for ".tar.gz" files, so mozilla and firefox
will not transparently decompress stream and save with wrong name.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 21 Apr 2006 15:27:57 -0700] rev 2112
add "archive" command, like "cvs export" only better.
most code in mercurial/archival.py module, for sharing with hgweb.
Matt Mackall <mpm@selenic.com> [Fri, 21 Apr 2006 16:30:49 -0500] rev 2111
Merge with crew
Stephen Darnell <stephen@darnell.plus.com> [Fri, 21 Apr 2006 18:47:55 +0200] rev 2110
Add a pure python version of run-tests.
If this works well for most people, it should replace the shell version
of run-test.
Matt Mackall <mpm@selenic.com> [Fri, 21 Apr 2006 16:30:23 -0500] rev 2109
Revert push new heads logic
This breaks push -r's new head detection but fixes the common case.
For now we'll assume that someone doing push -r knows what they're doing.
Matt Mackall <mpm@selenic.com> [Fri, 21 Apr 2006 15:33:51 -0500] rev 2108
Move empty local repo logic for pull into findincoming
This fixes a silly attempt to pull a changegroup from an empty repo.
Matt Mackall <mpm@selenic.com> [Fri, 21 Apr 2006 15:14:27 -0500] rev 2107
Don't die calling outgoing hook if we have no changesets
Matt Mackall <mpm@selenic.com> [Thu, 20 Apr 2006 12:13:54 -0500] rev 2106
Merge with crew
Matt Mackall <mpm@selenic.com> [Thu, 20 Apr 2006 12:12:03 -0500] rev 2105
Merge with cmason
Andrew Thompson <andrewkt@aktzero.com> [Thu, 20 Apr 2006 16:33:49 +0200] rev 2104
Add tests/test-committer
This checks to see if the EMAIL environment variable is being used for commit.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 20 Apr 2006 15:42:02 +0200] rev 2103
Use application/octet-stream as the content-type of unknown binary files
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 19 Apr 2006 22:18:03 -0700] rev 2102
remove appendfile data as soon as not needed.
Chris Mason <mason@suse.com> [Thu, 20 Apr 2006 13:08:16 -0400] rev 2101
Make bundlerepo use proper index format for revlogng
bundlerepo just appends index entries from the bundle onto the index for the
current repo. This patch makes sure it appends the correct format.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 19 Apr 2006 21:39:51 +0200] rev 2100
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 19 Apr 2006 21:37:43 +0200] rev 2099
Merge with cmason
Chris Mason <mason@suse.com> [Wed, 19 Apr 2006 15:35:10 -0400] rev 2098
Remove bogus raise from localrepo.lookup()
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 19 Apr 2006 11:41:27 -0700] rev 2097
Fix hg qdiff <file>
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 19 Apr 2006 11:41:25 -0700] rev 2096
Ignore EPIPE in pipefilter
This hides the following traceback (there's a race condition involved,
so you may have to try a few times to hit it):
$ hg sign --key key-that-does-not-exist
Signing 2062:4bad92f4ea65
gpg: skipped "key-that-does-not-exist": secret key not available
gpg: signing failed: secret key not available
Exception in thread Thread-1:
Traceback (most recent call last):
File "threading.py", line 442, in __bootstrap
self.run()
File "threading.py", line 422, in run
self.__target(*self.__args, **self.__kwargs)
File "mercurial/util.py", line 24, in writer
pin.close()
IOError: [Errno 32] Broken pipe
abort: Error while signing
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 19 Apr 2006 11:41:22 -0700] rev 2095
Don't send "Content-Type: none"
mimetypes.guess_type will return (None, None) when it can't detect the
filetype.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 19 Apr 2006 11:39:34 -0700] rev 2094
Fix filerevision-raw.tmpl
Two bugs:
- conteXt-type instead of conteNt-type
- trailing newline
The easiest way to fix the second one (and keep it fixed) is to put
everything inline in map-raw.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 19 Apr 2006 11:29:41 -0700] rev 2093
convert-repo: fix reversed time zone offset
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 19 Apr 2006 11:17:13 -0700] rev 2092
catch SIGBREAK on windows.
Lee Cantey <lcantey@gmail.com> [Wed, 19 Apr 2006 10:56:44 -0700] rev 2091
update windows readme to document msys/mingw rxvt problems.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 19 Apr 2006 09:08:45 -0700] rev 2090
fix util.canonpath on windows.
old test for absolute path was not portable. use os.path api instead.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 19 Apr 2006 08:33:46 -0700] rev 2089
make appendfile simpler so it does not break with revlogng on windows.
it used to cache open files. this made revlogng break because it wants
to rename files when splitting .i into .i/.d, but cannot rename or unlink
open files on windows.
new code is bit slower, but safe on linux and windows. proper fix for
too many open/close of changelog/manifest belongs in different place.
can get 10% speed improvement back.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 19 Apr 2006 07:09:15 +0200] rev 2088
Exit test-hup only after the background process has died.
Otherwise the open file might let the tests fail on NFS.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 18 Apr 2006 20:33:33 -0700] rev 2087
merge with mainline.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 18 Apr 2006 14:56:54 -0700] rev 2086
mq: do not fail if directory to create exists
Chris Mason <mason@suse.com> [Tue, 18 Apr 2006 19:50:12 -0400] rev 2085
merge revlogng with mpm tip
Chris Mason <mason@suse.com> [Mon, 17 Apr 2006 13:19:58 -0400] rev 2084
Fix transaction handling during interleaved file split.
Chris Mason <mason@suse.com> [Sat, 08 Apr 2006 20:10:46 -0400] rev 2083
merge 0.8.1 with revlogng
mason@suse.com [Sat, 08 Apr 2006 20:08:06 -0400] rev 2082
Additional appendfile fixes for interleaved data/index files
The appendfile code was not passing default version info to the
changelog or manifest classes, and so they were always being created
as version 0.
revlog.checkinlinesize had to be corrected to seek to the end
of the index file when no index file was passed (only clone does this)
Chris Mason <mason@suse.com> [Thu, 06 Apr 2006 20:13:09 -0400] rev 2081
Speedup revlog.ancestors for the linear case
revlog.ancestors can be expensive on big repos. This cuts down the overall
time for hg update by ~19% by short cutting revlog.ancestors when one of the
revisions is reachable from another.
mason@suse.com [Tue, 04 Apr 2006 19:00:40 -0400] rev 2080
Reduce index memory usage by storing the bare string instead of tuples
Storing the tuple returned by struct.unpack significantly increases
the memory required to store the entire index in ram. This patch
uses struct.unpack on demand instead.
mason@suse.com [Tue, 04 Apr 2006 16:47:12 -0400] rev 2079
New lazy index code for revlogs.
This tunes for large repositories. It does not read the whole
index file in one big chunk, but tries to buffer reads in more
reasonable chunks instead.
Search speeds are improved in two ways. When trying to find a
specific sha hash, it searches from the end of the file backward.
More recent entries are more likely to be relevant, especially the
tip.
Also, this can load only the mapping of nodes to revlog index number.
Loading the map uses less cpu (no struct.unpack) and much less
memory than loading both the map and the index.
This cuts down the time for hg tip on the 80,000 changeset
kernel repo from 1.8s to 3.69s. Most commands the pull a single
rev out of a big index get roughly the same benefit. Commands
that read the whole index are not slower.
mason@suse.com [Tue, 04 Apr 2006 16:38:44 -0400] rev 2078
Fill in the uncompressed size during revlog.addgroup
This uses code from Matt to calculate the size change that
would result from applying a delta to keep an accurate running
total of the text size during revlog.addgroup
mason@suse.com [Tue, 04 Apr 2006 16:38:44 -0400] rev 2077
Fix inlined revlogs to seek to eof after opening "a+"
mason@suse.com [Tue, 04 Apr 2006 16:38:44 -0400] rev 2076
Create an atomic opener that does not automatically rename on close
The revlog.checkinlinesize() uses an atomic opener to replace the
index file after converting it from inline to traditional .i and .d
files. If this operation is interrupted, the atomic file class can
overwrite a valid file with a partially written one.
This patch introduces an atomic opener that does not automatically
replace the destination file with the tempfile. This way
an interrupted checkinlinesize() call turns into a noop.
mason@suse.com [Tue, 04 Apr 2006 16:38:43 -0400] rev 2075
Make the appendfile class inline-data index friendly
The appendfile class needs a few changes to make it work with interleaved
index files. It needs to support the tell() method, opening in a+ mode,
and it needs to delay the checkinlinesize call until after the
append file is written.
Given that open(file, "a+") doesn't always seek to the end of the file,
this adds seek operations to appendfile that understand whence args
mason@suse.com [Tue, 04 Apr 2006 16:38:43 -0400] rev 2074
Fix bundle repos to use an index tuple consistent with revlogng
The bundle repo code was adding a field to the index tuple, which
confused the revlogng changes. This creates a new dict instead
to maintain the extra bundle info.
mason@suse.com [Tue, 04 Apr 2006 16:38:43 -0400] rev 2073
Implement data inlined with the index file
This patch allows you to optionally inline data bytes with the
revlog index file. It saves considerable space and checkout
time by reducing the number of inodes, wasted partial blocks and
system calls.
To use the inline data add this to your .hgrc
[revlog]
# inline data only works with revlogng
format=1
# inline is the only valid flag right now.
flags=inline
mason@suse.com [Tue, 04 Apr 2006 16:38:43 -0400] rev 2072
Implement revlogng.
revlogng results in smaller indexes, can address larger data files, and
supports flags and version numbers.
By default the original revlog format is used. To use the new format,
use the following .hgrc field:
[revlog]
# format choices are 0 (classic revlog format) and 1 revlogng
format=1
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 13 Apr 2006 17:42:49 -0700] rev 2071
import: use gpatch if present on system. patch is broken on solaris.
fixes issue 205.
add new useful function, util.find_in_path.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 13 Apr 2006 17:12:09 -0700] rev 2070
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 13 Apr 2006 17:11:35 -0700] rev 2069
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 13 Apr 2006 17:11:04 -0700] rev 2068
let run-tests run optional code coverage tests.
to enable, set env var TEST_COVERAGE to non-empty string. run-tests will
print report after running.
after coverage run, file tests/.coverage will contain coverage data. use
tests/coverage.py to get more info, like annotated source code.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 13 Apr 2006 17:06:57 -0700] rev 2067
fix bugs in coverage.py.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 13 Apr 2006 15:10:03 -0700] rev 2066
add coverage.py module to tests directory.
written by ned batchelder and gareth rees.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Apr 2006 00:41:50 +0200] rev 2065
fix update when a locally added file match the target revision
the dirstate entry for the added file wasn't updated.
fix issue207
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 13 Apr 2006 13:46:56 -0700] rev 2064
util.unlink should only catch OSError.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 13 Apr 2006 13:46:05 -0700] rev 2063
benoit asked for comment to make avoid of recursive repo clearer.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 13 Apr 2006 12:44:40 -0700] rev 2062
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 31 Mar 2006 17:00:09 -0800] rev 2061
support nested repositories.
mercurial will not recurse into a subdirectory that contains a .hg
directory. it is treated as a separate repository.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 12 Apr 2006 17:57:44 +0200] rev 2060
Don't use -u option for diff on SunOS, too.
This makes the tests work without using GNU diff on Solaris 8.
Sascha Wilde <wilde@sha-bang.de> [Wed, 12 Apr 2006 17:53:04 +0200] rev 2059
run-tests: Use appropriate (that is: none) diff options on HP-UX.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 11 Apr 2006 12:44:13 +0200] rev 2058
Use the new format of setting tags in view extension (Debian bug #361897)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 11 Apr 2006 08:42:07 +0200] rev 2057
Never exit directly from commands.dispatch(), but pass return code to caller.
Usually the caller is commands.run().
Some extensions still use sys.exit(), this is catched, too.
Fixed wrong return statement in commands.recover() yielding a zero exit code.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 11 Apr 2006 07:08:16 +0200] rev 2056
Polished exception handling when importing extensions:
- Warning about failed import is printed on one line.
- For this warning the [extensions] section key is used, because the value
doesn't have to be set.
- Whan a --traceback is requested, exit immediately to not mix up problems
when importing an extension with other problems.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 11 Apr 2006 06:34:27 +0200] rev 2055
Added doc/gendoc.py to MANIFEST.in, so docs can be regenerated on demand.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 08 Apr 2006 14:12:43 -0700] rev 2054
fix exception handling on windows.
move win32 code into util_win32.py.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 08 Apr 2006 10:14:04 +0200] rev 2053
Include tests/md5sum.py in manifest.
Matt Mackall <mpm@selenic.com> [Fri, 07 Apr 2006 20:08:11 -0500] rev 2052
Added tag 0.8.1 for changeset 6a03cff2b0f5d30281e6addefe96b993582f2eac
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Fri, 07 Apr 2006 22:31:54 +0200] rev 2051
Try to use /usr/bin/test or /bin/test to work around missing features.
The builtin "test" of Solaris 8 /bin/sh doesn't understand -nt.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 05 Apr 2006 17:17:07 -0700] rev 2050
util.copyfiles: only switch to copy if hardlink raises IOError or OSError.
before this, interrupting clone would give "file a same as file b" error
because caught KeyboardInterrupt.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 05 Apr 2006 19:07:50 +0200] rev 2049
Make completion for debugindex<tab><tab> show debugindexdot, too.
The special handling for commands with names that are substrings of other
commands (e.g. with st and strip) wasn't used with debug commands before.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 05 Apr 2006 15:39:48 +0200] rev 2048
Set correct exception for another possible malloc error in mpatch.c
Edouard Gomez <ed.gomez@free.fr> [Tue, 04 Apr 2006 16:35:20 -0700] rev 2047
Register qversion as a non repository related command
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 04 Apr 2006 15:21:20 +0200] rev 2046
Show remote ssh noise only with --debug and increase the limit to 500 lines.
Messages can already be sent to the user over stderr, if one really wants this.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 03 Apr 2006 22:47:18 +0200] rev 2045
document the possible race in "hg undo"
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 03 Apr 2006 21:38:59 +0200] rev 2044
Don't allow --style and --template for hg update and hg merge.
The only way that changesets will be shown with these command is in an error
message when trying to update to an ambiguous branch name.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 03 Apr 2006 21:01:33 +0200] rev 2043
Minor fix for revert: No need to make a backup when forgetting added files.
echo foo > foo && hg add foo && hg revert foo
creates foo.orig, though foo is not changed or deleted.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 03 Apr 2006 10:02:09 -0700] rev 2042
small changes to revert command.
fix bug 93: work with files that are in target manifest but not
dirstate.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 03 Apr 2006 14:56:00 +0200] rev 2041
bash_completion: completion for commands provided by extensions
Make the bash_completion function call _hg_cmd_$cmd to generate
completion candidates for $cmd if that function exists.
Add basic completion functions for:
- mq:
- qpop
- qpush
- qdelete
- qsave
- qcommit
- strip
- hbisect:
- bisect
- patchbomb:
- email
- gpg:
- sign
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Apr 2006 22:12:56 +0200] rev 2040
Don't enter an endless loop if remote hg doesn't answer, show remote noise.
The endless loop is not only triggered if the remote shell is too noisy, but
even if the local ssh command dies due to an error.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 02 Apr 2006 18:20:52 +0200] rev 2039
bash_completion: small optimization
Right now we always call "hg help $cmd" to get the canonical name of $cmd
(i.e. to go from "co" to "update").
This patch optimistically assumes that $cmd is already the canonical form
and tries to generate completions for it. If that fails, it falls back
to canonicalizing $cmd and trying again.
This means that:
- if a command or alias is explicitly handled by the
_hg_command_specific function, things get somewhat faster
- as long as the canonical $cmd is handled by _hg_command_specific, all
its aliases and abbreviations are also handled.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Apr 2006 18:16:06 +0200] rev 2038
Tell the user the real "hg update -C" command, not just "-C" when aborting.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 02 Apr 2006 08:19:41 +0200] rev 2037
Merged with crew.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 01 Apr 2006 11:58:50 +0200] rev 2036
Don't abort when backup files already exist. Don't allow alternative names.
Rationale:
- When the user wants to revert, he shouldn't be stopped from doing
this just because some old backups will be overwritten.
- To not clobber important files by accident, alternative names for backup
files were disabled. As the backup target now has a fixed name, the user
doesn't have to be informed about the backup copy (unless --verbose)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 01 Apr 2006 23:57:24 +0200] rev 2035
Make 'hg tags -q' only list tag names without revision numbers and hashes,
and change bash_completion to use this.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Apr 2006 22:50:12 +0200] rev 2034
add --options to debugcomplete and change bash_completion to use it
make debugcomplete print one item per line (this is not needed for the
bash_completion script, but should be easier to use in other scripts)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 01 Apr 2006 21:37:08 +0200] rev 2033
Group changes done by the same developer on the same with --style=changelog
Changeset and tags are appended to the change message for non-quiet and
non-verbose output, so grouping works.
Fixes last bit of issue110.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 01 Apr 2006 20:56:55 +0200] rev 2032
Don't print filenames in braces for changelog style.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 01 Apr 2006 19:11:59 +0200] rev 2031
Web site and wiki are now the same.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 31 Mar 2006 10:52:56 -0800] rev 2030
forgot to rerun tests after changed backup extension to .orig.
thomas a.h. found this.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 31 Mar 2006 10:37:25 -0800] rev 2029
rewrite revert command. fix issues 93, 123, 147.
new version does these things:
- saves backup copies of modified files (issue 147)
- prints output like other commands, and errors when files not found
(issue 123)
- marks files added/removed (issue 93)
Matt Mackall <mpm@selenic.com> [Fri, 31 Mar 2006 03:25:35 -0600] rev 2028
ssh: skip noise generated by remote shell
we send a dummy command with known output to get in sync
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 30 Mar 2006 19:28:41 -0800] rev 2027
work around python bug on solaris 10.
write to file opened mode 'a+' should write to end of file and update
offset pointer, but does not (solaris 10 has python 2.3.3).
fix is to always seek.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 30 Mar 2006 18:35:52 -0800] rev 2026
more windows fixes.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 30 Mar 2006 18:27:04 -0800] rev 2025
clean up lee's windows testpid fix.
Lee Cantey <lcantey@gmail.com> [Thu, 30 Mar 2006 18:20:08 -0800] rev 2024
Fixes to testpid() for Windows.
Handle processes that no longer exist and processes that belong to another user.
Enables the lock breaking changes from d314a89fa4f1 and subsequently "fixes" the left over locks reported in bug 112.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Mar 2006 18:43:46 +0200] rev 2023
Use [ x = y ] instead of [ x == y ] in shell scripts.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 29 Mar 2006 22:58:34 +0200] rev 2022
New option -i/--ignored for 'hg status' to show ignored files.
localrepo.changes() now returns an additional list of ignored files if
it is called with show_ignored=True.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 29 Mar 2006 22:35:21 +0200] rev 2021
Fix hg push and hg push -r sometimes creating new heads without --force.
Fixing issue179.
The algorithm checks if there not more new heads on the remote side than heads
which become non-heads due to getting children.
Pushing this repo:
m
/\
3 3a|
|/ /
2 2a
|/
1
to a repo only having 1, 2 and 3 didn't abort requiring --force before.
Added test cases for this and some doc strings for used methods.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 29 Mar 2006 10:31:58 -0800] rev 2020
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 29 Mar 2006 10:27:16 -0800] rev 2019
add merge command. means same thing as "update -m".
repo.addchangegroup method now returns number of heads modified and added,
so command line can tell whether update or merge needed. this makes
tiny change to ssh wire protocol, but change is backwards compatible.
pull command now returns 0 if no changes to pull.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 29 Mar 2006 10:16:04 -0800] rev 2018
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 28 Mar 2006 09:04:33 -0800] rev 2017
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 28 Mar 2006 09:01:07 -0800] rev 2016
fix backtrace printed when cannot get lock.
change lock error handling code so exceptions have useful info and
exception handling in one place.
add test case for when cannot get lock.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 29 Mar 2006 12:45:33 +0200] rev 2015
Catch HTTPException when reading from remote http repository.
If the server dies very early, an httplib.IncompleteRead exception may be
raised, because httplib can't read a single byte. Catching all HTTPException
subclasses here will prevent ugly backtraces for similar things, too.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 28 Mar 2006 09:26:38 -0800] rev 2014
merge with crew.
Eung-Ju Park <eungju@gmail.com> [Tue, 28 Mar 2006 09:24:29 -0800] rev 2013
Fix error on Windows if "hg log | more" exits.
TK Soh <teekaysoh@yahoo.com> [Tue, 28 Mar 2006 19:02:00 +0200] rev 2012
add missing filename title to gitweb's filelog page
TK Soh <teekaysoh@yahoo.com> [Tue, 28 Mar 2006 18:54:00 +0200] rev 2011
don't overquote description on gitweb summary page (issue 184)
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Mar 2006 08:31:33 -0800] rev 2010
fix appendfile problem on macos.
when i open file with mode 'a+' on linux, seek position is 0.
on macos seek position is end of file instead. not documented.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 26 Mar 2006 22:54:05 +0200] rev 2009
Fix broken hgignore tests due to full path showing up in output.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 26 Mar 2006 22:32:44 +0200] rev 2008
Don't ignore everything if all hgignore files are empty.
TK Soh <teekaysoh@yahoo.com> [Sun, 26 Mar 2006 07:28:52 -0800] rev 2007
show committer's name on gitweb's summary page (issue 137)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 25 Mar 2006 10:31:06 +0100] rev 2006
Show reason why an ignore file can't be read and state that it is skipped.
mcmillen@cs.cmu.edu [Sat, 25 Mar 2006 10:12:23 +0100] rev 2005
On error parsing hgignore file, print the correct filename.
mcmillen@cs.cmu.edu [Sat, 25 Mar 2006 10:02:39 +0100] rev 2004
Add warning if user-configured hgignore file isn't found
mcmillen@cs.cmu.edu [Fri, 24 Mar 2006 20:18:02 +0100] rev 2003
Implementation of per-user .hgignore.
Reference: http://www.selenic.com/mercurial/bts/issue166
If the [ui] section of .hgrc contains keys like "ignore" or
"ignore.something", the values corresponding to these keys are
treated as per-user hgignore files. These hgignore files apply to all
repositories used by that user.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 24 Mar 2006 19:51:05 +0100] rev 2002
Calling revlog.addgroup with an empty changegroup now raises RevlogError.
The empty changegroup can be caused by remote servers dying soon after
findincoming, and further code in pull assumes (correctly) that there are
new changesets.
Lee Cantey <lcantey@gmail.com> [Fri, 24 Mar 2006 10:33:18 -0800] rev 2001
Windows py2exe version didn't handle names given to templatepath() correctly
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 24 Mar 2006 10:31:23 -0800] rev 2000
add benoit's test for issue148.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 24 Mar 2006 09:23:11 -0800] rev 1999
forgot to add new module.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 24 Mar 2006 09:08:12 -0800] rev 1998
fix race in localrepo.addchangegroup.
localrepo.addchangegroup writes to changelog, then manifest, then normal
files. this breaks access ordering. if reader reads changelog while
manifest is being written, can find pointers into places in manifest
that are not yet written. same can happen for manifest and normal files.
fix is to make almost no change to localrepo.addchangegroup. it must
to write changelog and manifest data early because it has to read them
while writing other files. instead, write changelog and manifest data
to temp file that reader cannot see, then append temp data to manifest
after all normal files written, finally append temp data to changelog.
temp file code is in new appendfile module. can be used in other places
with small changes.
much smaller race still left. we write all new data in one write call,
but reader can maybe see partial update because python or os or filesystem
cannot always make write really atomic. file locking no help: slow, not
portable, not reliable over nfs. only real safe other plan is write to
temp file every time and rename, but performance bad when manifest or
changelog is big.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 24 Mar 2006 15:19:08 +0100] rev 1997
Added missing gettext import to changegroup.py.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 24 Mar 2006 15:03:15 +0100] rev 1996
Don't mention deprecated HGEDITOR variable in the help text of commit.
mcmillen@cs.cmu.edu [Fri, 24 Mar 2006 14:53:23 +0100] rev 1995
Spelling fix: "commited" -> "committed"
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 24 Mar 2006 08:51:08 +0100] rev 1994
show message if no changes found on outgoing
Now the messages for pull/push/incoming/outgoing should be consistent.
TK Soh <teekaysoh@yahoo.com> [Fri, 24 Mar 2006 08:34:56 +0100] rev 1993
show message if no changes found on incoming
Lee Cantey <lcantey@gmail.com> [Fri, 24 Mar 2006 08:27:24 +0100] rev 1992
Include templates/static/* in MANIFEST.in so that distutils setup will include them.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 23 Mar 2006 23:55:51 +0100] rev 1991
merge with self
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 23 Mar 2006 23:39:53 +0100] rev 1990
make it possible to escape characters in a glob expression
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 23 Mar 2006 23:16:41 +0100] rev 1989
ignore EPIPE in ui.err_write
It avoids not being able to abort a transaction when a push via ssh fails.
Maybe some other place should ignore EPIPE too.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 21 Mar 2006 23:31:04 -0800] rev 1988
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 21 Mar 2006 23:29:21 -0800] rev 1987
add changelog style to command line template.
to use, "hg log --style=changelog". makes different output with no
flags, -q, -v, --debug.
templater module has new template filters for this.
email - committer email address
fill68 - refill text to 68 colums
fill76 - refill text to 76 colums
tabindent - prefix every not empty line with tab
shortdate - iso 8631 date, no time zone
stringify - turn template iterator into string
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Mar 2006 05:30:47 +0100] rev 1986
add checking for invalid entries in tag files
safely parse the differents tag files, output warning
when parsing an invalid entry.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Mar 2006 15:33:29 +0100] rev 1985
Adapted behaviour of ui.username() to documentation and mention it explicitly:
Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL
and stop searching if one of these is set.
Abort if found username is an empty string to force specifying
the commit user elsewhere, e.g. with line option or repo hgrc.
If not found, use $LOGNAME or $USERNAME +"@full.hostname".
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Mar 2006 12:54:32 +0100] rev 1984
Improved ui.edit():
- Use descriptive name for temporary file: hg-editor-*.txt
- Don't import tempfile in the method, but use demandload()
- Remove tempfile file even if editor aborts.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Mar 2006 12:45:27 +0100] rev 1983
Pass correct username as $HGUSER to hgeditor if "commit -u" is used.
And only use the new util.system parameter to set the environment.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Mar 2006 12:15:25 +0100] rev 1982
Added test for incoming via ssh.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Mar 2006 11:47:21 +0100] rev 1981
make incoming work via ssh (issue139); move chunk code into separate module.
Incoming ssh needs to detect the end of the changegroup, otherwise it would
block trying to read from the ssh pipe. This is done by parsing the
changegroup chunks.
bundlerepo.getchunk() already is identical to
localrepo.addchangegroup.getchunk(), which is followed by getgroup which
looks much like what you can re-use in bundlerepository.__init__() and in
write_bundle(). bundlerevlog.__init__.genchunk() looks very similar, too,
as do some while loops in localrepo.py.
Applied patch from Benoit Boissinot to move duplicate/related code
to mercurial/changegroup.py and use this to fix incoming ssh.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Mar 2006 06:03:33 +0100] rev 1980
use HG10UN header for uncompressed bundle
- use HG10UN instead of HG11 for uncompressed bundles header
- check HG10BZ for compressed bundle
- better error handling for invalid header
some notes:
- people who created uncompressed bundle will no longer be
able to use them (it could be fixed with hand-editing)
- older hg cannot detect an uncompressed bundle
(bzip2 decompression will fail).
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 20 Mar 2006 17:14:58 +0100] rev 1979
More detailed documentation about ssh:// URLs; fixes issue170.
TK Soh <teekaysoh@yahoo.com> [Mon, 20 Mar 2006 08:46:29 +0100] rev 1978
do proper typecasting on malloc() and calloc() calls
to support build on Solaris 2.6 using Sun Pro SC4.0 (C++ 4.1) compiler.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Mar 2006 21:26:58 +0100] rev 1977
Don't forget version at the end of setup.py, write it only if changed.
This fixes issue159: "python setup.py install" shouldn't write new files
in the working dir if one has done "python setup.py build" first.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 19 Mar 2006 14:53:58 +0100] rev 1976
Enable path validation for copy, rename, debugwalk and other canonpath users.
This fixed the last bit of issue134.
Added some tests to test-rename and test-walk.
Shun-ichi Goto <shunichi.goto@gmail.com> [Sat, 18 Mar 2006 09:51:25 -0800] rev 1975
Duplicate cache when creating templater.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Mar 2006 14:36:45 +0100] rev 1974
Delete bundle file of hg incoming in case of errors, preserve existing files.
Let write_bundle always create the bundle file, check if target doesn't exist
and delete it in case of errors.
This way incoming only has to delete the bundle file if it was meant to
be a temporary file.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Mar 2006 11:24:19 +0100] rev 1973
Cleaned up the code path for bundle handling in hg incoming, updated comments.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Mar 2006 10:45:21 +0100] rev 1972
Documented behaviour of write_bundle regarding file handles.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Mar 2006 09:13:27 +0100] rev 1971
imported patch /home/thomas/fix-incoming-abortion4.patch
Shun-ichi GOTO <shunichi.goto@gmail.com> [Fri, 17 Mar 2006 17:23:52 -0800] rev 1970
Fixed abort while remote incoming command on windows.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 17 Mar 2006 18:53:04 +0100] rev 1969
write_bundle: close the file before removing it in case of failure
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Mar 2006 09:49:28 -0800] rev 1968
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Mar 2006 09:48:43 -0800] rev 1967
still use old variable names when running hooks. dropped by accident.
we set HG_FOO (new name) and FOO (old name).
plan is to drop old names after 0.9.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 17 Mar 2006 18:19:05 +0100] rev 1966
hg status cleanups: Don't translate long options, remove stray semicolon.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 16 Mar 2006 06:58:15 +0100] rev 1965
add remotecmd/ssh option support to incoming/outgoing
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 15 Mar 2006 11:28:00 -0800] rev 1964
fix template bug that made hgweb break.
problem found by Shun-ichi Goto <shunichi.goto@gmail.com>.
this fix tested with command template and hgweb templates.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 15 Mar 2006 11:26:57 +0100] rev 1963
Don't require the "yes" command for test-merge5.
TK Soh <teekaysoh@yahoo.com> [Wed, 15 Mar 2006 11:09:24 +0100] rev 1962
tests: more portability fix for the old systems
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Mar 2006 23:01:11 -0800] rev 1961
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Mar 2006 23:00:45 -0800] rev 1960
update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Mar 2006 22:58:14 -0800] rev 1959
add -f/--force to pull, incoming, outgoing, to work on unrelated repo.
before this, push would not push from e.g. "hg" repo to "kernel" repo
but other commands worked. this was bad idea, could merge unrelated
projects by accident. i did this tonight.
now, all commands still work with unrelated repo but need
--force/-f. abort is default. this is safer.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 15 Mar 2006 07:15:13 +0100] rev 1958
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 15 Mar 2006 07:10:04 +0100] rev 1957
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 15 Mar 2006 07:09:42 +0100] rev 1956
use a proper test instead of catching every exception
Shun-ichi GOTO <shunichi.goto@gmail.com> [Wed, 15 Mar 2006 06:39:04 +0100] rev 1955
Fix the py2exe template path problem (issue:152) again.
This patch is same with 1834:24881eaebee3 which is leaved behind by
1897:58b6784cf9f1.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Mar 2006 22:02:41 -0800] rev 1954
merge with crew.
TK Soh <teekaysoh@yahoo.com> [Tue, 14 Mar 2006 22:01:30 -0800] rev 1953
change default strftime format for better portability
On some systems, such as Solaris and HP-UX, "%c" format
give output without the leading zero on the single-digit
month-day.
TK Soh <teekaysoh@yahoo.com> [Tue, 14 Mar 2006 21:42:32 -0800] rev 1952
tests: fix portability issue for echo -n
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Mar 2006 21:40:46 -0800] rev 1951
add HGRCPATH env var, list of places to look for hgrc files.
if set, override default hgrc search path.
if empty, only .hg/hgrc of current repo read.
for each element, if directory, all entries in directory with end in
".rc" are added to path. else, element is added to path.
big thing about this change is that user "~/.hgrc" and system hgrc not
longer breaks tests. run-tests makes HGRCPATH empty now.
Hollis Blanchard <hollisb@us.ibm.com> [Wed, 15 Mar 2006 03:19:16 +0100] rev 1950
hgk "committer:" bug
I've been having an hgk problem with this tree:
http://xenbits.xensource.com/ext/linux-ppc-2.6.hg, specifically changeset
93c590d23a53.
The problem seems to be that the commit message contains a "committer:" line,
which triggers a (relatively unused?) case in hgk.py... Both cases need the
dates at the end of the line.
Soh Tk-r28629 <tksoh@freescale.com> [Wed, 15 Mar 2006 02:49:45 +0100] rev 1949
tests: add bunzip2 to prerequisite list
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 23:38:14 +0100] rev 1948
merge with crew/templates
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 23:32:57 +0100] rev 1947
fix the call to util.matcher (the args should be (reporoot, cwd, ...))
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 06:58:31 +0100] rev 1946
bundlerepo: remove relative import, fix a comment
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 03:56:36 +0100] rev 1945
new type of repo: bundle://path/to/repo+/path/to/bundlename
You can use it to pull only some changeset from an uncompressed
bundle.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 03:54:23 +0100] rev 1944
incoming: add support for remote repo using bundlerepo
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 03:54:23 +0100] rev 1943
refactor the bundle writing code, since we will reuse it later
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 03:54:23 +0100] rev 1942
add bundlerepo.py: a read-only repo that can use uncompressed bundles
The idea is to create a repo consisting of a normal local repository
plus all the changesets contained in a bundle.
The bundle needs to be uncompressed. A futur version could implement
the seeking through a compressed bundle.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 03:54:23 +0100] rev 1941
revlog.py: factorization and fixes for rev < 0 (nullid)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 03:54:23 +0100] rev 1940
add a new bundle type: uncompressed bundle
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 13 Mar 2006 18:33:33 +0100] rev 1939
Use timestamps without leading 0 in test-command-template for portable tests.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 13 Mar 2006 08:25:33 -0800] rev 1938
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 13 Mar 2006 08:24:44 -0800] rev 1937
fix use of python 2.4 features.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 13 Mar 2006 13:19:23 +0100] rev 1936
Make test-remove portable for strange strftime implementations (second try).
I forgot to replace the date output for 'hg log -p', too.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 13 Mar 2006 13:11:35 +0100] rev 1935
Removed obsolete workaround for error message in tests/test-static-http.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 13 Mar 2006 13:08:31 +0100] rev 1934
Make test-remove portable for strange strftime implementations.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 13 Mar 2006 13:05:41 +0100] rev 1933
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests.
Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on
all systems.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 13 Mar 2006 12:22:55 +0100] rev 1932
Merge with http://hg.home.dataloss.nl/hg-portabletests
Peter van Dijk <peter@dataloss.nl> [Mon, 06 Mar 2006 18:01:34 +0100] rev 1931
merge with crew
Peter van Dijk <peter@dataloss.nl> [Mon, 06 Mar 2006 18:00:44 +0100] rev 1930
merge with crew
Eric Hopper <hopper@omnifarious.org> [Mon, 06 Mar 2006 08:47:16 -0800] rev 1929
Merging with crew.
Peter van Dijk <peter@dataloss.nl> [Mon, 06 Mar 2006 17:58:53 +0100] rev 1928
clarify license on md5sum.py
Peter van Dijk <peter@dataloss.nl> [Wed, 22 Feb 2006 16:11:17 +0100] rev 1927
add http_proxy= lines to test-bad-pull and test-pull
Peter van Dijk <peter@dataloss.nl> [Wed, 22 Feb 2006 15:57:43 +0100] rev 1926
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl> [Wed, 22 Feb 2006 15:42:48 +0100] rev 1925
small solaris portability fixes from John Levon <levon@movementarian.org>
Peter van Dijk <peter@dataloss.nl> [Tue, 21 Feb 2006 22:32:17 +0100] rev 1924
add md5sum.py required by fix in previous changeset
Peter van Dijk <peter@dataloss.nl> [Tue, 21 Feb 2006 22:23:51 +0100] rev 1923
fix testsuite for freebsd and one timingissue
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 08:56:59 +0100] rev 1922
ui: output the number of file updated/merged/removed/... on update
add a note for people to remember commiting after a merge.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 20:34:09 +0100] rev 1921
Don't expand empty [paths] so later interpolation can do the right thing.
Example:
[paths]
default =
default-push = %(default)s
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 12 Mar 2006 16:21:59 -0800] rev 1920
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 12 Mar 2006 15:58:56 -0800] rev 1919
add changeset_quiet to templates.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 12 Mar 2006 15:50:18 -0800] rev 1918
fix template tests.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 21:41:44 -0800] rev 1917
add quiet and debug template keys.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 05 Mar 2006 17:08:35 -0800] rev 1916
fix test failures that depend on when tests run.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 04 Mar 2006 21:12:53 -0800] rev 1915
add tests for command line template.
fix default template problem found in test.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 04 Mar 2006 15:15:18 -0800] rev 1914
make --style=compact look for map-cmdline.compact.
change name of key in map file from changelog to changeset.
rename command map files to start with map-cmdline.
rename ui.logmap to ui.style in hgrc.
now --style=foo does this:
tries to open foo as file.
tries as map-cmdline.foo in template path.
tries as foo in template path.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 04 Mar 2006 12:40:10 -0800] rev 1913
fix some things people wanted to be cleaner.
rename --map-file to --style.
no more -t alias for --template.
update docs.
rename template entry in map files to changelog.
if --verbose, use changelog_verbose if there, else changelog.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 28 Feb 2006 07:24:54 -0800] rev 1912
hide some functions behind lambdas, so demandload is useful.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 21:37:57 -0800] rev 1911
add extra newline to verbose log template. asak found this.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 21:32:15 -0800] rev 1910
changeset_templater: only compute manifest when --debug.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 15:07:25 -0800] rev 1909
add doc comments to template code.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 13:25:40 -0800] rev 1908
print tags in compact template.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 13:18:57 -0800] rev 1907
let commands that show changesets use templates.
mechanism is same as hgweb templates.
old show_changeset code is still used for now if no template given,
because it is faster than template code when verbose or debug.
simple template can be given on command line using -t, --template.
example:
hg log -t '{author|person}\n'
complex template can be put in template map file, given on command line
using --map-file.
we give two example map files:
map-log.compact prints 3 lines of output for every change.
map-log.verbose prints exact same output as default "hg log -v".
map files are searched where user says, then in template path as backup.
example:
hg log --map-file map-log.compact
defaults can be set in hgrc with ui.logtemplate and ui.logmap.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 12:50:49 -0800] rev 1906
add iso date template filter.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 12:41:20 -0800] rev 1905
improve template errors when something is wrong.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 11:33:09 -0800] rev 1904
improve templating.
allow {foo} as well as #foo#.
add new functions for changeset authors.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 11:32:10 -0800] rev 1903
move shortuser into util module.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 11:18:56 -0800] rev 1902
make parsestring work with strings that do not have quotes.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 09:35:43 -0800] rev 1901
use safer string parser for template engine.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 27 Feb 2006 09:15:59 -0800] rev 1900
move repeated work out of inner loops.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 26 Feb 2006 20:53:37 -0800] rev 1899
many small changes to templater.
get string code to parse escapes. uses eval now, should parse strings
itself soon.
let caller check if fragment is defined using "in".
make templatepath take optional file name.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 26 Feb 2006 13:11:53 -0800] rev 1898
missed hunk when moving code to templater module
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 26 Feb 2006 13:09:26 -0800] rev 1897
move hgweb.templatepath into templater
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 26 Feb 2006 12:59:28 -0800] rev 1896
move hgweb template code out to templater
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 13 Mar 2006 00:02:33 +0100] rev 1895
findincoming should return an iterable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 20:23:05 +0100] rev 1894
Allow symbolic path names in global -R/--repository parameter.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 20:13:58 +0100] rev 1893
Read paths specified in .hg/hgrc relative to repo root, otherwise to home dir.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 18:05:13 +0100] rev 1892
Directory names take precedence over symbolic names consistently.
Previously this was only done for clone.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 15:11:11 +0100] rev 1891
New version/release in mercurial.spec, patchbomb is now in hgext.
Xiaofeng Ling <xiaofeng.ling@intel.com> [Sun, 12 Mar 2006 15:07:40 +0100] rev 1890
fix contrib/mercurial.spec for hgext
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 13:57:55 +0100] rev 1889
Try to import extensions from the hgext module first.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 12 Mar 2006 12:29:03 +0100] rev 1888
Make bash_completion more robust for e.g. broken hgrc or old hg installations.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 12 Mar 2006 11:32:03 +0100] rev 1887
new command debugcomplete
add a new command debugcomplete, it lists all the possible
completion for the specified command.
make the bash_completion script uses it instead of the awk code
TK Soh <teekaysoh@yahoo.com> [Sun, 12 Mar 2006 08:08:22 +0100] rev 1886
remove bashisms from tests
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 11 Mar 2006 21:33:19 -0800] rev 1885
run merge program in repo root.
before, merge program was run in user current directory. Well defined
location is better for scripts. no more need to pass HG_ROOT to merge
program now.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 23:34:36 -0800] rev 1884
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 23:34:02 -0800] rev 1883
give more info to hgmerge script.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 22:42:59 -0800] rev 1882
merge util.esystem and util.system.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 23:25:50 -0800] rev 1881
undo edit that was accident.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 22:24:19 -0800] rev 1880
fix broken environment save/restore when a hook runs.
move "run commend with different env/cwd" code out to function in util.
new function is called esystem.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 20:06:41 +0100] rev 1879
make clean now removes generated documentation.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 19:16:49 +0100] rev 1878
Make #!/usr/bin/env python in test-bdiff run the specified python version.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Mar 2006 08:31:31 -0800] rev 1877
change lock format to let us detect and break stale locks.
old style: symlink to pid
new style: symlink to hostname:pid
if lock code finds new-style lock, it breaks lock if locking pid is on
same machine and pid is not alive.
otherwise, lock is left alone. this makes locking code safe with
old-style locks and with locks on other machines.
new code makes server part of mercurial more robust in case machine
crashes, power fails, or crazy user does kill -9.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 11:34:02 +0100] rev 1876
Catch hgrc interpolation errors nicely.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 11:33:28 +0100] rev 1875
Catch other exceptions (e.g. util.Abort) in parse(), too.
This has the benefit of removing duplicate catching of AmbiguousCommand
and UnknownCommand, and keeping all exception handling together.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 11:06:45 +0100] rev 1874
Inherit config from real parentui and don't use ConfigParser internals.
Added comments for the meaning of parentui.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 10 Mar 2006 10:44:17 +0100] rev 1873
Added check for minimal python version to setup.py
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 09 Mar 2006 16:27:21 -0800] rev 1872
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 09 Mar 2006 16:26:49 -0800] rev 1871
patchbomb: ignore exception if pager quits.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 09 Mar 2006 12:18:59 -0800] rev 1870
make push over http print good error message.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Mar 2006 08:27:49 +0100] rev 1869
Reordered options for remove, fixed synopsis for rename.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 08 Mar 2006 18:48:40 -0800] rev 1868
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 08 Mar 2006 15:14:24 -0800] rev 1867
add -f/--force to remove command.
else to remove modified file, must use "hg revert; hg rm"
or "rm; hg rm --after".
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 08 Mar 2006 14:53:57 -0800] rev 1866
inherit hgrc so "%" interpolation works.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 08 Mar 2006 11:21:45 -0800] rev 1865
merge with crew.
Lee Cantey <lcantey@gmail.com> [Wed, 08 Mar 2006 11:20:39 -0800] rev 1864
Fix manifest view on Windows
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 19:31:54 +0100] rev 1863
Removed script header from mq.py
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 19:30:30 +0100] rev 1862
Moved bisect extension to hgext folder.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 19:25:03 +0100] rev 1861
Added copyright information to hbisect.py
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 06:20:32 +0100] rev 1860
Merged tah and crew
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 06:13:24 +0100] rev 1859
Moved --cwd handling in front of -R handling again. Shorter code for initial -R.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 01:30:43 +0100] rev 1858
Make hg paths and hg debugconfig work with -R/--repository option.
Commands that can use a repo, but don't need one, should be added
to the "optionalrepo" string, similar to the "norepo" string.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 01:25:14 +0100] rev 1857
Always try to open the repository if -R/--repository is specified.
This makes 'hg -R something_unknown command' consistently fail for
all commands, not only for those who need a repository.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 05:31:20 +0100] rev 1856
Make bisect extension work with python2.3
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 05:16:36 +0100] rev 1855
Fixed spacing/indentation, removed #! script header, added short description.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 05:07:20 +0100] rev 1854
Fixed contrib/hbisect.py to work with the new opener behaviour.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 08 Mar 2006 00:27:23 +0100] rev 1853
Fix some problems when working on broken repositories:
Fix tracebacks in hg verify for certain repo errors.
Print compression type byte encoded safely.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Mar 2006 22:41:24 +0100] rev 1852
Fix mq's usage of opener, which don't allow absolute paths now.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 07 Mar 2006 22:27:18 +0100] rev 1851
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Mar 2006 08:46:19 +0100] rev 1850
Hide debug commands in ambiguous command list, unless no normal command matches.
This will execute diff if 'hg d' is typed and hide rawcommit on 'hg r'.
Based on a patch by TK Soh.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Mar 2006 08:41:13 +0100] rev 1849
Show ambiguous aliases, if they are not simple abbreviations. Sort output.
TK Soh <teekaysoh@yahoo.com> [Tue, 07 Mar 2006 08:05:17 +0100] rev 1848
show choices on ambiguous commands
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 07 Mar 2006 20:37:27 +0100] rev 1847
fix annotate for removed files
walk in the manifest files instead of the working dir files
when running annotate
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 06 Mar 2006 21:06:53 -0800] rev 1846
only put numbers on patches if > 1 patch.
Lee Cantey <lcantey@gmail.com> [Mon, 06 Mar 2006 21:05:18 -0800] rev 1845
Patchbomb only sends introductory message [0 of N] if there are multiple patches.
Lee Cantey <lcantey@gmail.com> [Mon, 06 Mar 2006 21:03:46 -0800] rev 1844
Remove patchbomb from list of contrib files to install since it's now an extension.
Innosetup script was referencing old contrib location.
Also cosmetic change to group related files.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 23:16:42 +0100] rev 1843
Removed PKG-INFO from repository, because it already gets auto-generated.
Canonical place for changing the contained info is setup.py.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 06 Mar 2006 10:50:26 -0800] rev 1842
merge with crew.
Eung-ju Park <eungju@gmail.com> [Mon, 06 Mar 2006 10:49:34 -0800] rev 1841
Fix py2exe packagescan problem with new demandload
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 17:53:11 +0100] rev 1840
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 17:47:41 +0100] rev 1839
Create local ui object per repository, so .hg/hgrc don't get mixed.
This is needed for hooks, but may be important for other settings, too.
Fixes issue113, also integrated push-hook-lock.sh as a test case for this.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 06 Mar 2006 17:34:49 +0100] rev 1838
Call hooks in alphabetical (=defined) order, of course still grouped by type.
Output of test-hook adjusted.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 06 Mar 2006 08:35:15 -0800] rev 1837
make ui flush output. this makes error happen if printing to /dev/full.
before this change, error happened with some pythons, but not others.
now always happens.
fixes issue 155.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sun, 05 Mar 2006 01:37:28 -0800] rev 1836
make lock module use demandload.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 04 Mar 2006 19:01:45 +0100] rev 1835
Validate paths before reading or writing files in repository or working dir.
Fixes security relevant issue134.
Lee Cantey <lcantey@gmail.com> [Fri, 03 Mar 2006 13:41:12 -0800] rev 1834
Fixes running 'hg serve' with Windows executable and no explicit template path configured.
PY2EXE executables don't support __file__ but do place the directory of the
shared code library into sys.prefix.
Fixes bug 152.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 13:24:26 -0800] rev 1833
i made a mistake in last change.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 13:11:25 -0800] rev 1832
generate profile even when exception raised.
otherwise, is not possible to profile hg serve.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 09:40:18 -0800] rev 1831
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 09:39:37 -0800] rev 1830
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 10 Feb 2006 11:25:07 -0800] rev 1829
hgwebdir: export collections of repos
now you can use [collections] section in hgweb.config to export entire
tree of repos.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Mar 2006 08:44:37 -0800] rev 1828
merge with crew.
Vadim Gelfer <vadim.gelger@gmail.com> [Thu, 02 Mar 2006 11:38:39 -0800] rev 1827
get patchbomb extension to use demandload. speeds up hg startup by 50%.
Vadim Gelfer <vadim.gelger@gmail.com> [Thu, 02 Mar 2006 11:38:03 -0800] rev 1826
rewrite demandload module to be more flexible.
performance not affected.
old demandload module could only import top-level modules like os and
sys.
with rewrite, all of following syntax is emulated perfectly:
import foo, bar foo bar
import foo.bar.quux foo.bar.quux
from foo.bar import quux, blurfl foo.bar:quux,blurfl
only thing missing is "import foo as bar".
also, namespace clashes between placeholder object and demand loaded
module are no longer possible.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Mar 2006 09:17:04 +0100] rev 1825
Make hgweb.staticfile() more secure and portable.
Without this, files in directories next to the static directory starting
with 'static' could be retrieved, e.g. with '../static.private/foo'.
Additionally staticfile now generates platform specific pathnames from
the /-separated paths given in the URL.
Illegal file names (e.g. containing %00) now yield a sane error message.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 01 Mar 2006 21:44:00 -0800] rev 1824
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 01 Mar 2006 21:27:23 -0800] rev 1823
merge with crew.
Robin Farine <robin.farine@terminus.org> [Tue, 28 Feb 2006 23:47:40 -0800] rev 1822
copy/rename to a removed destination file
When the destination of a copy or rename operation has been
marked for removal, we need to restore it before we overwrite
it with the new content. This also handles the case of
idempotent renames, i.e.
hg rename "a" "b"
hg rename "b" "a"
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 15:29:13 +0100] rev 1821
Catch urllib errors for old-http in a nicer way.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 01 Mar 2006 14:52:28 +0100] rev 1820
Really fix bash_completion on Solaris. Maybe. Hopefully.
Use substr instead of sub.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:19:27 +0100] rev 1819
Regenerate hg.1.gendoc.txt if commands.py changed.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:14:25 +0100] rev 1818
Make the deprecated rawcommit an alias of debugrawcommit.
This way it doesn't show up in the non-debug help.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:09:50 +0100] rev 1817
Ignore generated documentation
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Mar 2006 09:08:56 +0100] rev 1816
Updated help synopsises and reordered some options. Dropped [-n] from revert.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Mar 2006 01:45:05 +0100] rev 1815
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Feb 2006 00:48:49 +0100] rev 1814
generate hg manpage from commands.py docstring
gendoc.py is a script generating a part of the manpage (the commands
help and options) from the docstring in commands.py.
It avoids duplicating the doc between the doc/ directory and the docstrings.
To generate the manpage, 'make doc' will create all the necessary intermediate
files.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 28 Feb 2006 23:26:44 +0100] rev 1813
Merged automatic doc generation from tonfa.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Feb 2006 22:50:49 +0100] rev 1812
fix the synopsis of some commands, mark rawcommit as deprecated in short help
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 28 Feb 2006 00:46:06 +0100] rev 1811
resync commands.py docstrings with hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 28 Feb 2006 23:25:34 +0100] rev 1810
Whitespace, tab and formatting cleanups, mainly in mq.py
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 28 Feb 2006 23:19:47 +0100] rev 1809
Updated test-commit to match changed output caused by nested transactions.
mason@suse.com [Tue, 28 Feb 2006 12:25:26 -0600] rev 1808
Add mq extension
mason@suse.com [Tue, 28 Feb 2006 12:25:10 -0600] rev 1807
Allow repo lock to be passed in to localrepo.commit for performance
mason@suse.com [Tue, 28 Feb 2006 12:24:54 -0600] rev 1806
Automatic nesting into running transactions in the same repository.
This associates a transaction handle with a given repository object, and
any additional calls to start new transactions reuse that transaction.
For the 2700 patch import run, this brings the system time down from
1m20s to 50s, mostly by skipping backups of the dirstate file.
(note, this patch does not change hg import to use the nested transaction,
mq is the only user right now)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 28 Feb 2006 11:49:35 -0600] rev 1805
Fix bash_completion on Solaris
TK Soh noticed that the awk that ships with Solaris doesn't allow you
to define new functions. According to
http://www.shelldorado.com/articles/awkcompat.html
it looks like it also doesn't have some other stuff that we were using,
like deletion of an array element and gsub.
Rewrite the parsing of hg --debug help to work around that. This
version doesn't filter aliases that are simple abbreviations for debug
commands (not a big problem, since there are none right now).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 26 Feb 2006 16:23:14 +0100] rev 1804
refactor the dodiff optimization
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 26 Feb 2006 02:26:17 +0100] rev 1803
speed up hg log --patch
Changing dodiff to read the manifest/changelog for node1 before calling
repo.update allows us to take advantage of the revlog revision cache.
Before this patch and my previous "speed up hg log --debug" patch, when
using hg log -p to display three revisions (A, B and C), dodiff and
repo.changes would end up reading the manifests in this order:
B A B A C B C B
With both patches, this order becomes:
A A B B B B C C
(This considers only dodiff and repo.changes. I'm not sure how other
parts of hg log enter the picture.)
The speed up will depend on the revisions being displayed. (All
"before" times already have my previous "speed up hg log --debug" patch
applied.)
hg repo (tip = 414e81ae971f). hg log -p
before after
real 0m50.981s 0m45.279s
user 0m47.930s 0m42.560s
sys 0m2.526s 0m2.523s
output size: 6917897 bytes
kernel repo (tip = 9d4e135960ed). hg log -p -l64
before after
real 2m14.995s 1m45.025s
user 2m9.509s 1m33.900s
sys 0m3.663s 0m2.942s
output size: 31497621 bytes
same kernel repo. hg log -p -l64 -r c84c2069592f:0
before after
real 1m48.045s 1m0.076s
user 1m44.094s 0m58.492s
sys 0m2.603s 0m1.103s
output size: 197983 bytes
c84c2069592f was the tip of a 10 day old kernel repo that I had lying
around and was where I first tested this patch. For some weird
coincidence it's also a place where the patch makes a huge difference.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 25 Feb 2006 13:44:40 +0100] rev 1802
speed up hg log --debug
hg repo:
before:
real 0m6.998s
user 0m6.952s
sys 0m0.046s
after:
real 0m3.884s
user 0m3.839s
sys 0m0.042s
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Feb 2006 20:25:18 +0100] rev 1801
on revert, only undele files that are removed in the dirstate
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 22:47:40 +0100] rev 1800
Removed now obsolete min/max check in walkchangerevs().
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 22:37:29 +0100] rev 1799
Replaced fixed window size for walkchangerevs with an increasing one. Window
sizes starts at 8 (for good interactiveness) and doubles with each window
until it is 512, which seems to be the maximum efficient value.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Thu, 23 Feb 2006 18:10:04 +0100] rev 1798
hgmerge: do not use file with markers in tools merging themselves
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 14:42:47 +0100] rev 1797
Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 23 Feb 2006 12:35:15 +0100] rev 1796
Fixed wrong (copy&paste) usage of tmpl instead of self.t in hgweb.
Lee Cantey <lcantey@gmail.com> [Thu, 23 Feb 2006 12:02:39 +0100] rev 1795
Fix 'hg serve' not using CSS.
hgweb.py (templatepath): Return normalized path [fixes later checks in staticfile()]
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 23 Feb 2006 02:17:08 +0100] rev 1794
only write the dirstate when something changed
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 09:14:46 +0100] rev 1793
Allow serving static files from hgwebdir to fix CSS and favicon.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 08:32:51 +0100] rev 1792
Cleanup of tabs and coding when sending content type.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 08:11:52 +0100] rev 1791
Merge with jeffpc's hg-static
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 22 Feb 2006 01:06:17 -0500] rev 1790
[hgweb] Added favicon to standard/gitweb templates
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 08:04:46 +0100] rev 1789
Merge with mercurial/tonfa
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 23:50:53 +0100] rev 1788
change the default timeout to 600 seconds
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 23:21:15 +0100] rev 1787
add a timeout when a lock is held (default 1024 sec)
- change the wait keyword from lock.lock to timeout,
a negative timeout of means "wait forever"
- refactor the two lock functions from localrepo.py
- make them use the timeout (default 1024, can be changed
with ui.timeout in the config file
- update the doc
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 07:51:32 +0100] rev 1786
Don't use mktemp in tests, we're already in a secure temp dir.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 22 Feb 2006 07:45:14 +0100] rev 1785
Added test cases for repo corruption fixed in 2e0a288ca93e (issue132)
(submitted by Alexis S. L. Carvalho <alexis@cecm.usp.br>)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Feb 2006 07:26:29 +0100] rev 1784
revalidate revlog data after locking the repo (issue132)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 22 Feb 2006 05:21:09 +0100] rev 1783
merge with matt
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 16:46:38 +0100] rev 1782
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Feb 2006 21:11:57 +0100] rev 1781
add an optional argument to push only the specified revisions (push -r)
Matt Mackall <mpm@selenic.com> [Tue, 21 Feb 2006 17:36:27 -0600] rev 1780
Merge with jeffpc
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 22:24:42 -0500] rev 1779
Merge with mpm
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 22:01:09 -0500] rev 1778
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sat, 18 Feb 2006 21:53:41 -0500] rev 1777
[hgweb] Static content serving
Josef "Jeff" Sipek <jeffpc@optonline.net> [Tue, 14 Feb 2006 21:55:05 -0500] rev 1776
Merge
Matt Mackall <mpm@selenic.com> [Tue, 21 Feb 2006 15:48:49 -0600] rev 1775
Merge with crew
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:22 -0600] rev 1774
hgmerge: add meld support
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:19 -0600] rev 1773
hgmerge: improve "apps not found" message
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:16 -0600] rev 1772
hgmerge: logic changes
Details:
- keep automatic merge conflicts in $LOCAL
- do not assume that $EDITOR returns proper error code
- fix a slight mistake in diff+patch merge success detection
(it could succeed if the $EDITOR failed to run)
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:12 -0600] rev 1771
hgmerge: add and use ask_if_merged function
This patch, unlike the earlier ones, doesn't use unportable select builtin.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:09 -0600] rev 1770
hgmerge: fix diff+patch detection; cleanups
Details:
- actually show help message when no tools are found
- whitespace cleanup (stupid emacs)
- quote more variables
- simplify merge/diff3 error handling
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 16:04:47 +0100] rev 1769
Merged RSS feed for tags from Peter van Dijk
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 11:23:34 +0100] rev 1768
add rss link to tags page
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 02:21:28 +0100] rev 1767
implement entriesnotip for tags in hgweb.py ; change entries to entriesnotip in templates/tags-rss.tmpl
Peter van Dijk <peter@dataloss.nl> [Thu, 02 Feb 2006 12:00:45 +0100] rev 1766
tags-rss support; still shows tip
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 15:54:50 +0100] rev 1765
hg log --limit shouldn't count unprinted revisions (found by TK Soh)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 15:37:23 +0100] rev 1764
Cleanup: Put initialization of br in front of --branches option handling.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 13:14:03 +0100] rev 1763
Make option --branch vs. --branches more consistent.
As you can abbreviate --branches to --branch, old scripts using the long
name will still work.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 21 Feb 2006 12:59:16 +0100] rev 1762
Add option -b/--branch to hg tip (as done for hg parents).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 08:11:46 +0100] rev 1761
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Feb 2006 00:45:02 +0100] rev 1760
fix typo in debugrebuildstate
Fabian Otto <sigsegv@alchiba.ni.cs.tu-berlin.de> [Mon, 20 Feb 2006 15:58:04 -0600] rev 1759
Sunpro compiler patch
The compiling runs through without warning, but runnig the newly builded
hg emmits a message:
| ImportError: ld.so.1: python: fatal: relocation error:
| file /opt/local/lib/python2.3/site-packages/mercurial/bdiff.so:
| symbol cmp: referenced symbol not found
Removing the inline infront of cmp corrects this error message.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 20 Feb 2006 11:09:25 -0800] rev 1758
add options to log man page.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 20 Feb 2006 11:07:09 -0800] rev 1757
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 20 Feb 2006 11:06:41 -0800] rev 1756
add -l,--limit to log command.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 20 Feb 2006 19:04:56 +0100] rev 1755
add 'debugrebuildstate' to rebuild the dirstate from a given revision
- added and removed files will be lost while recreating the dirstate
- modifications are not lost
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 20 Feb 2006 01:12:03 +0100] rev 1754
use repo.lock when cloning via copy, use lock.LockException when necessary
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 20 Feb 2006 01:09:40 +0100] rev 1753
Raise a different exception when the lock is not available
When the filesystem is read-only or if we have some other
error, there is no need to wait.
Raise a lock.LockUnavailable exception.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 22:41:49 +0100] rev 1752
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 22:39:09 +0100] rev 1751
localrepo: refactor the locking functions
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 21:44:32 +0100] rev 1750
make test-pull-permission cleanup correctly in case of errors
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 19:43:03 +0100] rev 1749
fix warnings from pychecker (unused variables and shadowing)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 19 Feb 2006 18:59:20 +0100] rev 1748
bisect: fix for recent changes disallowing "false" merges
Robin Farine <robin.farine@terminus.org> [Sat, 18 Feb 2006 07:37:59 -0800] rev 1747
transitive copy/rename
Add support for transitive copy or rename operations, e.g.
hg rename a b
... (possibly edit b)
hg rename b c
hg commit ...
by actually renaming "b" as "c" while recording a copy of
"a" to "c" and a removal of "a".
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Feb 2006 16:31:02 +0100] rev 1746
Fixed misleading indentation in mpatch.c
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 21:56:15 -0800] rev 1745
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 21:55:33 -0800] rev 1744
make server tests use --daemon.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Feb 2006 06:50:22 +0100] rev 1743
Merge with upstream
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Feb 2006 05:40:08 +0100] rev 1742
Added help string for --daemon-pipefds
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 16:32:07 -0800] rev 1741
stop read end of pipe from staying open forever in child process.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 16:29:30 -0800] rev 1740
add --daemon option to serve command. for issue 45.
code looks odd because it is portable to windows. windows does not have
os.fork, so have to spawn and use pipe to tell parent ready instead.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Feb 2006 17:41:23 -0600] rev 1739
AmbiguousCommand is raised too soon.
Right now, hg raises AmbiguousCommand as soon as it finds two
commands/aliases that start with the substring it's searching for, even
though it may still find a full match later on.
This is a bit hard to hit on purpose, because hg checks the list of
commands in whatever order is returned by table.keys(), which will
change when you add an alias to a command. You should be able to hit it
by adding an alias "u" to the "identify" command - not that that makes a
lot of sense...
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 17 Feb 2006 17:41:18 -0600] rev 1738
Don't hard-code /tmp in test-ro-message
This makes the test succeed when $TMPDIR is set.
Matt Mackall <mpm@selenic.com> [Fri, 17 Feb 2006 17:39:05 -0600] rev 1737
Merge with crew
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 17 Feb 2006 08:26:21 -0800] rev 1736
add preoutgoing and outgoing hooks.
preoutgoing lets prevent pull over http or ssh.
outgoing lets notify after pull.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 14:34:59 -0800] rev 1735
i forgot to change the test output for test-hook.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 09:56:31 -0800] rev 1734
tests for new hooks. fix things i found when writing tests.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 09:09:45 -0800] rev 1733
fix test-help diff options.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 08:51:24 -0800] rev 1732
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 15 Feb 2006 11:05:43 -0800] rev 1731
add -p option to tip. for issue 64.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 15 Feb 2006 10:49:30 -0800] rev 1730
add prechangegroup and pretxnchangegroup hooks.
prechangegroup lets you stop push, pull or unbundle before it begins.
pretxnchangegroup lets you inspect changegroup before transaction is
committed, and roll back if you not like it.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 15 Feb 2006 10:40:15 -0800] rev 1729
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 15 Feb 2006 10:39:47 -0800] rev 1728
add -w and -p options to diff. this is for issue 126.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 08:48:31 -0800] rev 1727
fix names of parent changeset ids in hooks.
fix hook part of man page.
Vadim Gelfer <vadim.gelfer@gmail.com> [Thu, 16 Feb 2006 08:40:47 -0800] rev 1726
prefix hook env var names with HG_.
old names are still provided, but doc says they deprecated.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 15 Feb 2006 22:37:28 +0100] rev 1725
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 15 Feb 2006 22:21:20 +0100] rev 1724
add a -b/--branch option to 'hg parents'
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 15 Feb 2006 14:22:16 +0100] rev 1723
Fix diff against an empty file (issue124) and add a test for this.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 15 Feb 2006 04:37:47 +0100] rev 1722
catch errors and throw exception with invalid binary patch data
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 17:13:18 -0800] rev 1721
add pretxncommit hook.
hook allows check of changeset after create, but before transaction
is committed. hook failure rolls transaction back.
makes place for local policies like commit message must contain bug id
or reviewer signoff.
change also adds parent changeset ids to commit hook environment,
because is cheap and useful.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 15:47:25 -0800] rev 1720
add pretag and tag hooks.
pretag hook lets hook decide how tags can be named. tag hook is
notifier.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 15:37:27 -0800] rev 1719
hook parameters must be strings.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 15:28:06 -0800] rev 1718
make hook code nicer.
pre hooks can raise exception if fail.
tidy up better if exception raised (like KeyboardInterrupt) when running
hook program.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 14 Feb 2006 15:10:45 -0800] rev 1717
hooks run after transactions finish must not affect method results.
Matt Mackall <mpm@selenic.com> [Fri, 17 Feb 2006 17:23:53 -0600] rev 1716
Refactor excessive merge detection, add test
Matt Mackall <mpm@selenic.com> [Mon, 13 Feb 2006 12:48:28 -0600] rev 1715
Revert convert-repo changes
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 11 Feb 2006 00:31:52 -0800] rev 1714
fix hgrc doc hook descriptions.
Daniel Santa Cruz <byteshack@gmail.com> [Fri, 10 Feb 2006 16:45:56 -0500] rev 1713
hooks: distinguish between locally committed and incoming changes.
"commit" hook is now for locally committed changes only.
"incoming" is for changes pulled, pushed, or unbundled into local repo.
mason@suse.com [Thu, 09 Feb 2006 17:18:43 -0600] rev 1712
Allow callers to pass in the dirstate lock in most localrepo.py funcs.
This makes it possible to take the lock once and commit a large number of
patches, without having to read and write the dirstate for each patch.
mason@suse.com [Thu, 09 Feb 2006 17:07:20 -0600] rev 1711
revlog.strip should clear the chunkcache
The chunkcache isn't valid after a strip, it needs to be cleared out.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 09:07:19 +0100] rev 1710
Show "(No help text available)" for commands without doc string.
Currently this only occurs with "hg help qcommit" from mq extension.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 07:24:34 +0100] rev 1709
Create default commit message in a more pythonic way.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 07:16:13 +0100] rev 1708
Removed "HG: manifest hash" line from commit message.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 07:14:05 +0100] rev 1707
Put the empty line in commit text above the branch merge line.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 09 Feb 2006 07:01:23 +0100] rev 1706
Run commit message editor in the repo root (like hooks).
This makes the hgeditor script work with hg commit -R path/to/repo
Johannes Stezenbach <js@linuxtv.org> [Tue, 07 Feb 2006 23:01:11 -0600] rev 1705
add changenav at bottom of page
if one reads through the changelog and wants to go to the
previous or next page one needs the navigation links at
the bottom, not at the top of the page
Johannes Stezenbach <js@linuxtv.org> [Mon, 06 Feb 2006 17:35:22 -0600] rev 1704
display revision numbers
revision numbers are useful for orientation when browsing
through the changelog
Johannes Stezenbach <js@linuxtv.org> [Mon, 06 Feb 2006 17:34:53 -0600] rev 1703
fix changenav for maxchanges != 10
for maxchanges = 25 the changelog navigation had a minimum
stepsize of 30; try to calculate more useful navigation steps
Johannes Stezenbach <js@linuxtv.org> [Mon, 06 Feb 2006 17:34:39 -0600] rev 1702
add --mbox output to patchbomb
add option to save generated mails in an mbox file for later
processing with formail, instead of sending them directly
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Mon, 06 Feb 2006 17:32:10 -0600] rev 1701
hgmerge: various cleanups
Details:
- put temporary file names into variables
- make all temporary file names end with random part
- cleanup FileMerge handling
- do not use hardlinks in FileMerge change test (breaks on FAT)
- try harder to keep file mtime unchanged in case of failed merge
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Mon, 06 Feb 2006 17:32:06 -0600] rev 1700
hgmerge: add cleanup functions
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Mon, 06 Feb 2006 17:32:00 -0600] rev 1699
hgmerge: add and use more tool variables
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
Matt Mackall <mpm@selenic.com> [Sun, 05 Feb 2006 22:21:02 -0600] rev 1698
Update copyright notice
Matt Mackall <mpm@selenic.com> [Sun, 05 Feb 2006 22:18:38 -0600] rev 1697
Merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 12:58:40 +0100] rev 1696
Merge with Peter van Dijk
Peter van Dijk <peter@dataloss.nl> [Fri, 03 Feb 2006 12:56:41 +0100] rev 1695
remove escaping from decriptions on repo index page
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 12:50:02 +0100] rev 1694
Added raw view for file annotate in hgweb.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 03 Feb 2006 11:54:16 +0100] rev 1693
hgweb/templates: remove unused vars from map-raw
annotateline contains html and it is unused
filenodelink is unused but should be defined
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 03 Feb 2006 11:54:12 +0100] rev 1692
hgweb/templates: no need to escape the '<' '>' and '&' in raw templates
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 11:43:49 +0100] rev 1691
Removed executable bit from patchbomb extension.
lcantey@gmail.com [Fri, 03 Feb 2006 11:29:39 +0100] rev 1690
Update version strings and add release notes to Windows specific files
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 10:54:58 +0100] rev 1689
Fall back to asciidoc6 html backend if html4 doesn't work.
This reenables building documentation on Debian sarge,
which broke after 9346a7fb3fe2.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 03 Feb 2006 10:52:25 +0100] rev 1688
Reverted name change (mercurial -> Mercurial) from dd5085897010.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Feb 2006 00:52:31 -0800] rev 1687
merge with crew.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 03 Feb 2006 00:50:28 -0800] rev 1686
make stuff for macos x binary package.
it is now easy to make prebuilt binary for macos x. i have no hosting
space. i hope someone else can make binaries.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 02 Feb 2006 19:22:27 +0100] rev 1685
extension gpg.py: really raise the exception in case of invalid data
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Feb 2006 08:16:17 +0100] rev 1684
Cleanup of spacing in bash_completion
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 02 Feb 2006 07:50:20 +0100] rev 1683
Use user specified path to hg in bash_completion
e.g. for multiple installs with different versions or extensions.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 20:20:27 +0100] rev 1682
fix an exception in gpg.py with multiples sigs for the same cset
- silly error, do not overwrite the variable we use for iterating
- correct 'hg help sign'
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 19:37:26 +0100] rev 1681
fixes for gpg.py extension
- add copyright and license
- add i18n
- add 'sigs' command behaving like 'hg tags'
- change 'role' to 'comment' and output it only if there is one
- refactoring
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 19:18:15 +0100] rev 1680
Merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Dec 2005 18:04:39 +0100] rev 1679
Merge with upstream
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 15 Dec 2005 18:04:05 +0100] rev 1678
reverting 11d12bd6e1dcd9610fa26e97d25e7ad553e8ffa5
passing local everywhere violate the layering
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 08 Dec 2005 15:12:02 +0100] rev 1677
cleanup of revlog.group when repository is local
revlog.group cached every chunk from the revlog, the behaviour was
needed to minimize the roundtrip with old-http.
The patch export the information that the repository is local or not
from the repository object down to the revlog.
Then it uses the workaround for old-http only if the repository is non-local.
The memory used server side when pulling goes down to less than 30Mo maximum
whereas without the patch more than 160Mo was used when cloning the linux kernel
repository.
The time used by cloning is roughly the same (although some caching could be
implemented if needed):
before
110.25user 20.90system 2:52.00elapsed 76%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+708707minor)pagefaults 0swaps
after
112.85user 22.98system 2:50.66elapsed 79%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+862862minor)pagefaults 0swaps
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 01 Feb 2006 12:55:01 +0100] rev 1676
Added missing space in output of gpg.py
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 08:50:45 +0100] rev 1675
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 01 Feb 2006 08:46:24 +0100] rev 1674
abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:14:48 -0800] rev 1673
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:14:23 -0800] rev 1672
add documentation for email command.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:13:03 -0800] rev 1671
forgot to add import statement for _.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:08:43 -0800] rev 1670
add _ to several strings
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 31 Jan 2006 08:06:35 -0800] rev 1669
turn patchbomb script into an extension module.
command name is now 'hg email'.
Josef "Jeff" Sipek <jeffpc@optonline.net> [Sun, 05 Feb 2006 20:52:55 -0500] rev 1668
[hgweb] Added rename information to gitweb templates & misc cleanups
Fixed up file log template's title
Removed double entry for filelogentry in gitweb map file
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2006 19:34:35 +1300] rev 1667
verify: notice extra data in indices
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2006 13:01:16 +1300] rev 1666
Added tag 0.8 for changeset 3a56574f329a368d645853e0f9e09472aee62349
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2006 12:04:36 +1300] rev 1665
Merge with crew
Brendan Cully <brendan@kublai.com> [Mon, 30 Jan 2006 12:02:12 +1300] rev 1664
Safer version of FileMerge merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 30 Jan 2006 12:02:06 +1300] rev 1663
return a non-zero exit code when a merge failed
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 29 Jan 2006 14:36:11 +0100] rev 1662
Added missing quote in warning text to tests, too.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 29 Jan 2006 14:33:12 +0100] rev 1661
Added missing quote in warning text.
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 20:30:41 +1300] rev 1660
Fix revlog signature check for empty revlogs
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 20:27:58 +1300] rev 1659
Add revlog version signature check
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 20:13:43 +1300] rev 1658
doc: clone and outgoing point to pull for valid path docs
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 19:06:42 +1300] rev 1657
deprecate the rawcommit command
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 18:38:56 +1300] rev 1656
convert-repo: use commit rather than rawcommit
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 17:22:03 +1300] rev 1655
convert-repo: automatically create empty map file
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 29 Jan 2006 17:12:31 +1300] rev 1654
deprecate the use of 'hg tag NAME [REV]'
add some tests and some doc
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 17:10:38 +1300] rev 1653
hgweb: show copy/rename links in file history
Peter van Dijk <peter@dataloss.nl> [Sun, 29 Jan 2006 00:31:11 +0100] rev 1652
unbreak templates/summary-gitweb.tmpl
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 12:23:52 +1300] rev 1651
Fix comment syntax
Peter van Dijk <peter@dataloss.nl> [Sun, 29 Jan 2006 00:18:52 +0100] rev 1650
changed template escape filter, added urlescape filter; audited all templates for insertion bugs; added note to manifest.py about newlines in filenames
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 11:17:54 +1300] rev 1649
hgweb: fix breakage on manifest subdirs from path cleaning
Petr Mazanec <petr.mazanec@tiscali.cz> [Sun, 29 Jan 2006 10:10:16 +1300] rev 1648
Process working files through encode filters in dodiff()
Christian Ebert <blacktrash@gmx.net> [Sun, 29 Jan 2006 10:10:00 +1300] rev 1647
Use of opendiff as merge program on MacOS X
Hello,
If one has the developer tools installed on MacOS X there's
another alternative for the merge program.
Invocation could be done somehow like in the attached patch for
hgmerge.
Matt Mackall <mpm@selenic.com> [Sun, 29 Jan 2006 09:10:13 +1300] rev 1646
Clean up paths passed to hgweb
(spotted by Peter van Dijk)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 29 Jan 2006 08:38:31 +1300] rev 1645
add removed files to the changelog file list
- this should allow better detection of removed file
when walking in the history (like hg log)
it doesn't help for the fast path of hg log where
we only look at the filelog
- users of the changelog file list shouldn't assume
anymore that the file still exist (anyway it won't
be found in the manifest like in 5ecf05541e11)
- fix the tests (some hashes changed)
mason@suse.com [Sat, 28 Jan 2006 17:16:15 +1300] rev 1644
Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:15:39 +0100] rev 1643
bash_completion: ignore hg help error messages
They are usually not useful when you're completing stuff and end up
cluttering the screen.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:11:14 +0100] rev 1642
bash_completion: always use single quotes with compgen -W
This avoids a bug in bash 2.05a
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 27 Jan 2006 12:10:35 +0100] rev 1641
bash_completion: be more careful about whitespaces
- use awk to parse the output of hg help.
- print one completion candidate per line
- print the debug commands after regular commands
(this eases the shell side of the parsing)
- don't print aliases that are simple abbreviations
(e.g. up/update, id/identify)
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Jan 2006 16:37:31 +0100] rev 1640
Added hint to hg-ssh that you can use shell pattern matching.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 26 Jan 2006 15:07:46 +0100] rev 1639
_hg_status improvements in bash_completion:
- Use "hg status -n" option instead of cut command.
- Sort status flags accoring to "hg status --help"
- Show deleted files instead of "hg remove"d for "hg remove"
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 26 Jan 2006 14:52:26 +0100] rev 1638
bash_completion: small updates and fixes
- $result in _hg_commands is not an array
- use "hg status ."
- update "hg cat" completion
- let bash itself generate the default completion
mason@suse.com [Tue, 24 Jan 2006 15:02:10 +1300] rev 1637
Add new bdiff based unidiff generation.
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 14:49:19 +1300] rev 1636
contrib: add Chris Mason's stand-alone diff tool
This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
efiring@manini.soest.hawaii.edu [Tue, 24 Jan 2006 13:59:11 +1300] rev 1635
Fix rcpath for hgwebdir case (sys.argv is empty)
Robin Farine <robin.farine@terminus.org> [Tue, 24 Jan 2006 13:59:01 +1300] rev 1634
copy & rename can ignore removed source files
As mercurial now distinguishes deleted files from removed files,
we can skip removed source files while copying or renaming.
Robin Farine <robin.farine@terminus.org> [Tue, 24 Jan 2006 13:57:09 +1300] rev 1633
copy/rename '.' or '..' correctly
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 13:50:40 +1300] rev 1632
Merge with Eric
Matt Mackall <mpm@selenic.com> [Tue, 24 Jan 2006 13:49:20 +1300] rev 1631
Merge with crew
Eric Hopper <hopper@omnifarious.org> [Fri, 20 Jan 2006 09:35:43 -0800] rev 1630
This fixes a bug that Chris Mason found. As for a test case, I can't
think of one. It's a very weird case. Basically, if there is a file
listed as changed in the changelog entry, but not showing up in any
of the associated manifest entries, hg would abort when trying to
create a changeset. Now it just decides the file must not have any
versions relevant to the changeset.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 22 Jan 2006 18:54:25 +0100] rev 1629
Copy manifest map before modifying it (see issue86)
Matt Mackall <mpm@selenic.com> [Mon, 23 Jan 2006 16:36:44 +1300] rev 1628
[hgweb] Prevent search engine bots from indexing the entire repository
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Jan 2006 17:07:48 +0100] rev 1627
fix for hgweb.filterfiles
some variable weren't converted, fix a possible out of range error
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 18 Jan 2006 16:55:05 +0100] rev 1626
make the order of the arguments for filterfiles consistent
fix a bug where the order was reversed
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 17 Jan 2006 16:10:22 +0100] rev 1625
correct the relative path when walking from a subdir
- yield the correct relative path when walking from a subdir
(regardless the walk is repo-wide or not)
- have a consistent output from all commands: filename are
absolute when no patterns are specified and relative otherwise.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jan 2006 16:00:55 +0100] rev 1624
Added test for relative paths and all status flags for 'hg status'
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jan 2006 15:03:47 +0100] rev 1623
Added test for the currently broken addremove with the expected output.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 16 Jan 2006 15:51:09 +0100] rev 1622
fix locate broken since 63799b01985c
- fix the keyword arguments for walk in commands.locate
- implement 'hg locate -r <rev>'
- add a test for 'hg locate'
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 21:55:19 +0100] rev 1621
Restored old behaviour for 'hg co' and 'hg co -C' for removed files.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 21:02:38 +0100] rev 1620
Adjusted all but one test output for the new behaviour of localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 13:58:36 +0100] rev 1619
Distinguish removed and deleted files. Tests are not fixed yet.
hg status will now show "R filename" for "hg rm"ed files and
"! filename" for files which were deleted manually.
Manually deleted files are considered unmodified.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 13:35:09 +0100] rev 1618
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 12:22:28 +0100] rev 1617
Make localrepo.changes() internally distinguish between removed and deleted.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 12 Jan 2006 11:32:07 +0100] rev 1616
Cleaned up localrepo.changes()