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.

Update test-mq-qdelete to use qdel -r

mq: make qdelete without -k or a subrepository delete all patches

Use line length field when extracting git binary patches

mq: change qdel --forget to --rev; accept any revision symbol

merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update

merge: turn followcopies on by default

mq.el: add mode-line hook

python2.5 PyArg_ParseTuple fix Python 2.5 doesn't like it when we mix str objects and the "t#" format in PyArg_ParseTuple. Change it to use "s#". Tested with python 2.3, 2.4 and 2.5.

Add test for git binary diff support

Add git-1.4 binary patch support

gitweb: Fixed parent/child links when viewing a file revision.

Keep session variables when linking from hgwebdir's index to repositories.

Fixed typo in gitweb templates.

hgweb: Apply the new method of passing session variables to links.

hgweb: Keep session variables (currently only style) in HTML forms, too. Adjusted default and gitweb template for this.

templater: Better exception for errors in foo%bar formatting.

nodesbetween: fix a bug with duplicate heads

hgweb: trap lookup errors

Add better error message for bad commands

gitweb: Add error text to error page

gitweb: fix link on file name in filenodelink

gitweb: fix last change field in summary

Merge with main

gitweb: add file diff view

Merge with crew

merge with crew

update ui.quiet/verbose/debug/interactive every time the config changes - ui.quiet/verbose/debug/interactive become just a cache of the ui.cdata settings - the quiet, verbose, debug and interactive options from the [ui] section from .hg/hgrc files are respected for commands that open the repo - setting ui.quiet/verbose/debug/interactive with --config works - the command line options always override the hgrc settings - previously it wasn't possible to override a [ui] debug = True. --debug still takes precedence over --quiet and --verbose.

ui.py: untangle updateopts The code in ui.updateopts that handles ui.quiet, ui.verbose and ui.debugflag is too smart, making it somewhat hard to see what are the exact constraints placed on the values of these variables, hiding some buglets. This patch makes these constraints more explicit, fixing these buglets and changing the behaviour slightly. It also adds a test to make sure things work as expected in the future. The buglets: - setting ui.debug = True in a hgrc wouldn't turn on verbose mode - additionally, setting ui.quiet = True or using --quiet would give you a "quiet debug" mode. The behaviour change: - previously, in a hgrc file, ui.quiet wins against ui.verbose (i.e. the final result would be quiet mode), but --verbose wins against --quiet - now ui.quiet nullifies ui.verbose and --verbose nullifies --quiet. As a consequence, using -qv always gives you normal mode (unless debug mode was turned on somewhere)

call ui.updateopts only after changing directories This corrects --config paths.foo=bar when it's used with --cwd

ui.py: normalize settings every time the configuration changes Previously, we would normalize settings (e.g. turn relative paths into absolute ones) only after reading a config file. Now "--config paths.foo=bar" will use the cwd to make "bar" an absolute path.

move the parsing of --config options to commands.py

ui.py: use the overlay to hold --config data This allows the ui class to know that these items have a higher priority without further help from commands.py.

ui.py: change the overlay from a dict to a SafeConfigParser. This also fixes what's probably a bug - configitems was ignoring the overlay.

ui.py: don't query parentui.cdata when looking up config items. We copied the contents of parentui.cdata on initialization.

ui.py: make walkconfig use configitems Also make it sort the available config sections while we're at it.

ui.py: move common code out of config and configbool

ui.py: remove revlogopts and (unused) diffcache variables This should make the [revlog] section in a .hg/hgrc file be respected when there's still no changelog.

ui.py: don't let parent and child ui objects share header and prev_header

ui.py: use correct parentui while copying readhooks

changectx: search manifest delta for filenode

context: check self.__dict__ instead of using hasattr hasattr implicitly calls getattr, instantiating the field it is checking for.

Teach bdiff to support buffer objects manifest.add gives revlog.addrevision a buffer object, which may be cached and used for a second call in the same session (as mq does when pushing multiple patches). The other option would be to cast the buffer to str when caching it.

Test case for bdiff on buffer objects

hgweb: globally default to tip if no revision is specified

Support buffer interface in base85 codec