zsh: add view opts

zsh: add --style and --template opts

zsh: add -r to parents

zsh: expand tags lazily

make mq play nicely with the branch cache - if no patches are applied, don't do anything different - if the cache includes valid data from one of the patch revisions, use the cache, but don't save anything new - if the cache has data from before the patch revisions only, save what the list of branches would be without the patch revisions

Split branchtags into two additional functions. This makes it easier to override only parts of the cache saving process.

Merge with crew

Commit username: Better error message, abort on empty name, fix documentation.

hgweb: make #motd# available for all templates

zsh completion: basic mq support

bash_completion: qguard

bash_completion: allow overriding completion for arguments that start with "-"

bash_completion: qfold, qrename, qheader, qclone and qselect

bash_completion: email --bcc

bash_completion: qdelete --rev

bash_completion: make export fall back to tags when there's no mq patch applied

bash_completion: don't complete export with "garbage" when mq is not around The "garbage" is the output of hg help printed when a command is not found.

Fix "templater object got multiple values for keyword argument 'motd'" caused by adding motd to the call to the index template (2896ce093ec4)

Add #motd# to gitweb pages. Needs to pass self.motd to index template, too.

gitweb: add revision numbers to annotate changeset links

gitweb: add revision numbers to filerevision changeset links

hgweb: add revision numbers to changeset parent/child links

fix errors spotted by pychecker

use xrange instead of range

use xrange instead of range

Corrected SSH configuration example in pull help.

revlog.children: use parentrevs instead of parents

Don't use test -e in tests - sh doesn't like it on Solaris

Update tests output

Add --rev option to status

makes username mandatory

patch: return list of modified files even when an exception is raised The file list is passed in as an argument and updated in place. This fixes issue399.

mq: test case for issue399

Extended templating test for new branches and extra changeset info.

Added extra changeset info to templater and map-cmdline.default.

Add new branch info to templater and use it in map-cmdline.default. The template currently shows old (hg log -b style) branch tags, too, but not in the same way as the built in changeset_printer.

Don't show empty list of files in hg log -v.

Adjust default cmdline style to really match verbose/debug log.

Show extra changeset info for log/tip/heads/... --debug

localrepo: add separate methods for manipulating repository data This change adds new methods sjoin and sopener for accessing the following elements: - changelog - manifest - data/ - journal and undo log - repo lock This will simplify sharing this data and escaping paths

Minor tags optimization

Use file contexts in tags code

filecontext: report False for missing files

Only look up tags and branches as a last resort

If we can't write the branch cache, fail quietly.

Add test for invalid branch cache (fixed by 27ebe4efe98e)

invalidate the branch cache when sanity check fails

Testing the new changegroupsubset remote function in the ssh and http protocols.

Stop erroring out pull -r and clone -r if repository isn't local.

sshrepo: add passing of lookup exceptions

Adding changegroupsubset and lookup to ssh protocol so pull -r and clone -r can be supported.

httprepo: add support for passing lookup exception data

Adding changegroupsubset and lookup to web protocol so pull -r and clone -r can be supported.

Improve branch cache sanity check for mq

merge: fix branch setting (and remove debugging message)

imported patch foo

commit: read branch with workingctx

branchtags: use changectx setting self.branchcache on entry avoids recursions in lookup

revlog.lookup tweaks - fast path for binary node ids - direct lookup for full hex ids - silly change to bin_id

Merge with crew

use ui.readsections in the acl extension

use ui.readsections in the bugzilla extension

use ui.readsections in the notify extension

add ui.readsections Given a file name and a set of sections, this function reads the file and adds only the specified sections to the configuration data.

Default editor for Windows installer is now notepad. [Issue 256]

Document the change in MacPython distutils installation location

Added *.bin to MANIFEST.in to include binfile.bin

bundlerepo: avoid exception in __del__ when the bundle doesn't exist $ hg -R bundle://foo.hg abort: No such file or directory: foo.hg Exception exceptions.AttributeError: "'bundlerepository' object has no attribute 'bundlefile'" in <bound method bundlerepository.__del__ of <mercurial.bundlerepo.bundlerepository object at 0xa7ab9fac>> ignored

portability fixes for some tests Apparently the ls on OS X 10.3.9 exits with success even if the file given on the command line doesn't exist

Explicitly use "tip" in revision navigation. Rationale: the tip revision is a moving target and if somebody wants tip, it should be delivered.

Add a test for the acl extension

Use a case-sensitive version of SafeConfigParser everywhere This change has the potential to break existing setups, but the current behaviour (the keys in configuration files are always lower-cased) can bite us in a few places: - no way to use a Command in [defaults] - hgext.Extension doesn't work in [extensions] - you can't use an Upper/case/PATH in the [paths] section of hgweb.config - you can't (easily) protect paths with upper-case letters with the acl extension - you can't specify a /Path/TO/a/rEPO in the [reposubs] section for the notify extension

Fix test-oldcgi after navbar update

Fix RSS URLs (closes issue396)

Convert changenav bar from revisions to hashes (closes issue189)

Merge with crew

Add some basic branch name tests

Add branch support to commit

Make lookup aware of branch labels adjust precedence order slightly: - '.' - tags - branch labels - revlog order

Add branchtags function with cache - cache stores tipmost node and rev and node,label pairs - if cache is out of date, scan new changesets - write new cache out after scan

Update branch on checkout/update

Report branch for hg id

Report branch for hg log and friends

Add branch method to contexts

imported patch b1

add footer to old style

fix rss template

Fixed page overlap for file revision links in hgweb. This is another step to fix issue189, but currently the file revision numbers are read as changeset revision numbers, so the link will point to the wrong revision.

merge with main

hgweb: hoist changenav up, and use it in the filelog

hgweb: link to file parents in filediff, rather than changeset parents

Test annotate using named rev instead of linkrev

Fix annotate where linkrev != rev without exporting linkrev

Back out d8eba1c3ce9b and a004164dbeef

Make annotate use linkrev instead of rev

Add linkrev to filectx

merge: if filemerge skips merge, report as updated

Catch python2.3's IndexError with bogus http proxy settings. (issue203)

Fixed contrib/hgdiff script to pass diffopts in the new format.

document the diffstat option of the notify extension

hgweb: add diff links in gitweb file revision page

hgweb: add changeset description to file revision page

hgweb: really fix parent/child rename links

hgweb: better file rename links

hgweb: fix parent/child links across renames

hgweb: add changeset description to annotate page

make revlog.addgroup pass its file handles to addrevision This should fix issue255. It looks like the problem there happens when addgroup calls addrevision to add a full revision, and addrevision decides to split the index file into a .i/.d pair. Since addgroup has an open file handle for the index file, the renaming of the new .i file to its final name fails on windows.

Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann)

merge with upstream

use short hashes with diff -v

Use manifest rev instead of changelog rev for linear manifest test

Removed unused imports of mdiff and templater from ui.py

log --copies: use manifest.find instead of delta when manifest parent is not rev-1 This fixes issue391.

Test case for log --copies on non-linear manifests (issue391)

hgweb: fix path cleaning

Merge with asak

portability fix for test-ssh The __del__ method of sshrepo reads the stderr of the remote process until EOF and prints it. If an exception is raised, this method ends up being called: - on Linux: after the "abort: ..." message is printed - on OS X: before the "abort: ..." message is printed This patch explicitly flushes the stderr of the remote process before raising a RepoError.

Merge with mpm

Add popen2 demandload to patch.py, required by diffstat

rawcommit: add removed files to the changelog file list patch by tonfa.