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)

better ui for the bisect extension (and update to i18n)

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.

merge with crew

n is always 'True', we can only stop the loop with the break statement

add acl extension, to limit who can push to subdirs of central repo.

add ui.has_config method.

merge with crew.

contrib: add restricted shell.

merge with crew

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

Minor typo change to reflect actual values used.

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.

http: print better error if exception happens.

add ui.print_exc(), make all traceback printing central.

merge with crew.

new extension: extdiff. allows to use external diff program.

merge with crew.

diff: allow to use -rA:B syntax as well as -rA -rB

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.

notify: add debug output. do not fail if no config file. use --debug to see debug output.

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.

merge with crew.

notify: fix off by one error.

merge with crew.

merge with crew.

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.

packagescan: handle demandload module naming changes.

Update configuration note with mercurial.ini change from Thomas

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.

test-globalopts: make sed expression better.

If HOME is defined on Windows, Mercurial uses it. Document this.

merge emacs patches.

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.

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.

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.

Fixed typo (qshell instead of shell) in win98 code (see issue244).

merge with crew.

Moving hgweb.py into it's own module in preparation for breaking it up.

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.

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.

Use platform path for renaming file in util.atomictempfile.rename()

Add section for configuration notes with initial note about the default editor

bugzilla: allow to map between committer email and bugzilla user name.

Removed extra space in bisect output.

Merge with main

Corrected tests for commit now consistently stripping last newline.

Corrected test for date in output of 'hg export'.

Strip empty lines and trailing spaces around commit messages. Fixes issue213 and part of issue249 (trying to keep node id on import)

Use "# Date" instead of "# Timestamp" for dated export/import of patches. And don't break up list for % formatting.

Add timestamp field to export format. Make import and mq use it.

Merge with crew

Fix hg view if author's name contains unmatched quotes. (issue248) This was caused by the often seen Tcl list vs. string programming error.

notify changeset diff should be against current node instead of tip

fix a typo in an error message

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.

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.

allow to send email using sendmail. default is still smtp. update hgrc doc with sendmail info.

merge with crew.

add test for revlog.parseindex

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

remove non-prefixed environment variables from hooks.

Update debugindexdot to work with RevlogNG.

do not set smtp host by default - raise error instead

win98: fall back to win32api.GetModuleFileName if needed.

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

deprecate 'update -m'. use 'merge' instead.

merge with crew.

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

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>

merge with crew.

Make hg status work for repositories in root directory on windows (issue 228)

Add more specific documentation about defaults for the [paths] section of the hgrc(5) document.

Update Windows release notes and install script for v0.9

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

tests for bundles and bundlerepo

add support for compressed bundle repositories we simply create a uncompressed bundle in a tempfile in .hg

revert: fix corner case found by faheem mitha. if file not in dest manifest, remove only if in source manifest.

Make it possible to use the root directory as the root of a repository.

Fix issue240: mq: qpush fails on Solaris

merge with crew.

fix coding style of backout editor change.

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.

hooks: add preupdate and update hooks. preupdate run before working dir updated. can prevent update. update run after working dir updated.

merge with crew.

localrepo.update: abort if outstanding merges, instead of warn/return 1

make reason for sys.argv change obvious in code.

merge with crew.

Check existance of sys.argv for the use from mod_python.

add tests for incoming and outgoing

fix a traceback when unbundling does not add any changesets only run the hooks when some changesets has been added

catch KeyboardInterrupt in run-tests

indent: fix alignment

fix errors spotted by pychecker (mostly scope problems)

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.

backout command: better help.

Added signature for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37

Added tag 0.9 for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37

fix speed regression in mdiff caused by line split bugfix.

windows: revlog.lazyparser not always safe to use. can not use on windows < nt or if win32 api not available.

merge with crew.

fix diffs containing embedded "\r". add test to make sure fix stays fixed.

run-tests.py: fix handling of newlines. old code could not handle embedded "\r" or files that ended without newline.

run-tests.py: print diff if reference output not existing.

Added -A as an alias for --after to hg remove, like for other commands.

Just using 'make' now shows help. 'make all' doesn't perform inplace build.

The posixfile implemented using the win32 API should be iterable.

merge with crew.

hide deprecated undo command by making it an alias for debugundo.

merge with crew.

bugzilla hook: skip empty groups.

undo: add "deprecated" message to output.

reduce memory used by util.opener when making a temp copy of a file.

reduce memory used when appendfile appends to real file.

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

New make target "dist-notests" to create tarballs without running tests first.

Added install target.

Always remove appendopener tmp files (fixes issue235). test-hup triggered this bug by killing "hg serve --stdio".

gpg extension: Always remove temporary files created by 'hg sigcheck'.

localrepository.addchangegroup: add more source infos to hooks

changegroup hooks: add source to hook parameters

merge with mainline.

deprecate undo command, replace with rollback command.

fix test-help output.

notify: add 'to' header to message.

notify extension: generate right number of diffs

Update tests for revlogng

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

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

add filename to IOError if read of file fails. if file replaced with directory or symlink, IOError not fully filled out.

merge with crew.

only import mysql module if hook used.

Fixed tests for changed help output

Update release notes and copyright year for Windows installer.

revert: remove word "modified" from description.

make test-confused-revert check working dir with two parents.

run-tests.py must print changed test output no matter what exit code is.

revert: require explicit revision when working dir has two parents.

document [extensions] in doc/hgrc.5.txt.

add tests/coverage.py to MANIFEST.in.

document hgignore syntax in new file doc/hgignore.5.txt. fix issue 162.

update README. fix issue 225. do not use deprecated commands in examples.

Delete the shell version of run-tests Use the python version instead

Use text rather than binary mode for editing commit messages

update test-help.out after fixing revert docs.

fix doc comments for revert command. people found them confusing.

add email notification hook. hook written in python. email headers and body can be customized using template code.

make templater.stringio a tiny bit more use.

patch queue: notify.patch

move mail sending code into core, so extensions can share it. document hgrc settings used.

move stringio class from bugzilla extension into templater module.

rename [patchbomb] section to [email] section in hgrc. old name still ok.

define standard name for base url to use when printing hgweb urls. useful for bugzilla integration, email notifications, other stuffs.

merge with crew

gitweb: strip leading & trailing blank lines in changeset description

merge with crew.

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.

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.

make templater bit more flexible and efficient for external users.

fix minor bugs in localrepo.hook.

move changeset_templater into templater module.

merge with crew

tests: support older version of bunzip2 and, possibly, gunzip too

tests: fix compatibility on Solaris

Better help for mq: Corrected synopses, get qcommit options from commands.py.

Add debugaddremove alias to addremove, so it doesn't show up in 'hg help'. Add an explicit description of 'hg commit --addremove'.

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

Corrected test output for deprecated addremove command.

deprecate addremove command.

make test-remove check some more cases.

add --after option to remove command.

merge with crew.

merge with crew.

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.

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.

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

Make hgwebdir columns sortable.

Merge with crew

Add download links to hgwebdir index page for allowed archive types. Based on a patch by Colin McMillen <mcmillen@cs.cmu.edu>

Add archive download links to tip on main changeset list page

Combine catching exceptions added in dd4ec4576cc8 in one except statement.

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.

merge with crew.

do not check sys.argv from localrepo when running hooks. instead add traceback field to ui class.

Use better names (hg-{usage}-{random}.{suffix}) for temporary files.

Applied $PWD fix (changeset 278f9b13c39a) to tests/test-hook, too.

SunOS fix: Replaced $PWD with `pwd` under certain conditioins $PWD isn't up to date, observed on SunOS 5.8

Add self to CONTRIBUTORS

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.

Cleanup archive command: Don't overwrite gettext, quoting in cmd table entry.

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)

add backout command. command undoes effect of an earlier commit, commits new changeset as result.