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

In-progress Emacs snapshot.

Merge with MPM.

Merge with MPM.

Initial skeleton for mercurial.el.

Add --cwd global option, to change directory before doing anything. Useful for interacting with a program presenting a UI, such as Emacs.

Modify commands.walk to yield a 4-tuple. The new element of the tuple indicates whether a name is an exact match for one passed in on the command line.

Add a multi-repository server This merges a bunch of the ideas for a multi-repository CGI script and simplifies things a bit. It uses PATH_INFO so it generally wants paths of the form: http://host/hg.cgi/virtualpath This gets mapped via a simple config file to the real path. All info about the repo is read from the repo's hgrc.

Add in and out aliases

Fix stray debug statement

hgweb: add [web] section to hgrc This makes almost all of the hgweb settings available in hgrc.

Whitespace

Add a simple remove test

bash: Add smarter completion of add/commit/remove/forget/diff/revert Use hg status to determine which files are interesting for various commands. Thus, hg add [tab] finds unknown files, and hg commit [tab] finds added, modified, or removed files.

Fix path handling for deleting files on merge

Fixed --repository option when handling relative path When specifying relative path to --repository option, 'log' and 'diff' were unable to find the files specified. Here's the fix.

The TODO and the FAQ now live on the Wiki

Fix incoming for empty set

Fix incoming help test again

Add incoming to completions

hg incoming/outgoing: fix tests and update man page

Add hg incoming command for local repositories

Add a local() method to repository classes

run-tests: remove '+ hg' trick This was causing me a fair amount of debugging confusion. Let's just forget it entirely. Updated tests to match.

updated help text and added manpage section for hg paths Index: hg/doc/hg.1.txt ===================================================================

Add basic https support for pull

Teach bash_completion about outgoing

show_changeset: -q shows short hash

Add hg outgoing command

whitespace cleanup

hg cat: accept changeset hashes

Fix hg clone race with writer Most read operations in hg don't need locks because we order reads and writes for consistency. Clone is an exception to this as we're copying entire file histories and could end up with more file history copied than we have commits. For now, make clone take a lock on the source repo. Non-hardlinked clone should eventually be changed to use lockless pull.

Add bash_completion to contrib Contributed by "Alexis S. L. Carvalho" <alexis@cecm.usp.br> Attached is a file that implements bash completion for hg. Just reading it from your .bashrc should be enough to use it - I think: I'm using the /etc/bash_completion from debian and I'm not sure whether it sets some important option. It gets the list of commands, aliases and options from the output of hg help and then adds some specific stuff - e.g. completing update with tags; pull and push with path aliases and directories, etc.

Let hg paths work outside of repositories

Fix up help test

typo fix in command help text This patch fixes a few typo errors on the command help output (I am not sure if the change on 'diff' is the best though).

Minor tweak: os.STOPSIG -> os.WSTOPSIG. Pychecker spotted this one.

Fix .hgignore parsing if last line has no EOL, ignore trailing white space. (and don't use tabs in python code)

Merge with TAH

Addes test for error messages when operating on non-existing files.

Fix tests for new init command

Modify init command to take an optional directory to set up. If the directory does not exist, it is created. If no directory is given, the current directory is used.

Update synopsis for 'hg update', too.

Update online help of hg heads for new --branches option.

Add optional parameter for changed/added/del/unknown files to commands.dodiff This makes it possible to avoid a call into repo.changes if the details of what has changed is already known

Allow the changegroup generator to completely load the buffer. This makes is possible to delete or truncate away revisions and still use the changegroup later.

Add optional stop revision to revlog.heads

Change repo.comit to return None on error or the new revision number on success This allows the caller to correctly record the new revision number

Add force option to repo.commit, allowing commits where no files change

Add '-' support to the commit logfile option to read message from stdin.

Add searching for named branches named branching is when you identify a head by a tag on an earlier revision. This patch adds repo.branchlookup for searching through the tree to find branch tags for heads. hg update -b tag is added to checkout based on branch tags hg heads -b is added to print the tag associated with each head

Fix bug with empty inc and exc This fixes an exception that showed up when importing patches

Merge with BOS

Merge walk changes with Matt's tip.

Merge with TAH.

Turn off testing of absolute paths for now. I don't know how to stop this from always reporting false errors, and am too lazy to worry about it right now.

Fix bug involving "hg debugwalk -Ipattern" from repository root.

Fix clone when target directory is relative.

Merge walk fixes.

Add unit tests for walk code.

Fix up handling of regexp paths.

Merge Windows path fixes.

Fix walk path handling on Windows

Merge latest round of walk fixes.

Fix walk code for files that do not exist anywhere, and unhandled types. Prior to this, a file that did not exist was reported as showing up in the filesystem, as were files of unsupported types (such as fifos). Now, an error message is printed and nothing is returned in such cases. This change also moves the commands.pathto function to the util module, as the walk code needs it to print non-confusing error messages.

Update to tip.

Merge IPv6 fix.

Fix problem with "hg serve" on systems not providing IPv6.

addremove was not correctly finding removed files when given a list of files to look at. These end up with a src of 'f' from walk() but no longer exist on the filesystem. Index: mine/mercurial/commands.py ===================================================================

dirstate walking optimizations The repo walking code introduces a number of calls to dirstate.map.copy(), significantly slowing down the walk on large trees. When a list of files is passed to the walking code, we should only look at map entries relevant to the file list passed in. dirstate.filterfiles() is added to return a subset of the dirstate map. The subset includes in files passed in, and if one of the files requested is actually a directory, it includes any files inside that directory tree. This brings the time for hg diff Makefile down from 1.7s to .3s on a linux kernel repo. Also, the diff command was unconditionally calling makewalk, leading to an extra pass through repo.changes. This patch avoids the call to makewalk when commands.diff isn't given a list of patterns, cutting the time for hg diff (with no args) in half. Index: mine/mercurial/hg.py ===================================================================

Merge patchbomb script.

Polish patchbomb script. diffstat output is now a non-default option. The hgrc file can now contain default information for the patchbomb script. Date generation is fixed.

Get patchbomb script to not use MIME attachments. Adding patches as attachments makes it difficult or impossible for some mail clients to quote them effectively.

Add patchbomb script.

Merge Chris's changes with mine.

addremove was not correctly finding removed files when given a list of files to look at. These end up with a src of 'f' from walk() but no longer exist on the filesystem. Index: mine/mercurial/commands.py ===================================================================

dirstate walking optimizations The repo walking code introduces a number of calls to dirstate.map.copy(), significantly slowing down the walk on large trees. When a list of files is passed to the walking code, we should only look at map entries relevant to the file list passed in. dirstate.filterfiles() is added to return a subset of the dirstate map. The subset includes in files passed in, and if one of the files requested is actually a directory, it includes any files inside that directory tree. This brings the time for hg diff Makefile down from 1.7s to .3s on a linux kernel repo. Also, the diff command was unconditionally calling makewalk, leading to an extra pass through repo.changes. This patch avoids the call to makewalk when commands.diff isn't given a list of patterns, cutting the time for hg diff (with no args) in half. Index: mine/mercurial/hg.py ===================================================================