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.

make test-revert check executable bit.

merge with crew.

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

merge with crew.

move SignalInterrupt class into util module.

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.

Ignore annotated coverage output of run-tests.py -C

fix a NameError in changegroupsubset

allow to pull from an empty repo without getting a backtrace

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