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.

Add revlog.reachable to find a graph of ancestors for a given rev

[PATCH] raise exceptions with Exception subclasses Fixed the patch. Using Exception subclasses. (tweaked by mpm)

Fixes for push corner case TAH found a bug where push would push things the remote already had, raising an assertion. This turned out to be because the changeset protocol was not recording a common subset node in one case. Also discovered was that the protocol was queueing multiple copies of a node for pull. Fixed by changing fetch to a hash. Add some more debugging output.

Add support for extension modules This adds support for an [extensions] section to hgrc. This has the form of: [extensions] mod=[path] If a path is specified, the python module found at that path is load. Otherwise, __import__ is used to find the module. Each module must implement a dict called cmdtable where the command line options for that module live. Each module must also implement a reposetup function: cmdtable = {} def reposetup(ui, repo): pass Index: hg/mercurial/ui.py ===================================================================

hgwebdir index: change "author" to "contact"

Allow using a ssh repository without a path. This uses the home directory on the remote side or the directory specified in the command in .ssh/authorized_keys

Fixed synopsis for grep command.

Fixed zero-padded filenames with %r if there is a longer number in the middle. e.g. with: hg export -o ../%r.patch 99 100 98

Shortened commands.revrange() a little bit, added docstring.

Cleanups to commands.py

Removed obsolete imports from hgwebdir.cgi

Some more spacing/indentation/linebreak cleanups to hgweb.py.

pep-0008 cleanup - Don't use spaces around the '=' sign when used to indicate a keyword argument or a default parameter value.

Fix set type usage for Python 2.3

Merge from BOS, fix help

grep: speed up matching, and only return one match per line.

Use ui.write instead of print in debugwalk.

Add grep command. It currently searches all revs of every matching file. I'll change this soon so that it can still do this, but it will not be the default behaviour. Many options are unimplemented. There's only one output mode. Binary files are not handled yet.

Map long option names containing dashes to ones containing underscores.

Minor test-help fix

Fixed some synopsises in command help.

Added missing doc strings for two new debug commmands.

Adjust display and alignment of command options to match global options.

Clean up displaying help of global options, only one row per option.

Moved --cwd handling to a place where ui and exception handling already exists.

Allow --help and --version being used together.

Added options -h/--help.

Moved special handling of --version and no hg command from parse to dispatch. This allows e.g. 'hg status --version' to work.

Sort global options by topic: directories, ui, timing, other (and changed indentation to match command table)

run the doc/* through aspell.

Removed forgotten debug print statement from commands.py and tests.

Update tests

Fix a couple fencepost errors in hg log

Fix hg log -p

Show number of new heads when doing a pull

Add debugdata for dumping revlog revision data

Merge with MPM.

Fix a small corner of log behaviour. If invoked with no arguments in a subdirectory of the repo root, it should print the history of the repository as a whole.

Update hg log docs

Merge with BOS

Fix help output, and a few broken tests.

Merge with MPM.

Get patchbomb working with tip again.

Rewrite log command. New version is faster and more featureful. The original implementation of log walked backwards through history, which had terrible behaviour. It took several minutes to view complete kernel change history on a fast machine, for example. The rewrite uses a windowed approach to walk hunks of history forwards, while still giving results in reverse order. This reduces run time from five minutes to five seconds on my system. In addition, the rewrite uses our normal name handling mechanisms, so you can run a command like "hg log net/ipv4/**.c" and get a useful answer. It optimises for three different cases (no arguments, only files, and anything goes), so it performs well in all circumstances I've tested.

Merge with MPM.

Emacs: implement hg-incoming, hg-outgoing and hg-push.

Add commands.debugconfig. This lets us both view the actual config data that hg is using, and drive editors that need to see this information.

Emacs: fix up hg-log and hg-diff to operate more uniformly.

Merge with MPM.

Merge with MPM.

Sync buffers prior to doing a diff.

Minor tweak to the revgen algorithm

Minor hgwebdir tweaks - ignore / for PATH_INFO - fix // in URLs

Add Makefile to the manifest

Add default make rule The default make rule builds the extensions "in-place" so that hg can be run out of the working directory.

Create helper functions for I/O to files in the working directory This simplifies some code and gives us a single place to add I/O filters.

Add some aliases

Fix up help for binary options

Teach annotate about binary files

Add automatic binary file detection to diff and export Based on a patch by Fuming Wang - add util.binary which decides whether a file is binary if it has any NUL characters in the first 1K. - teach mdiff.unidiff to print "binary file <x> has changed" for binary files - add text flag to cause unidiff and dodiff to treat all files as text - add -a and --text flags (like diff(1)) to hg diff and export - update docs

Clean up argument passing for dodiff

Deal with repos with missing timezones

Merge with BOS

Emacs: search for hg in path before looking in funny places.

Merge with TAH

Don't show the diff in hgeditor if there are no changes in file contents.

Add Makefile for generating release tarballs. - test suite is run - documentation is generated and included

Include generated documentation in MANIFEST.

Generate html documentation by default, too.

Merge with BOS

Emacs: improved GNU Emacs support.

Emacs support: numerous changes. Most SCM commands now work in derived buffers (e.g. diff viewing buffers) as well as buffers backed by files. diff and log now work properly on repositories and files. Commit support is more solid. Doc strings are better.

Merge with MPM.

Emacs: update mode lines properly after commit.

Emacs: kill commit buffer once it's done with.

Emacs: first cut at commit support.

contrib/patchbomb: Fix buglet with empty cc list.

Fix handling of addresses in hgrc.

Emacs: document existing functions.

Emacs support: add hg-revert-buffer.

Fix callers to file.revision to use file.read This was causing unchanged files to show up as modified.

Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases

Fix up some bugs introduced by recent merge changes - use new changed list to track what files actually got new revlog entries at commit/rawcommit time - when updating a file during a merge, don't mark it as completely unchanged - handle file not being in parent 1 in status

merge: remove remaining mark bits

Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.

Reformat debugindex output

Remove unused relfilter function

hgweb: change startup argument processing - allow passing a repo object instead of a path (if we get a string, we construct a repo object) - hg serve: pass options via repo.ui.setconfig - add --style option - get default name from repo.root rather than getcwd() - remove template argument to hgweb() - reduce create_server from 8 args to 1

Add web:style option

hgweb: fix RSS and raw for new % scheme

Remove debug print

Fix RSS feeds

hgweb: convert index entries to list expansion style

Merge with jeffpc

Merge with MPM

hgweb: Changed manifest page to list format syntax

hgweb: Changed file revision page to list format syntax

hgweb: Changed annotate page to list format syntax

hgweb: Changed file page to list format syntax

hgweb: Changed changelog page to list format syntax

Added support for #foo%bar# syntax This required moving template() into the templater class

Deal with non-integer date offsets generated by some tools

Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32

Remove call to non-existent date_parser

Fix possible unitialized variable warnings

Minor README updates

[PATCH] Take DST into account Right now, mercurial doesn't take daylight saving time into account because it uses time.timezone inconditionally, instead of resorting to time.altzone if daylight saving time is on.

[PATCH] Print timezone offset when outputting dates Example: % hg log | head -12 changeset: 791:41440890e57d2dbacde03a2a114e5114a031ea4a tag: tip user: Samuel Tardieu <sam@rfc1149.net> date: Mon Jul 25 13:24:15 2005 +0200 summary: Parse various date formats when accepting user specified dates [...] changeset: 787:ba5c2021364ee876dae170e8f153e43bd0b2bd73 parent: 785:31a80e3723cee0a5991340facb2707e71983eb41 user: Bryan O'Sullivan <bos@serpentine.com> date: Sun Jul 24 00:39:24 2005 -0800 summary: Get "forget" command to use new walk code. [...]

hg import: abort with uncommitted changes, override with --force

Use post-expanded clone pathname as default

hgweb: Make maxfiles, maxchanges, and allowpull proper config options

Add -e and --remotecmd for clone and pull too

Doc updates for push, pull, hooks, local tags, and ssh options

Add --ssh and --remotecmd to push This uses the new setconfig options passing mechanism

Add ui.setconfig overlay This can simplify option passing

Fix option parsing bug for empty short options

Make mercurial.el load with GNU emacs

hgweb: sort repository list

Fix hgwebdir virtual start-up

Remove -C alias for --cwd

Add hgwebdir.cgi to MANIFEST.in

Merge with TAH

bash_completion: support GNU sed 3 and non-GNU sed replaced command 'Q' introduced in GNU sed 4, in order to support platforms with older sed.

Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.

Removed TODO from MANIFEST.in

test fixes for Solaris 2.6 Solaris 2.6's stock sed doesn't support alternatives in regular expression. We workaround by breaking up the regexp.

Merge with BOS