Add doc string for debugrename.

Fortify the recognition of a diff header.

Add -p to incoming and outgoing commands to show patch

Revert changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e. I inadvertantly used "hg import" on a message I saved, expecting it to do the right thing, but instead it made the commit look like I authored it, and filled the description with the email header. Changeset 737f9b90c571b3991f7e35dc846e7ef38a475cfe contains a guard against "hg import" doing this again.

Make import command reject patches that resemble email messages. See changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e for an example of why this is a good idea.

Make removal check more complete and informative.

Fix up remove command to use walk code.

From mercurial-bounces@selenic.com Thu Sep 1 07:01:32 2005 Return-Path: <mercurial-bounces@selenic.com> X-Original-To: bos@serpentine.com Delivered-To: bos@serpentine.com Received: from waste.org (waste.org [216.27.176.166]) by demesne.serpentine.com (Postfix) with ESMTP id 3616A20B571 for <bos@serpentine.com>; Thu, 1 Sep 2005 07:01:32 -0700 (PDT) Received: from waste.org (localhost [127.0.0.1]) by waste.org (8.13.4/8.13.4/Debian-3) with ESMTP id j81DxodQ028829; Thu, 1 Sep 2005 08:59:51 -0500 Received: from web32904.mail.mud.yahoo.com (web32904.mail.mud.yahoo.com [68.142.206.51]) by waste.org (8.13.4/8.13.4/Debian-3) with SMTP id j81DxnNA028824 for <mercurial@selenic.com>; Thu, 1 Sep 2005 08:59:49 -0500 Received: (qmail 25859 invoked by uid 60001); 1 Sep 2005 13:59:17 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=O6sELrlCknW3M/gKVqijWs82e/CbDEum1sEitcuLKXaP9dHU175PszOqMgcSKykMY+BVXtcH3NeaXLM3FyBmqNkoPAvesezyFbgQsHSM1S028oOexybCKMvtGQJmz66hzd1fDb0QoPj1gCcGU2VDevQaOesSmo1xF9jJwy2LlLE= ; Message-ID: <20050901135917.25856.qmail@web32904.mail.mud.yahoo.com> Received: from [60.48.222.94] by web32904.mail.mud.yahoo.com via HTTP; Thu, 01 Sep 2005 06:59:17 PDT Date: Thu, 1 Sep 2005 06:59:17 -0700 (PDT) From: TK Soh <teekaysoh@yahoo.com> To: mercurial@selenic.com In-Reply-To: <20050828075808.GO27787@waste.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 X-Virus-Scanned: by amavisd-new Subject: Re: add -p to hg tip X-BeenThere: mercurial@selenic.com X-Mailman-Version: 2.1.5 Precedence: list List-Id: mercurial.selenic.com List-Unsubscribe: <http://selenic.com/mailman/listinfo/mercurial>, <mailto:mercurial-request@selenic.com?subject=unsubscribe> List-Archive: <http://www.selenic.com/pipermail/mercurial> List-Post: <mailto:mercurial@selenic.com> List-Help: <mailto:mercurial-request@selenic.com?subject=help> List-Subscribe: <http://selenic.com/mailman/listinfo/mercurial>, <mailto:mercurial-request@selenic.com?subject=subscribe> Sender: mercurial-bounces@selenic.com Errors-To: mercurial-bounces@selenic.com X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on demesne.serpentine.com X-Spam-Level: X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.0.4 X-Evolution-Source: imap://bos@www.serpentine.com/ Content-Transfer-Encoding: 8bit

Merge with myself.

Output Content-encoding for tar.gz and tar.bz2 snapshots If the HTTP header 'Content-encoding' is missing for tar.gz snapshots, some gzip capable proxies can bork the tarball and serve unusable files to users. GZ tarballs are served using Content-encoding: gzip. BZ2 tarballs are served using Content-encoding: x-bzip2.

Fix up failing tests.

Optimize dirstate walking This generally cuts the time for hg status/diff in half, from 2s down to 1s. The main parts I'm trying to optimize are: 1) os.walk stats every file. dirstate.changes then stats every file again. 2) os.walk yields every file and subdir to dirstate.traverse who yields every file and everything in the dirstate map. dirstate.walk then filters this mass and yields every file to the caller. There should be fewer steps in here, and fewer duplicate strings yielded. 3) dirstate.walk runs util.unique on the results from dirstate.traverse, even though it is also passing things through dirstate.seen to look for duplicates. I've turned os.walk into something hg specific that takes all the dirstate ignore and matching rules into account. The new function also takes an function arg (statmatch()) the caller supplies to help filter out files it doesn't care about. dirstate.changes uses this to update state for each file, avoiding the second stat call. dirstate.walk is changed to turn the match function it is passed into a statmatch function. The only real difference is that a statmatch function takes the stat data as a second parameter. It now calls dirstate.walkhelper, who requires a statmatch function to be passed. This fails test-walk, but right now I think this is from a sorting error fixed by this patch. Index: crew/mercurial/dirstate.py ===================================================================

Merge with http://hannibal.lr-s.tudelft.nl/~vincent/fcgi/mercurial/fcgi/

Make sure the repository names don't have slashes at the at or else in some cases env[path_info] will not find an defined repository. REQUEST_URI can contain a query_string appending the repository name would lead to corrupt urls.

Saving sys.argv and sys.stderr is not needed anymore

Fix mercurial.el help.

Adjust hg-strip and hg-chomp regexps.

hg serve: print a more useful error message if server can't start.

Merge with TAH.

Emacs: fix invocations of "hg log" to match current behaviour of log.

Added missing 'import errno', and use errno for EPIPE, too.

Merged changes.

Use path relative to document root as reponame if published via a web server. The full path is still displayed when using 'hg serve'.

Sort items in each hgrc section. Add web/description.

Make .hg/hgrc optional for repositories published by hgwebdir.

Reverted changeset e254bcbfe636e97301f76c7da241b07be14f3d36 Volker Kleinfeld agreed that this is dead code and tried to fix a problem which was already fixed somewhere else.

Fixed two tests to run with bourne shell.

Added FIXME output to test-grep so the test will not fail.

Added test case for zip/gz/bz2 archive downloads.

Fixed import needed to serve zip files which broke because of other changes.

Merge with http://hannibal.lr-s.tudelft.nl/~vincent/fcgi/mercurial/fcgi/

Don't need to save sys.stdin and sys.stdout anymore

Use local generated env instead of os.environ

Fix hg serve...

Fix TypeError

Change use of global sys.stdout, sys.stdin os.environ to a hgrequest object. Note: also change hgrequest.write(str(thing)) to hgrequest.write(thing), people should make sure they write strings.

Regenerate tcsh_completion after bugfix in generator script

tcsh_completion_build.sh: fixed error caused by xargs on Linux

Add tcsh_completion to contrib

Add contrib script for generating tcsh completion source

patchbomb: fix up confusion between strings and lists of strings.

bash_completion: try to use bash3 features if they're available This does NOT break completion for bash 2.05b (I haven't tested earlier versions)

bash_completion: small cleanup and bugfix _hg_count_non_option wasn't taking global options into account while counting non-option arguments. It also used only its first argument.

teach bash_completion about --cwd

bash_completion: better handling of aliases Instead of listing every alias in the big case..esac, use hg help to get the canonical name of the command.

bash_completion: update for new help output format

Add test-grep.out file for now.

Merge with TAH.

grep: extend functionality, add man page entry, add unit test. walkchangerevs now returns a two-tuple. Its behaviour is also extensively commented. The annotate command's getname function has been factored out to a new function, trimname, so it can be shared between annotate and grep. The behaviour of grep has been beefed up, so that it now performs a number of useful functions.

grep: change default to printing first matching rev. Printing of every matching rev remains via --every-match/-e switch.

Documented passing list or dict instead of config file in hgwebdir.cgi

Allow list of (virtual, real) or dictionary to be passed to hgwebdir.

Cleaned up hgweb.hgwebdir.run()

Use ConfigParser only in hgwebdir.__init__()

Don't create repo objects in hgwebdir, ui object is enough.

Reverted change 51f26e856f3d: Reading changelogs is too slow.

Use commit time instead of stat to check time of last change.

Remove the link from the template as there no real way to have it always be correct.

Make diffstat optional for patchbomb script.

Variable 'body' was missing in patchbomb script.

Adjusted test-hup for generated .hg/hgrc

Create [web] section with short username as contact on hg init and hg clone.

Completed renaming author to contact in hgwebdir: Prefer [web] contact = foo instead of author, but still accept the old name. Adjusted template to show obfuscated contact. Drop bogus <i>email</i> entry.

Create repository objects instead of using own ConfigParser in hgwebdir.

Longer variable names in hgwebdir: l->repos, v->name, r->path

Move generating short username to display in hg/hgweb annotate to ui module.

Fixed test-static-http with http_proxy variable set.

Fixed test-copy2 with only looking at copied files.

Changed printing of copies in hg debugstate to: "copy: source -> dest"

Add RSS link to the repository index. Index: hg/templates/index.tmpl ===================================================================

Add the template.

Use a template for the error message.

Use .has_option to avoid the unknown Exception.

NoOptionError is unknown there.

Handle a nonexistent repository with a 404 error. Based on changeset 62ea868cafbfa3acb7e5dba6982ecb46a1637246 from Vincent Wagelaar <vincent@ricardis.tudelft.nl> in http://hannibal.lr-s.tudelft.nl/~vincent/fcgi

Protect against unknown repositories.

patchbomb: eliminate silly complete summary message No longer makes sense without attachments

fix some rename/copy bugs - delete copy information when we update dirstate hg was keeping the copy state and marking things as copied on multiple commits - files that are renamed should have no parents if you do a rename/copy to an existing file, it should not be marked as descending from its previous revisions. - remove spurious print from filelog.renamed - add some more copy tests

Add some rename debugging support

bash_completion: add debugindex and debugdata support

Remove the lock file copied during clone (was the source lock file) Index: hg/mercurial/commands.py ===================================================================

Updated manpage and help. Updated manpage on change to hg status; standardized description of -print0 options.

hgweb: add mdiff / fix sorting of archives

Add an old-http test case This uses a trivial Python http server to test pulling from a static http server.

Add a simple dummy ssh test This uses the -e flag to run a dummy script rather than actual ssh to test the protocol over a local pipe.

Merge with TAH

Remove some options from 'hg grep': -Z (we have -0 as in locate) -a (use "-r 0:tip" instead, or always grep all unless -r is given) -e (we have the PATTERN argument) -v (doesn't work, and this is more of a job for 'hg cat|grep') -s (we have -q/--quiet) -f (should be always enabled if -l used, or enable on -v/--verbose)

Adjusted test-help for change to hg status.

Whitespace cleanup.

Replaced hg status -p/--strip with -n/--no-status to not confuse with patch.

Fix dirstate imports

Fix sshrepo imports

localrepo: minor opener usage restructuring

Separate out old-http support - create new statichttprepo class - pull remote bits out of localrepo - pull remote bits out of util.opener - switch hg.repository to use statichttprepo

localrepo: more import/namespace tidying

Minor import fixups

manifest: convert sys.stderr bits to AssertionError

localrepo: adjust some imports, remove sys dependency

sshrepo: adjust file comment

changelog: adjust imports, comment

Adjust some imports

commands: use revlog directly for debug commands This eliminates the import in hg.py

commands: use node functions directly

Move hash function back to revlog from node

Move opener to utils - move the opener code down to util - add docstring - change commands.py users to simply use file instead

Break apart hg.py - move the various parts of hg.py into their own files - create node.py to store node manipulation functions

updated manpage for new options of status

hgweb: add catch for connection reset suggested by Jeff Sipek

Fix up help test

status: added option -p and -0 to assist xargs The -p option strips the status prefix of each file, while -0 ends each file with a NUL character, instead of a newline. Together, selected group of files can be passed to 'xargs -0' for further processing.

updated manpage on global options and typo fix.

Add some docstrings to revlog.py

Update util.py docstrings, fix walk test

Change canonpath to not know about repo objects Code in util should not have any knowledge about repo objects

Updated list of contributors.

Document archive download options

Various cleanups for tarball support s/tarball/archive/ query config rather than maintaining a list default all archive support to off use changeset nodes rather than manifest nodes use web:name for archive name don't use rev number in filename, it's not portable refactor manifest lookup bits use finally: clause to delete tmpfile

tarball support v0.3 pt 2

tarball support v0.3 Hello, I'm slowly improving support for tarballs in Mercurial. Attached patch is made against current tip in Matt's repository - f859e9cba1b9, and contains everything done so far. Changes: - gzip and bzip2 tarballs are sent immediately without writing to temporary files (I was wrong Matt, it can be done very easy) - hgrc customization, you can choose which type (if any) you will support There's no easy way to support compression levels, since TarFile open() assume that it is 9. I tried to use gzopen(), and bz2open() methods instead, but it seems that headers of generated archives, are missing or wrong. We could eventually try to rewrite tarfile.py and include our own version into Mercurial, but I don't know if it's good idea... Wojtek

Fixed system command abord reason on windows.