context.py: various fixes - use a normal changeset instead of a context - define _filenode instead of _node to match the else clause

context.py: filectxs was using a keyword arg, add it to filectx

context.py: self.repo is not defined, change to self._repo

walkchangerevs: fix race in fast path do not yield revs if the corresponding cl entry does not exists, it avoids a race in the fastpath (where we walk in the filelog) with an ongoing transaction.

mention the bts for bug reporting in traceback message

expand the path if destination is not a directory

fix problem with uncompressed clone and python 2.3.

rename stream hgrc option to compressed.

clone: disable stream support on server side by default. enable in hgrc like this: [server] stream=True

clone: change name of --stream to --uncompressed. mpm asked for this.

update test-backout.out

merge with crew

fix bug introduced in b13a98bd078e

merge.

contrib: add sample.hgrc

backout: allow backout of merge changeset with --parent option. --parent allows to choose which parent of merge to revert to.

clone: do not make streaming default. add --stream option instead.

add support for streaming clone. existing clone code uses pull to get changes from remote repo. is very slow, uses lots of memory and cpu. new clone code has server write file data straight to client, client writes file data straight to disk. memory and cpu used are very low, clone is much faster over lan. new client can still clone with pull, can still clone from older servers. new server can still serve older clients.

Add merge to list of required tools.

Fix sed expression for OS X and Solaris 2.6. Matches previous fixes in other tests.

util.parsedate should understand dates from hg export

merge with mathieu clabaut.

HGcommand.vim : HGCommandEnableBufferSetup on by default

HGcommand.vim : HGGetStatusLine accept to display an empty 'branch' value

HGcommand.vim : suppress CVS relief

HGcommand.vim : doc review.

HGcommand.vim : doc integration

contrib/hgsh: make to work with remote clone over ssh.

move most of tag code to localrepository class.

clean up trailing white space.

Added tests for local and remote init. This tests the changes done in edb66cb05ded and b898afee9d0d.

Add ui method to set --ssh/--remotecmd, use it in init/clone/pull/push/in/out. The only user visible change is that 'hg init' now accepts this options, too.

clone: move code into hg module. make doc better. api in commands module is still same, but version in hg is best for calling within python now.

merge with crew.

parse url schemes more strictly. previous code mistook repo named "hg" for scheme named "hg".

add missed tests for diff -b/-B

merge with crew.

Vim script: Adaptation from CVS to Mercurial

Addition of CVScommand vim script as a base for HGcommand

Additional information about URLs in pull/push/clone/init: - clone to ssh:// - init via ssh:// - example for pull from an absolute directory via ssh:// - push to http:// and https://

disambiguate help about url syntax

merge with crew.

darcs2hg: pause and resume support, date extraction from commit hash, does not break on empty commits

darcs2hg: improved logging

darcs2hg.py: use darcs patch hash as patch identifier The use of the patch name is dangerous when duplicate names exist. In case of a duplicate name the second patch and all its dependancies are merged into a single mercurial patch. The patch identifier (hash) is always unique.

merge with crew

adding local_hostname option to smtp configuration

Respect "Connection: close" headers sent by HTTP clients. A HTTP client can indicate that it doesn't support (or doesn't want) persistent connections by sending this header. This not only makes the server more compliant with the RFC, but also reduces the run time of test-http-proxy when run with python 2.3 from ~125s to ~5s (it doesn't affect it with python 2.4, which was already ~5s).

allow use of extensions in python hooks extensions are loaded with hgext_ prefix, try to use them if the module is not found in the normal path

diff: add -b/-B options

use __contains__, index or split instead of str.find str.find return -1 when the substring is not found, -1 evaluate to True and is a valid index, which can lead to bugs. Using alternatives when possible makes the code clearer and less prone to bugs. (and __contains__ is faster in microbenchmarks)

coding style: use spaces instead of tabs

bdiff: improve worst case behavior by 100x. on 5.8MB (244.000 lines) text file with similar lines, hash before this change made diff against empty file take 75 seconds. this change improves performance to 0.6 seconds. result is that clone of smallish repo (137MB) with some files like this takes 1 minute instead of 10 minutes. common case of diff is 10% slower now, probably because of worse cache locality. but diff does not affect overall performance in common case (less than 1% of runtime is in diff when it is working ok), so this tradeoff looks good.

Changed default timeout for run-tests.py from 30 to 180 seconds. As e.g. test-http-proxy already takes quite some time (about a minute here) and tests usually should clean up after themselves, the timeout should only be hit in case of other problems.

Redirect MacPython link to point to python.org

merge with mpm.

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.

tests: record few more daemon pids to be safe

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.

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.

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.

Fix annotate breakage

Merge context patches

Convert hg annotate to context api

convert hg cat to new context api

Add context helper functions to localrepo

Add context.py: changeset and file revision contexts

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.

revlog: make lookup handle binary nodes

revlog: handle integer arguments to lookup

templater.firstline should handle empty strings

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.

Fix push over https. Without this patch, python gives me a TypeError: write() argument 1 must be string or read-only buffer, not file

Allow http://user@example.com URLs (i.e. without passwords)

hg.py: move exception handling code to try to avoid hiding errors

help: add help to mq extension

help: make "hg help EXTENSION" work

Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)

merge with crew.

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.

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.

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.

test-webraw: do not store hostname in test output

str.rsplit does not exist in python 2.3

Merge with crew.

Added missing space in continued string.

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.

Use more compatible `cmd` instead of $(cmd) in test-http-proxy

Don't change $PATH (breaks python in other locations) and $PWD in test-oldcgi

Don't use non-sh declare in test-oldcgi.

Merged WSGI fixes from http://hg.omnifarious.org/~hopper/webmerc/

Cleanup hgweb and hgwebdir's run method a bit.

Fix hgwebdir to run hgweb using run_wsgi.

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.

Arrange for old copies of CGI scripts to still work.

Fix raw files in the web UI.

Create a test to make sure old CGI scripts will still work.

Add a test for getting raw files via the web UI.

Merge with crew.

Wait for first pull to be completed before doing verify.

Some systems are slower ... give 'em some time/

Workaround to work with less sophisticated sed versions. For example NetBSD sed doesn't know about '\|'.

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.

mq: Added help for qcommit, consistently talk about queue repository.

hgk: Don't choke on empty changelogs

add more testcases for date parsing

validate the resulting date in parsedate

Allow the use of human readable dates (issue 251)

add -r/--rev arguments to incoming and outgoing

make changeset outputted by the raw template to be closer to 'hg export'

add a new template function 'hgdate' 'hgdate' turns a date into a cset timestamp as printed by 'hg export'

mercurial.el: fix misleading indent of code. code was correct, indent was wrong.

mercurial.el: inhibit backups for files managed by mercurial

Update Mac OSX installer to 0.9 with Universal Python build

import: make help clearer. suggested by asak.

Really fix http headers for web UI and issue 254. This also arranges for static content to allow a keepalive connection.

import: added tests, fixed bugs found by tests and asak.

mq: fix qparents to return the correct parent when no patches are applied

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.

merge with crew.

merge with wsgi changes.

Put support for persistent connections back in.

Fix two small bugs that would've prevented the web interface and IPv6 from working.

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

Fix server to set up a more WSGI compliant environment.

import: parse email messages

Don't require opts['dry_run'] to be set to fix external tools like tailor.

Allow using default values with ui.configlist, too, and add a test for this.

Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist.

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.

Added ui.configlist method to get comma/space separated lists of strings. For example: users = alice, bob colors = red green blue

Fix ui.expandpath problem and broken test introduced by 4a2a4d988ead.

do not try to package lsprof if not available.

add test for default-push.

make ui.expandpath better with default path.

push, outgoing, bundle: fall back to "default" if "default-push" not defined

print message after backout that tells that backout adds new head.

Test case for #295

Fix localrepo.changes() Correctly decide if we are diffing the working dir

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

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.

mq: add qimported patches if patch dir is a repo

Test case for #294

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.

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.

remove duplicate code.

Fixed conditional include of stdint.h for windows/msvc6/python2.3 environment.

Fix hg diff regression

add tests for push over http.

fix -I/-X when relative paths used or in subdir

hg.repository: many routines expect path to be a string even if empty.

fix bug in localrepo.changes. caused by 1e32e2fe8a677c391049d40b8794478976a0a914.

use commit time as mtime for file archives. now output from two run of "hg archive -t zip" is same.

archive: make "hg archive -t XXX -" to write to stdout

merge with crew.

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.

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.

make repo scheme table driven.

merge with crew.

use demandload more.

hg.repository: make protocol table driven. allows extensions to add new protocols.

mac os x: fixes for 10.2 from chris monson <monpublic@gmail.com>

http client: better work with authorization errors, broken sockets.

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.

push over http: client support. stream bundle data using PUT request.

push over http: server support. write "unbundle" verb for http.

localrepository.push: propagate return value

util: add limit to amount filechunkiter will read

tidy up mtime patch of andrea, get back half of performance loss. this makes diff < 3% slower than before.

report correct mtime in the hg diff output

merge with crew

change log message creation when using 'hg import' if found cmdline is used else if found patch header is used else launch hgeditor

merge emacs changes.

merge with crew.

Emacs: follow the revision usage policy of "hg diff" command. This patche makes "parent" as default revision of diff command.

Emacs: change directory of output buffer to the root of the repository.

Emacs: use `default-directory' if `buffer-file-name' is null. This patch allows you to co-operate with Mercurial in dired buffer.

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.

merge with crew

fix an undefined variable spotted by pychecker

fix unused variable warning from pychecker

replace os.stat with os.lstat in some where.

httprepo: make "http://user:pass@host/" urls work

httprepo: fix small bug in authentication.

merge with crew.

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.

patchbomb does not handle email time stamp plattform independent

http: query server for capabilities

remove use of undefined variable.

merge with self.

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'.

test-bad-pull: fix change in error output.

sshrepo: fix bug in error formatting.

hgweb: split "verbs" into methods.

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.

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.

merge with crew.

move hgk.py into hgext. now to enable "hg view" is one less step. edit ~/.hgrc: [extensions] hgext.hgk = cp contrib/hgk ~/bin

replace old-http:// syntax by static-http:// and deprecate the redundant hg://

Add web.contact to the hgrc documentation.

dirstate: fix call to os.lstat when st is None

honor signals during load of extensions.

dirstate.read: make 15% faster. time to read dirstate for my kernel repo goes from 0.22s to 0.18s.

merge with crew.

dirstate: speed up inner loop of read.

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.

merge with upstream

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/

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.

ssh: gather initial output so we can do capability detection

Initial implementation of hello command for ssh

update test-help output after new options.

copy: fix introduced bug.

make description of -n option better.

revert: add -n/--dry-run option

remove: add -n/--dry-run option

copy: add -n/--dry-run option

addremove: add -n/--dry-run option

add: add -n/--dry-run option

debugconfig: allow to print by section and exact item name

Fix diff header (line endings) for failed test output in run-tests.py.

Don't run tests with dots in their name (e.g. test-foo.orig)

revert: better fix for not printing 'reverting' message

revert: check for changes against target rev

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

Fixed 'hg serve --webdir-conf foo' which broke due to split of hgweb.

Further cleanup of ui.py (changeset 74d569332f8b used one-char variable names).

packagescan can't scan nested packages

move purge extension out of hgext. it is not as clean as other modules in hgext. can move back after rewrite.

import: allow to import stdin with file name "-"

fix comment.

merge with crew.

merge change to ssh protocol.

refactor ssh server.

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.

hgweb: fix errors and warnings found by pychecker - fix missing import - use type_ instead of type - remove unused variable

dirstate: refactor the dirstate binary format, remove magic numbers

Adjusting hgweb splitup to be a little cleaner.

Fixing up comment headers for split up code.

merge with crew.