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.

merge with crew.

Cleanup: unifiy the coding style in the ui.py configitems forwarders. No functional changes.

Expand '~' in path to extensions.

merge with crew.

The line used to ignore the setup file for win32 is a regexp but it was after a "syntax: glob"

Automatically add the path of hg to %PATH% using add_path

Ignore the .exe setup file for Windows

Make indentation of purge's cmdtable match to mercurial/commands.py

Rewritten install instructions for hg-purge to match new situation, fixed typos.

Merged hg-purge

Reorganized files in hg-purge repo to push them into Mercurial. README -> hgext/purge/README purge.py -> hgext/purge/__init__.py removed COPYING.GPL and .hgignore (already in the Mercurial repo)

Removed --nothing, added --print and --print0

The meaning of the directories on the command line is now explained correctly

Marked strings for translation

Added some comments

Even on Windows self._repo.dirstate.state() wants '/' in paths

Some functions were called as globals (i.e. I forgot some "self.")

Changset de893ad6bd17 wrongly reversed the meaning of --nothing

Use self._ui.note(...) instead of if self._ui.verbose: self._ui.status(...)

Command line options are read in a saner way

Purge.from_command is now a function called purge

Added a link to the home page of hg purge

Added a link to the page for CVS utilities

Added some lines on the requirements for purge

Added an explanation on how to enable the extension in "~/.hgrc"

Initial commit

Give a response to unknown SSH commands

Renamed localrepo.undo() to rollback() and talk about "rollback information".

Fix automatic decompression of tarballs with Firefox. The encoding was set to gzip/bzip2, so Firefox (correctly) assumed, that this has to be "decoded" (i.e. decompressed).

hgweb: fix tracebacks on both index and repo pages

Allow comma to separate types in allow_archive, too. Use longer variable name.

hgweb: add allow_archive support to [web] section of hgrc

merge with crew.

Final stage of the hgweb split up. hgweb and hgwebdir now have their own modules.

Splitting up hgweb so it's easier to change.

Manifest groups may be empty, so don't abort in this case (fixes issue210). Only abort on empty changelog and file revlogs.

Pass filename to decoder for 'hg archive' (fixes issue267) Despite writing to a file descriptor, the check in the [decode] section needs a filename. localrepo.wwrite() still writes to the file descriptor.

various fixes to darcs conversion script 1. removed files were missed 2. hidden files in top directory were not added/removed correctly 3. suppressed spurious warning on adding new files. 4. hg changeset now checked in with original author and date 5. __file__ not supported by pdb.py

contrib: move hg-menu.vim into contrib/vim directory

contrib: patch review plugin for vim 7.0 The plugin takes an 'hg export'ed patch (in fact any single or multi file patch) and opens multiple tabs containing vim diff/merge windows for each affected file in the patch allowing full visual code reviews.

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.

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

Merge with crew

Allow 'hg serve --webdir-conf foo' to be run outside a repository.

Use <link> tag instead if CDATA import for CSS stylesheets. Fixes issue200.

Use string literal concatenation for optlist and import -p option

Cleaned trailing whitespace in hgweb.py, removed command line shortcut for webdir-conf.

Fixed path handling of the standalone server, fixed typo.

Added hgwebdir support to hg serve.

Added threading support to hg serve.

Added my name to the contributors list.

Cleaned hgweb.py a little bit

merge with crew.

fix issue 217. fall back to fixed path if windows >= nt function not present.

Merge with upstream

Fix issue 165: `hg status' with abs path containing a symlink-to-dir fails

update tests after changing archival code. test-archive now contains tests for archive command.

make hgweb use new archival module. also use "x-gzip" encoding for ".tar.gz" files, so mozilla and firefox will not transparently decompress stream and save with wrong name.

add "archive" command, like "cvs export" only better. most code in mercurial/archival.py module, for sharing with hgweb.

Merge with crew

Add a pure python version of run-tests. If this works well for most people, it should replace the shell version of run-test.

Revert push new heads logic This breaks push -r's new head detection but fixes the common case. For now we'll assume that someone doing push -r knows what they're doing.

Move empty local repo logic for pull into findincoming This fixes a silly attempt to pull a changegroup from an empty repo.

Don't die calling outgoing hook if we have no changesets

Merge with crew

Merge with cmason

Add tests/test-committer This checks to see if the EMAIL environment variable is being used for commit.

Use application/octet-stream as the content-type of unknown binary files

remove appendfile data as soon as not needed.

Make bundlerepo use proper index format for revlogng bundlerepo just appends index entries from the bundle onto the index for the current repo. This patch makes sure it appends the correct format.

Merge with crew

Merge with cmason

Remove bogus raise from localrepo.lookup()

Fix hg qdiff <file>

Ignore EPIPE in pipefilter This hides the following traceback (there's a race condition involved, so you may have to try a few times to hit it): $ hg sign --key key-that-does-not-exist Signing 2062:4bad92f4ea65 gpg: skipped "key-that-does-not-exist": secret key not available gpg: signing failed: secret key not available Exception in thread Thread-1: Traceback (most recent call last): File "threading.py", line 442, in __bootstrap self.run() File "threading.py", line 422, in run self.__target(*self.__args, **self.__kwargs) File "mercurial/util.py", line 24, in writer pin.close() IOError: [Errno 32] Broken pipe abort: Error while signing

Don't send "Content-Type: none" mimetypes.guess_type will return (None, None) when it can't detect the filetype.

Fix filerevision-raw.tmpl Two bugs: - conteXt-type instead of conteNt-type - trailing newline The easiest way to fix the second one (and keep it fixed) is to put everything inline in map-raw.

convert-repo: fix reversed time zone offset

catch SIGBREAK on windows.

update windows readme to document msys/mingw rxvt problems.

fix util.canonpath on windows. old test for absolute path was not portable. use os.path api instead.

make appendfile simpler so it does not break with revlogng on windows. it used to cache open files. this made revlogng break because it wants to rename files when splitting .i into .i/.d, but cannot rename or unlink open files on windows. new code is bit slower, but safe on linux and windows. proper fix for too many open/close of changelog/manifest belongs in different place. can get 10% speed improvement back.

Exit test-hup only after the background process has died. Otherwise the open file might let the tests fail on NFS.

merge with mainline.

mq: do not fail if directory to create exists

merge revlogng with mpm tip

Fix transaction handling during interleaved file split.

merge 0.8.1 with revlogng

Additional appendfile fixes for interleaved data/index files The appendfile code was not passing default version info to the changelog or manifest classes, and so they were always being created as version 0. revlog.checkinlinesize had to be corrected to seek to the end of the index file when no index file was passed (only clone does this)

Speedup revlog.ancestors for the linear case revlog.ancestors can be expensive on big repos. This cuts down the overall time for hg update by ~19% by short cutting revlog.ancestors when one of the revisions is reachable from another.

Reduce index memory usage by storing the bare string instead of tuples Storing the tuple returned by struct.unpack significantly increases the memory required to store the entire index in ram. This patch uses struct.unpack on demand instead.

New lazy index code for revlogs. This tunes for large repositories. It does not read the whole index file in one big chunk, but tries to buffer reads in more reasonable chunks instead. Search speeds are improved in two ways. When trying to find a specific sha hash, it searches from the end of the file backward. More recent entries are more likely to be relevant, especially the tip. Also, this can load only the mapping of nodes to revlog index number. Loading the map uses less cpu (no struct.unpack) and much less memory than loading both the map and the index. This cuts down the time for hg tip on the 80,000 changeset kernel repo from 1.8s to 3.69s. Most commands the pull a single rev out of a big index get roughly the same benefit. Commands that read the whole index are not slower.

Fill in the uncompressed size during revlog.addgroup This uses code from Matt to calculate the size change that would result from applying a delta to keep an accurate running total of the text size during revlog.addgroup

Fix inlined revlogs to seek to eof after opening "a+"

Create an atomic opener that does not automatically rename on close The revlog.checkinlinesize() uses an atomic opener to replace the index file after converting it from inline to traditional .i and .d files. If this operation is interrupted, the atomic file class can overwrite a valid file with a partially written one. This patch introduces an atomic opener that does not automatically replace the destination file with the tempfile. This way an interrupted checkinlinesize() call turns into a noop.

Make the appendfile class inline-data index friendly The appendfile class needs a few changes to make it work with interleaved index files. It needs to support the tell() method, opening in a+ mode, and it needs to delay the checkinlinesize call until after the append file is written. Given that open(file, "a+") doesn't always seek to the end of the file, this adds seek operations to appendfile that understand whence args

Fix bundle repos to use an index tuple consistent with revlogng The bundle repo code was adding a field to the index tuple, which confused the revlogng changes. This creates a new dict instead to maintain the extra bundle info.

Implement data inlined with the index file This patch allows you to optionally inline data bytes with the revlog index file. It saves considerable space and checkout time by reducing the number of inodes, wasted partial blocks and system calls. To use the inline data add this to your .hgrc [revlog] # inline data only works with revlogng format=1 # inline is the only valid flag right now. flags=inline

Implement revlogng. revlogng results in smaller indexes, can address larger data files, and supports flags and version numbers. By default the original revlog format is used. To use the new format, use the following .hgrc field: [revlog] # format choices are 0 (classic revlog format) and 1 revlogng format=1

import: use gpatch if present on system. patch is broken on solaris. fixes issue 205. add new useful function, util.find_in_path.

merge with crew.

merge with crew.

let run-tests run optional code coverage tests. to enable, set env var TEST_COVERAGE to non-empty string. run-tests will print report after running. after coverage run, file tests/.coverage will contain coverage data. use tests/coverage.py to get more info, like annotated source code.

fix bugs in coverage.py.

add coverage.py module to tests directory. written by ned batchelder and gareth rees.

fix update when a locally added file match the target revision the dirstate entry for the added file wasn't updated. fix issue207

util.unlink should only catch OSError.

benoit asked for comment to make avoid of recursive repo clearer.

merge with crew.

support nested repositories. mercurial will not recurse into a subdirectory that contains a .hg directory. it is treated as a separate repository.

Don't use -u option for diff on SunOS, too. This makes the tests work without using GNU diff on Solaris 8.

run-tests: Use appropriate (that is: none) diff options on HP-UX.

Use the new format of setting tags in view extension (Debian bug #361897)

Never exit directly from commands.dispatch(), but pass return code to caller. Usually the caller is commands.run(). Some extensions still use sys.exit(), this is catched, too. Fixed wrong return statement in commands.recover() yielding a zero exit code.

Polished exception handling when importing extensions: - Warning about failed import is printed on one line. - For this warning the [extensions] section key is used, because the value doesn't have to be set. - Whan a --traceback is requested, exit immediately to not mix up problems when importing an extension with other problems.

Added doc/gendoc.py to MANIFEST.in, so docs can be regenerated on demand.

fix exception handling on windows. move win32 code into util_win32.py.

Include tests/md5sum.py in manifest.

Added tag 0.8.1 for changeset 6a03cff2b0f5d30281e6addefe96b993582f2eac

Try to use /usr/bin/test or /bin/test to work around missing features. The builtin "test" of Solaris 8 /bin/sh doesn't understand -nt.

util.copyfiles: only switch to copy if hardlink raises IOError or OSError. before this, interrupting clone would give "file a same as file b" error because caught KeyboardInterrupt.

Make completion for debugindex<tab><tab> show debugindexdot, too. The special handling for commands with names that are substrings of other commands (e.g. with st and strip) wasn't used with debug commands before.

Set correct exception for another possible malloc error in mpatch.c

Register qversion as a non repository related command

Show remote ssh noise only with --debug and increase the limit to 500 lines. Messages can already be sent to the user over stderr, if one really wants this.

document the possible race in "hg undo"

Don't allow --style and --template for hg update and hg merge. The only way that changesets will be shown with these command is in an error message when trying to update to an ambiguous branch name.

Minor fix for revert: No need to make a backup when forgetting added files. echo foo > foo && hg add foo && hg revert foo creates foo.orig, though foo is not changed or deleted.

small changes to revert command. fix bug 93: work with files that are in target manifest but not dirstate.

bash_completion: completion for commands provided by extensions Make the bash_completion function call _hg_cmd_$cmd to generate completion candidates for $cmd if that function exists. Add basic completion functions for: - mq: - qpop - qpush - qdelete - qsave - qcommit - strip - hbisect: - bisect - patchbomb: - email - gpg: - sign

Don't enter an endless loop if remote hg doesn't answer, show remote noise. The endless loop is not only triggered if the remote shell is too noisy, but even if the local ssh command dies due to an error.

bash_completion: small optimization Right now we always call "hg help $cmd" to get the canonical name of $cmd (i.e. to go from "co" to "update"). This patch optimistically assumes that $cmd is already the canonical form and tries to generate completions for it. If that fails, it falls back to canonicalizing $cmd and trying again. This means that: - if a command or alias is explicitly handled by the _hg_command_specific function, things get somewhat faster - as long as the canonical $cmd is handled by _hg_command_specific, all its aliases and abbreviations are also handled.

Tell the user the real "hg update -C" command, not just "-C" when aborting.

Merged with crew.

Don't abort when backup files already exist. Don't allow alternative names. Rationale: - When the user wants to revert, he shouldn't be stopped from doing this just because some old backups will be overwritten. - To not clobber important files by accident, alternative names for backup files were disabled. As the backup target now has a fixed name, the user doesn't have to be informed about the backup copy (unless --verbose)

Make 'hg tags -q' only list tag names without revision numbers and hashes, and change bash_completion to use this.

add --options to debugcomplete and change bash_completion to use it make debugcomplete print one item per line (this is not needed for the bash_completion script, but should be easier to use in other scripts)

Group changes done by the same developer on the same with --style=changelog Changeset and tags are appended to the change message for non-quiet and non-verbose output, so grouping works. Fixes last bit of issue110.

Don't print filenames in braces for changelog style.

Web site and wiki are now the same.

forgot to rerun tests after changed backup extension to .orig. thomas a.h. found this.

rewrite revert command. fix issues 93, 123, 147. new version does these things: - saves backup copies of modified files (issue 147) - prints output like other commands, and errors when files not found (issue 123) - marks files added/removed (issue 93)

ssh: skip noise generated by remote shell we send a dummy command with known output to get in sync

work around python bug on solaris 10. write to file opened mode 'a+' should write to end of file and update offset pointer, but does not (solaris 10 has python 2.3.3). fix is to always seek.

more windows fixes.

clean up lee's windows testpid fix.

Fixes to testpid() for Windows. Handle processes that no longer exist and processes that belong to another user. Enables the lock breaking changes from d314a89fa4f1 and subsequently "fixes" the left over locks reported in bug 112.

Use [ x = y ] instead of [ x == y ] in shell scripts.

New option -i/--ignored for 'hg status' to show ignored files. localrepo.changes() now returns an additional list of ignored files if it is called with show_ignored=True.

Fix hg push and hg push -r sometimes creating new heads without --force. Fixing issue179. The algorithm checks if there not more new heads on the remote side than heads which become non-heads due to getting children. Pushing this repo: m /\ 3 3a| |/ / 2 2a |/ 1 to a repo only having 1, 2 and 3 didn't abort requiring --force before. Added test cases for this and some doc strings for used methods.

merge with crew.

add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.

merge with crew.

merge with crew.

fix backtrace printed when cannot get lock. change lock error handling code so exceptions have useful info and exception handling in one place. add test case for when cannot get lock.

Catch HTTPException when reading from remote http repository. If the server dies very early, an httplib.IncompleteRead exception may be raised, because httplib can't read a single byte. Catching all HTTPException subclasses here will prevent ugly backtraces for similar things, too.

merge with crew.

Fix error on Windows if "hg log | more" exits.

add missing filename title to gitweb's filelog page

don't overquote description on gitweb summary page (issue 184)

fix appendfile problem on macos. when i open file with mode 'a+' on linux, seek position is 0. on macos seek position is end of file instead. not documented.

Fix broken hgignore tests due to full path showing up in output.

Don't ignore everything if all hgignore files are empty.

show committer's name on gitweb's summary page (issue 137)

Show reason why an ignore file can't be read and state that it is skipped.

On error parsing hgignore file, print the correct filename.

Add warning if user-configured hgignore file isn't found

Implementation of per-user .hgignore. Reference: http://www.selenic.com/mercurial/bts/issue166 If the [ui] section of .hgrc contains keys like "ignore" or "ignore.something", the values corresponding to these keys are treated as per-user hgignore files. These hgignore files apply to all repositories used by that user.

Calling revlog.addgroup with an empty changegroup now raises RevlogError. The empty changegroup can be caused by remote servers dying soon after findincoming, and further code in pull assumes (correctly) that there are new changesets.

Windows py2exe version didn't handle names given to templatepath() correctly

add benoit's test for issue148.

forgot to add new module.

fix race in localrepo.addchangegroup. localrepo.addchangegroup writes to changelog, then manifest, then normal files. this breaks access ordering. if reader reads changelog while manifest is being written, can find pointers into places in manifest that are not yet written. same can happen for manifest and normal files. fix is to make almost no change to localrepo.addchangegroup. it must to write changelog and manifest data early because it has to read them while writing other files. instead, write changelog and manifest data to temp file that reader cannot see, then append temp data to manifest after all normal files written, finally append temp data to changelog. temp file code is in new appendfile module. can be used in other places with small changes. much smaller race still left. we write all new data in one write call, but reader can maybe see partial update because python or os or filesystem cannot always make write really atomic. file locking no help: slow, not portable, not reliable over nfs. only real safe other plan is write to temp file every time and rename, but performance bad when manifest or changelog is big.

Added missing gettext import to changegroup.py.

Don't mention deprecated HGEDITOR variable in the help text of commit.

Spelling fix: "commited" -> "committed"

show message if no changes found on outgoing Now the messages for pull/push/incoming/outgoing should be consistent.

show message if no changes found on incoming

Include templates/static/* in MANIFEST.in so that distutils setup will include them.

merge with self

make it possible to escape characters in a glob expression

ignore EPIPE in ui.err_write It avoids not being able to abort a transaction when a push via ssh fails. Maybe some other place should ignore EPIPE too.

merge with crew.

add changelog style to command line template. to use, "hg log --style=changelog". makes different output with no flags, -q, -v, --debug. templater module has new template filters for this. email - committer email address fill68 - refill text to 68 colums fill76 - refill text to 76 colums tabindent - prefix every not empty line with tab shortdate - iso 8631 date, no time zone stringify - turn template iterator into string

add checking for invalid entries in tag files safely parse the differents tag files, output warning when parsing an invalid entry.

Adapted behaviour of ui.username() to documentation and mention it explicitly: Searched in this order: $HGUSER, [ui] section of hgrcs, $EMAIL and stop searching if one of these is set. Abort if found username is an empty string to force specifying the commit user elsewhere, e.g. with line option or repo hgrc. If not found, use $LOGNAME or $USERNAME +"@full.hostname".

Improved ui.edit(): - Use descriptive name for temporary file: hg-editor-*.txt - Don't import tempfile in the method, but use demandload() - Remove tempfile file even if editor aborts.

Pass correct username as $HGUSER to hgeditor if "commit -u" is used. And only use the new util.system parameter to set the environment.

Added test for incoming via ssh.

make incoming work via ssh (issue139); move chunk code into separate module. Incoming ssh needs to detect the end of the changegroup, otherwise it would block trying to read from the ssh pipe. This is done by parsing the changegroup chunks. bundlerepo.getchunk() already is identical to localrepo.addchangegroup.getchunk(), which is followed by getgroup which looks much like what you can re-use in bundlerepository.__init__() and in write_bundle(). bundlerevlog.__init__.genchunk() looks very similar, too, as do some while loops in localrepo.py. Applied patch from Benoit Boissinot to move duplicate/related code to mercurial/changegroup.py and use this to fix incoming ssh.

use HG10UN header for uncompressed bundle - use HG10UN instead of HG11 for uncompressed bundles header - check HG10BZ for compressed bundle - better error handling for invalid header some notes: - people who created uncompressed bundle will no longer be able to use them (it could be fixed with hand-editing) - older hg cannot detect an uncompressed bundle (bzip2 decompression will fail).

More detailed documentation about ssh:// URLs; fixes issue170.

do proper typecasting on malloc() and calloc() calls to support build on Solaris 2.6 using Sun Pro SC4.0 (C++ 4.1) compiler.

Don't forget version at the end of setup.py, write it only if changed. This fixes issue159: "python setup.py install" shouldn't write new files in the working dir if one has done "python setup.py build" first.

Enable path validation for copy, rename, debugwalk and other canonpath users. This fixed the last bit of issue134. Added some tests to test-rename and test-walk.

Duplicate cache when creating templater.

Delete bundle file of hg incoming in case of errors, preserve existing files. Let write_bundle always create the bundle file, check if target doesn't exist and delete it in case of errors. This way incoming only has to delete the bundle file if it was meant to be a temporary file.

Cleaned up the code path for bundle handling in hg incoming, updated comments.

Documented behaviour of write_bundle regarding file handles.

imported patch /home/thomas/fix-incoming-abortion4.patch

Fixed abort while remote incoming command on windows.

write_bundle: close the file before removing it in case of failure

merge with crew.

still use old variable names when running hooks. dropped by accident. we set HG_FOO (new name) and FOO (old name). plan is to drop old names after 0.9.

hg status cleanups: Don't translate long options, remove stray semicolon.

add remotecmd/ssh option support to incoming/outgoing

fix template bug that made hgweb break. problem found by Shun-ichi Goto <shunichi.goto@gmail.com>. this fix tested with command template and hgweb templates.

Don't require the "yes" command for test-merge5.

tests: more portability fix for the old systems

merge with crew.

update test for unrelated repo.

add -f/--force to pull, incoming, outgoing, to work on unrelated repo. before this, push would not push from e.g. "hg" repo to "kernel" repo but other commands worked. this was bad idea, could merge unrelated projects by accident. i did this tonight. now, all commands still work with unrelated repo but need --force/-f. abort is default. this is safer.

merge with crew

merge with crew

use a proper test instead of catching every exception

Fix the py2exe template path problem (issue:152) again. This patch is same with 1834:24881eaebee3 which is leaved behind by 1897:58b6784cf9f1.

merge with crew.

change default strftime format for better portability On some systems, such as Solaris and HP-UX, "%c" format give output without the leading zero on the single-digit month-day.

tests: fix portability issue for echo -n

add HGRCPATH env var, list of places to look for hgrc files. if set, override default hgrc search path. if empty, only .hg/hgrc of current repo read. for each element, if directory, all entries in directory with end in ".rc" are added to path. else, element is added to path. big thing about this change is that user "~/.hgrc" and system hgrc not longer breaks tests. run-tests makes HGRCPATH empty now.

hgk "committer:" bug I've been having an hgk problem with this tree: http://xenbits.xensource.com/ext/linux-ppc-2.6.hg, specifically changeset 93c590d23a53. The problem seems to be that the commit message contains a "committer:" line, which triggers a (relatively unused?) case in hgk.py... Both cases need the dates at the end of the line.

tests: add bunzip2 to prerequisite list

merge with crew/templates

fix the call to util.matcher (the args should be (reporoot, cwd, ...))

bundlerepo: remove relative import, fix a comment

new type of repo: bundle://path/to/repo+/path/to/bundlename You can use it to pull only some changeset from an uncompressed bundle.

incoming: add support for remote repo using bundlerepo

refactor the bundle writing code, since we will reuse it later

add bundlerepo.py: a read-only repo that can use uncompressed bundles The idea is to create a repo consisting of a normal local repository plus all the changesets contained in a bundle. The bundle needs to be uncompressed. A futur version could implement the seeking through a compressed bundle.

revlog.py: factorization and fixes for rev < 0 (nullid)