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