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

merge with crew.

run-tests.py: remove trailing white space

make indentation of coverage code in run-tests.py nicer.

Add code coverage to the python version of run-tests (inc. annotation) Also include a minor work-around to coverage.py to avoid errors about /<string>

Show repo's revlog format on verify. Warn if some files use a different format.

Replaced 0 with REVLOGV0 where this meaning is used.

Corrected error message for incompatible revision flags.

Make the deprecated forget an alias of debugforget. This way it doesn't show up in the non-debug help.

Fixed test output for not using the deprecated 'hg forget'.

Fix revlog-ng interaction with old-http. revlog.py wasn't trying to detect the version of a revlog file that doesn't exist on the filesystem (as is the case with old-http). Additionally, there was an off-by-one error in httprangereader.read (ranges in HTTP Range headers are inclusive), making it get more data than what was asked for. This made a struct.unpack complain that "unpack str size does not match format". Finally, with the two fixes above, test-static-http fails, since BaseHTTPServer doesn't understand ranges and returns too much data. Work around that by reading only the specified amount.

Fix timezone check. According to http://en.wikipedia.org/wiki/List_of_time_zones timezones go from UTC-12 to UTC+14.

mke test-nested-repo use "revert" instead of "forget"

mark forget command as deprecated. will be removed after 0.9 released.

write to stderr with a single write call. this works around issue88.

Tidyups for run-tests.py inc. try/finally cleanup and allow tests to be specified on command line

hgweb: Synchronised filelogentry to changelogentry.

Try harder to display node hashes in tags view in monospaced font. Used to work around Firefox's behaviour if "Allow pages to choose their own fonts" is disabled.

hgweb templates: Don't word wrap "foo bar ago" (e.g. "3 months\nago") This made log entries or hgwebdir index look ugly with certain browser widths.

cached data was wrong: rev is different from self.rev(node) in bundlerepo.py