merge: hoist partial code out of manifest loops

merge: minor simplification

merge: rename mysterious variable

merge: add backwards variable

mq.el: Add comment to mq-edit-finish.

mq.el: add ability to edit a patch.

qheader: exit withh meaningful error code.

Emacs: add mq.el, early support for Mercurial Queues.

MQ: Make more commands return meaningful errors.

mercurial.el: deal with more vagaries of "hg status". If we run "hg status" on a file that does not exist, it prints an error message. Attempt to extract the name of the file.

qrefresh: exit with status 1 if no patches applied.

mercurial.el: add hg-cwd

mercurial.el: speed up mode line updates.

mercurial.el: add hg-status.

mercurial.el: use parents in modeline, not tip

mercurial.el: fix hg-chomp.

mercurial.el: fix calls to goto-char.

mercurial.el: get rid of unportable, unperformant use of replace-regexp.

merge.

Support the demandload syntax "@" in packagescan

merge.

Support foo@bar notation as demandload module spec.

Make test-strict append to $HGRCPATH, like other tests do since 61fcd9fac434.

Merge with tah

Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc and add documentation for this.

Clear contents of global hgrc for tests before running each test. This fixes running test-mq-qdiff after test-mq, because of changed settings.

tag: shorten hash in default commit message Move default message to commands.py Pass node in binary for consistency Remove default arguments Fix up tests

Only show long hashes with --debug, not --verbose

Demote a pull note to a debug message

Add ui.strict config item. This turns off command matching by unambiguous prefix, and is a good thing if you want to write future-proof scripts. This fixes issue 314.

Ignore .DS_Store directories These are used by Finder on OS X.

Allow for MB/sec transfer rates in test-http

patch queue: portability.notes

mq: fix bad interaction between demandload and update of commands.norepo problem was that commands.norepo was not updated properly.

revert: add -a as alias for --all

revert: require --all to revert all files.

fix typo in mail.py

fix incoming -p

dirstate.py: when comparing mtimes, use only the integer part. Python 2.5 can return timestamps with subsecond resolution.

localrepo.status: detect clean files even when the mtime has changed

Avoid Python 2.5 warning demandload.py:112: Warning: 'as' will become a reserved keyword in Python 2.6

extdiff: make new diff commands pick up their options correctly

addremove: add -s/--similarity option progress on issue 295.

fix comment.

merge.

addremove: do not deprecate. command is too useful to drop. is also best place to try autodetect of rename/copy by content similarity.

merge.

fix issue 322. do not allow to add files that shadow files or directories already in dirstate.

merge.

add missing import of errno

merge.

add other dir/file case to test for issue322.

Teach annotate to follow copies.

Add self to contributors

add test for issue 322. no .out file because issue is still live.

merge with self.

load extensions from every hgrc. before this change only extensions in global hgrc files were loaded. now extensions in per-repo hgrc are loaded.

refactor extension loading.

merge with brendan.

mq: fix appliedname

mq help text updates and speling fixes

Add qnew -e option.

allow qrefresh to take a list of files; closes #96.

Fix test-mq-qdiff; add -I and -X options to qdiff

Fix qfold after recent changes

sed portability fixes

Teach mq about git patches

Move import's working dir update code into patch.updatedir

Solaris portability fixes

Fix bug #345. The last hit for a file might have been before the last window, so we can't clear copies. To reduce the load, we only store real copy entries instead of storing hashes for every revision.

patchbomb: import new mail module

mail: fix connect

merge with tah

Fix hgweb's patch display in changeset view.

hgext: more patchbomb documentation + Add a description of how to enable this extension + Note which command it provides (it's not very easy to guess that "hgext.patchbomb" enables the "email" command, unless one can read Python sources) + Expand the descriptions of the -n and -m options of "hg email". + Mention that formail is (commonly) part of the procmail package.

make new tests executable.

tests: new test for the bisect extension

tests: new test for "hg annotate"

override previous merge with mpm. merge at ef8ee4477019 was bad.

redo merge with mpm. previous merge at ef8ee4477019 was bad.

merge with mpm.

merge: consolidate dirstate updates

merge: use file size stored in revlog index Add size method to filelog to handle nodes with renames

merge: move forgets to the apply stage

trivial bool() cleanup

filelog.cmp: return 0 for equality spotted by Alexis Carvalho

merge: hoist some working manifest logic out of merge loop

merge: working manifest new/changed To remove dependence on m1 during manifest comparison, we distinguish between new and changed states in mw.

merge: factor out exec bit merge function

Use revlog hash comparison technique in merge

Move cmp bits from filelog to revlog

Move ui.sendmail to mail.connect/sendmail

Move ui.diffopts to patch.diffopts where it belongs

Unify mq and hg patch invocation. This makes patch a little less verbose by default, so the tests had to be updated.

merge.

make test-mq-qdiff executable.

tests: new test for mq qdiff command `hg qdiff .' is supposed to work but it is currently broken. This test should help us verify when it gets fixed.

merge with other head by default, not tip. fixes issue 339.

merge with mpm.

Tune a bit the extdiff toplevel comments/samples. * Capitalize the first letter of all sentences * Add an example for GNU diff(1) 'context diff' mode. * Explain the requirement for separate cmd.xxx and opts.xxx options in .hgrc, which hopefully will guard against users trying to add: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff -Nprc5 which fails for recent crew builds with: $ hg cdiff . making snapshot of 1 files from rev 07dc4a569f4e making snapshot of 1 files from working dir diff -Nprc5: not found The correct way to do this is by separating the cmd.cdiff and opts.cdiff parts like this: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff opts.cdiff = -Nprc5 so add it as a new example and explicitly describe it in the extdiff comments.

filelog: add hash-based comparisons For status, rather than reconstruct full file versions from revlog for comparison, compare hashes.

Merge with crew

merge: minor simplification

Fixed test-extdiff. diff-like tools usually return 1 if differences are found. Currently the extdiff returns 256, but that's a different topic (consolidating return code handling in hg).

A fix for --prune.

Adjusted test to changed help output.

merge with jeffpc

Use demandload in hgk

Add diff --git option

extdiff: fix bugs. add test.

Allow qdel to delete multiple patches.

Replace qdel/qfold -f option with -k/--keep.

Properly shell-quote arguments in extdiff

Update extdiff for recent refactoring

Test for log --prune.

hgweb: partially revert 4ec58b157265 The change from self.repo.ui.diffopts() to ui.diffopts() causes a traceback when the diff of a changeset should be displayed in the web interface. Revert to self.repo.ui.diffopts() for now.

cmdutil.matchpats: allow include/exclude to be optional.

add default values to arguments of walk etc.

move commands.addremove_lock to cmdutil.addremove

move walk and matchpats from commands to cmdutil.

fix patch.patch.filterfiles. now test-diff-subdir passes.

make test-diff-subdir executable.

tests: new test for hg diff of a subdirectory only

Make clear that hg pull -r REV pulls "up to" a revision. The existing message was a bit confusing, making the reader believe that only the specific revision is pulled.

Use cached hg-root-dir instead of rediscovering by a second call to (hg-root). We have the path we need already as the value of hg-root-dir.

hgweb: repo.changes() is now called repo.status()

remove localrepository.changes. use localrepository.status instead.

refactor text diff/patch code. rename commands.dodiff to patch.diff. rename commands.doexport to patch.export. move some functions from commands to new mercurial.cmdutil module. turn list of diff options into mdiff.diffopts class. patch.diff and patch.export now has clean api for call from 3rd party python code.

merge.

manifest.execf is now a function.

merge.

grep: add --follow support.

grep: display correct user/revision for --all in reverse. Also handle multiple occurrences of the same line by storing linestates in an array instead of a dict, and using difflib to compute the difference between linestates.

util: qualify name properly.

mq: demandload more

commands.import: refactor patch parsing into patch.extract.

merge git patch code.

Tests for git import

Remove debugging line

Fix bad merge with crew

Move patch-related code into its own module.

Teach import to understand git diff extensions. Vanilla patch chokes on git patches that include files that are copied or renamed, then modified. So this code detects that case and rewrites the patch if necessary.

update copyrights.

merge.

Fix some bugs introduced during the manifest refactoring

Fix "hg qnew -f foo" without -m The refresh method assumes it has a string.

merge with mpm.

Remove manifest.readflags

Change remaining users of manifest flags

Switch to simpler manifestdict

Merge: use single objects for tracking manifests

Merge: save away mode bit so that we don't need manifest later

Merge manifest refactor work

Combine manifest dict and flags dict into a single object This gets rid of the need to track two objects and might save memory. This might be faster implemented as a subclassed dict with auxiliary functions to access a sparse flags dict.

manifestflags: eliminate remaining users of direct dict access

Use strings for manifestflags to allow storing multiple flags

Start using manifestflags methods

Add manifestflags class

import: get lock and wlock one time this makes import of many patches 6x faster in kernel repo.

Adjusted documentation for hgrc's "[smtp] host" for change in 9f745d3675d4.

fix test output

mq: only add mq attribute to local repo

mq: apply patch is any posative guard matches this is like guards command from quilt package.

fetch: fix test fail

mq: do not allow to push from repo with patches applied

call reposetup functions of extension modules whenever repo created

mq: test commit in repo with patches applied

Disallow commit over an applied mq patch.

qselect: add --pop, --reapply options

Fix some tests for portability.

Merge with crew, fix most tests

Merge: combine force and forcemerge arguments

Merge: move most tests to the beginning

Merge: refactor err and failedmerge -> unresolved

Refactor update locking slightly

Merge: combine choose and moddirstate to partial

Rename merge.allow -> merge.branchmerge

Use demandload @ syntax

Introduce update helper functions: update, merge, clean, and revert

Teach demandload how to import as

Factor doupdate into _lookup + hg.update

Fix extensions for merge change

mq: make guards more strict, add tests

mq: drop qversion command

fetch: hold lock and wlock across all operations

tests: forgot to add test-mq-guards.out

fetch: lock repo across pull and commit

fetch: drop commands.doupdate

test-fetch: make output stable

fetch: fix breakage from mpm. add test so will not break again.

mq: new commands qselect, qguard implement quilt-style guards for mq. guards allow to control whether patch can be pushed. if guard X is active and patch is guarded by +X (called "posative guard"), patch can be pushed. if patch is guarded by -X (called "nagative guard"), patch cannot be pushed and is skipped. use qguard to set/list guards on patches. use qselect to set/list active guards. also "qseries -v" prints guarded patches with "G" now.

fix permission of test-mq-qsave

mq: add join method

Make mq camelcase consistent with the rest of hg.

Add basic qsave/qrestore test.

Update qsave to use StatusEntry; don't throw exception on bad status lines.

Update mq to use new logmessage arglist from 2794:bd8a9a94139f

Merge with crew

Move repo.verify

revlog.lookup optimization

Remove **opts arg from commands.doupdate

Move merge code to its own module Pull update and merge3 out of localrepo into merge.py s/self/repo/ Add temporary API function in hg.py Convert all users

Add a doc string

fetch: add missing import.

fetch: do not fetch if working dir modified

new extension: fetch -> combine pull and merge/update pull changes from remote repo. if changes add new head: merge with new head, commit result. else: update working dir to new head. this makes useful command like git 'pull' command.

commands.logmessage: simplify calling.

localrepo.update: allow to suppress commit reminder.

mq: unused variables, improper usage of 'is [not]', undefined variable

mq: codingstyle

mq: remove unecessary test

mq: fix variables shadowing builtin

util.patch: use shellquote

mq: use more portable util.parse_patch_output instead of handrolled version.

Add portable shell-quoting function; teach mq to use it.

mailbomb: add a comment and remove the bcc in a more pythonic way

Add '.' as a shortcut revision name for the working directory parent.

make error better.

merge with self.

fix output of test-backout.

Test suite for log --follow and --follow-first.

Add log option --follow-first to follow only the first parent of merges. This can be useful to extract a single line of development.

Make log --follow revision range start default to working dir parent.

Make log --follow without a file list follow a single head. This includes all the parents or children (depending on the direction of the revision range).

merge with brendan.

Use StatusEntry class instead of repeated status line parsing. This small cleanup abstracts out repeated instances of (rev, name) = applied[x].split(':'), making it easier to use applied or change the status file format.

mq: make queue.unapplied useful as api

Import say a file is not tracked after patching : test case

mq: simplify save_dirty

Add -f option to qfold; improve qfold documentation.

Clean up qnew help text.

tests: fix output for test-backout

allow None for path of hg.repository

mq: rename read_series as parse_series, make simpler and faster

fix call to commands.setremoteconfig

mq: print matches if patch name not unique

clone: replace long help string of inaky with doc comment.

Breakup clone -r extra text help to fit in 80 columns

Expand clone help with hardlink information

fix hg backup option recommendation for auto-merge

import: make patch apply if run in subdir fix is same as for mq patch. patch apply code should be merged.

hgcommand.vim: requirements & doc self-install more consistent; cosmetics Check for availability of builtin system(). Set 'compatible' while sourcing script. File operation during doc self-install: Escape spaces in ex-commands. Use quotes in system calls. Incremented revision number(s). Size of patch is due to cosmetic cleanups: Removal of spaces at line endings. <SID>Prefix to functions when called.

fix mq test output.

merge patches from brendan cully that did not apply clean against tip.

Add -s option to qseries: display first line of patch header.

Check for parent/mod as well as parent.mod in findext. Debian/Ubuntu ship a system-wide hgrc that loads extensions using the syntax hgext/extension=, rather than hgext.extension=. Although the extensions work correctly, hg help <extension> doesn't understand this form without this patch.

Add more verbose help text to mq commands.

Add -m, -l, -e options to qfold.

Add -f option to qdelete, to remove patch file.

mq: add qmv as alias for qrename

New self-explanatory command qrename.

[darcs2hg] Windows compatibilty patct Originally submitted by Daiju Kito 1. single quote didn't work in several cases 2. os.unlink tries to delete tmpfile when it's called. It won't wait like unix.

New mq command qfold: Merge patches into the current patch. Patches should be in the series file but not yet applied.

Add command qheader to display the header of a given patch.

Add option -e/--edit to qrefresh, to edit the existing header.

Change patch header as well as commit message with qrefresh -m or -l.

Remove pointless reposetup hook from hgk.py

import: switch from application/x-patch to text/x-diff christian ebert says his mailer was broken.

mq: correct the use of super The first argument passed to super is supposed to be the class where it's being used, not self.__class__ - the two can be different when there's inheritance involved.

log: add -f/--follow option, to follow rename/copy

clean up hg.py: move repo constructor code into each repo module

merge with mpm.

Kill ui.setconfig_remoteopts This brought too much knowledge about command line particulars into the ui code. Moved to commands.py.

pull: allow to pull from bundle file without need for bundle: syntax

avoid calling (cd ...) with `nil' as a directory name When (hg-root) cannot determine the current Mercurial root, print an error message instead of trying to evaluate (cd nil).

fix output file format %r

hbisect.py: don't rely on __del__ to write the current state. This is yet another page of the "Thou shalt not do too much inside __del__ methods" book, in the "demandload and __del__ don't go well together" chapter. The bisect extension is broken in 0.9.1: $ hg bisect init $ hg bisect bad Fatal Python error: Interpreter not initialized (version mismatch?) Aborted (yes, I tripled checked my instalation to make sure the problem is not there) It's been broken since revision fe1689273f84 moved the import of the binascii module into a demandload. (In details: the first time that "hg bisect bad" (or good) is called, there are still no revisions saved in .hg/bisect/*, so bisect.__init__ doesn't call hg.bin on anything. So, when we reach __del__, the binascii module still hasn't been imported and we get that "nice" message above.)

hgcommand.vim: cleanup of doc self-install code

import: allow application/x-patch for funny patch from christian ebert

patchbomb: do not write Bcc

merge with crew.

mq: add basic tests

mq: allow to apply patches in subdir of repo again i broke it in 35caf437a201.

merge with tah

Add test mq keeping a reference to localrepo which can't remove journal on exit.

mq: update to handle repomap not longer used

mq: replace module-wide repo hash with a repo attribute

mq: do not hold a reference to repo in tags override Instead, replace repo's class object with a subclass.

patchbomb: fix generation of message-id when sending attachments node was set to bin(node) before message-id was created

merge with crew.

mq: add qclone command

hg.py: add islocal() and defaultdest() functions, refactor islocal tells if a repo or url is local. defaultdest returns default path for clone if explicit path not given. clone can now take repo or url as source

makes 'hg diff' diff the file in sorted order

merge with tonfa

reupdate the options after loading the repo local .hgrc could possibly override them, command line take priority

merge with upstream

Fix test permission

Fix test-mq-qnew-twice exit code and output.

mq: fix queue.apply to not call os.chdir() call to os.chdir broke "hg -R dirname qpush". instead pass -d (change directory) option to patch command.

mq: move many error messages to util.Abort

mq: do not allow to qnew a patch twice

run-tests.py: skip tests that should not run. print message when any test is skipped. count skipped tests.

make mq test more portable.

patchbomb: add content-disposition to make display inline and add filename if rev being emailed has tag that ends in .patch or .diff then use that as filename. else make up filename from name of repo.

patchbomb: optionally send patches as inline attachments

merge with crew.

make introductory message of patch series text/plain

run-tests.py: fix diff output when test-foo.out doesn't exist. Previously, if test-foo.out doesn't exist and test-foo outputs something, the first line of the diff will look like this: -+changeset: 0:0acdaf898367 (note the leading "-")

Allow tests that end in .py and .bat Revision 6ed46bad9530 disallowed tests that have a '.' in the name, but that also disallows tests that end in .py and .bat, even though run-tests.py has some code to special case them.

Merged backout head.

Backed out changeset 2ab464771b7d15c60014996d2853efc92cdb8465 - it always runs chmod - uses chmod in an unsafe way - if somebody does a clone of a repo, runs 'make tests', everything is fine, so he can assume the original repo is fine, too, but it is not.

mq: strip should not blow away local changes This changes the mq strip command to abort if there are any changes in the working directory.

mq: fix qnew and qimport to deal with series file comments qnew and qimport did not take comments into account when deciding where to place new patches in the series file.

mq: qpop should act like quilt pop qpop patchname would pop the named patch off the stack. This is slightly different from how quilt pop works. quilt pop pops everything up to the named patch.

mq: patch naming shortcuts This adds some more options to the mq lookup routine. It allows you to use shortcuts in naming patches to push or pop. You can now use: 1) a full patch name 2) a number to indicate an offset in the series file 3) a unique substring of the patch name 4) patchname[-+]num to indicate an offset from a given patch. For case #3 substrings are allowed. qtip and qbase are aliases for the top and bottom of the applied patch queue, unless they are already in the series file as patch names.

Improve bash_completion for patches in MQ

MQ: uniformise message and logfile option. Possibility to change message in qrefresh option

merge with crew.

Makefile do a chmod +x on test sceanrios

email: reflect that recipients are specified as comma-separated list

merge with crew

MANIFEST.in fixes

merge with gitweb

[hgweb] links to shortlog for the default templates

[hgweb] Shortlog template for default theme

merge gitweb with crew

[hgweb] Implemented shortlog (gitweb templates only)

[hgweb] Fixed up gitweb templates Now the gitweb templates have archive links

Add mq patch names to tagscache instead of overriding lookup. This makes mq patch names visible in hg log and hg tags. It also resolves the names only once, rather than on every lookup.

Update Windows and Mac installers to 0.9.1 release

added documentation for to, cc, and bcc addressing

optionally send blind carbon copies Bcc recipients may be set via long `--bcc' or hgrc only, no prompt.

fix reference to "smtp" section documentation for "method" has reference to "mail" section. "mail" section doesn't exist, changed to "smtp".

mq: uniform verbose display of patche[s]. In verbose mode, display: "index patchname" for unapplied patches "index cset:patchnames" for applied patches "index status patchname" in the serie listing.

Fixed confused directory changing in test-http.

extdiff : add comment on how to use vim for doing directoy diff

merge.

hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks all repository classes now have url() method that returns url of repo.

Provide a relevant description for --timeout.

self.root == '/': prefix length computation out of the loop - put the computation out of the loop - change the variable to a more meaningful name

Fix dirstate.walkhelper removing first char of nd when self.root == '/'.

Include all tests/*.py files in the MANIFEST so tests won't fail on tarballs. This fixes failing test-http-proxy and test-webraw.

Emacs: apply "expand-filename" on "default-directory". "default-directory" may has home directory("~") relative path in some runtime environment(or emacs revision ?), so expand-filename is required.

Emacs: apply kill-local-variable instead of make-local-variable to FORGET

hgweb: Configurable zebra stripes With this change, you can set [web] stripes=3 to get stripes every three lines (a-la fanfold paper), instead of every line on source and directory listings. The default behaviour is stripes=1 which generates output similar to current, and you can also turn stripes off by setting it to 0.

prune unwanted files from MANIFEST (backups, object files, etc)

Add qtip and qbase to mq qlookup.

Mq: modify repo.lookup to resolve applied patches too.

merge with crew.

status: add -c (clean) and -A (all files) options also add new localrepo.status what is more uniform than localrepo.changes. localrepo.changes is deprecated and will go away soon.

Added signature for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9

Added tag 0.9.1 for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9

Merge with crew

Merge with crew

Merge with crew

merge with tonfa-experimental

fix 'hg cat' broken by 156fb1feab62

allow specifying a file to hg parents, change the syntax to use -r/--rev

fix filectxt to really work - use a context instead of changelog.read - changectx._id is not necessary

correct the handling of linkrev with nullid

lookup should allow -1 to represent nullid (if passed an int as arg)

make convert-repo deal with git symbolic refs. Problem noticed by Sébastien Pierre

util.getuser: better comments

util.getuser: raise exception if win32api not available.

merge with crew.

fix windows username problem.

Make hgweb threads into daemon threads. This fixes the problem that an interrupted hg serve will not terminate until the next request has been received.

Preserve multibyte UTF-8 characters when obfuscating. This version uses the unicode 'replace' option, so non-UTF-8 encodings will still be mangled. Luckily, there aren't any of those.

spelling fix

change 'hg tag' to tag the parent rev instead of tip

fix tests.

Add an option '-C|--copies' to hg status to show the source of copied files. Copied files are displayed in the form: A newname oldname

merge

HGcommand.vim : the status was read for the wrong file as we changed the current directory before

Do not try to get revision and branch information for file which are not tracked

Correction of commit with a log message in a file

Test if file is below an HG root before doing anything

[mq]: merge marker

fix logfile option for HGFinishCommit

codingstyle: use spaces instead of tabs

Merge with tonfa

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 annotate breakage

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.

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.