gitweb: prevent wrapping of "changeset | manifest" links

merge with stable

Abort on empty username so specifying a username can be forced. This behaviour was introduced by c3345b0f2fcd and broken by 98f2507c5551. Added test for this.

Copied files sources were not shown by status -C under Win32. repo.dirstate.copied() takes a normalized paths while local paths were passed.

add test for 540d1059c802

merge with upstream

mq: allow push if -r is given explicitly

hgk: remove embedded nulls in descriptions

Don't use ints in HTTP headers

Enforce unixish style for all generated patch names. User supplied names are left unchanged (including those loaded from series).

Make test-transplant test pull case

Update transplant's merge.update call

Minor test-transplant cleanup

merge with jsmith

use DESTDIR both places its needed

honor DESTDIR env variable for docs' make install

install man pages by default into $(PREFIX)/share/man not $(PREFIX)/man since the FHS puts them there

merge with -stable

bundlerepo: it was meant to be revdiff() instead of chunk()

patchbomb: fix timezone offset in message date header Use mercurial.util instead of time to set and format dates.

fix for digest auth when using keepalive.py The problem was with python > 2.3 which stores part of the headers in unredirected_hdrs. Furthermore, we simplify the code to use httplib directly. fix issue473

Subclass file with a __len__ method instead of setting Content-length This is necessary for the next patch to work with python2.3 Refactor the subclassing of send()

hgweb: add raw template to hgwebdir

Flush stderr after write. stderr can be buffered under win32 when redirected to a file, including stdout.

Merge branchname changes in localrepo.commit.

Use local encoding for "HG: branch" line in commit editor.

Add branch name to editor text.

When committing, record the changeset in the branchcache.

Allow adding symlinks that don't point to files

catch AttributeError in util.checklink There's no symlink function in the os module on windows. Fixes issue468

sync with -stable

Handle exceptions in do_hgweb: Send "Internal Server Error", log traceback

various doc fixes - update can no longer be used to merge - short summary start with lowercase - add merge to short help list - fix tests

catch socket.error fix issue394

fix handling of multiple Content-type headers This can happen if an error happens while sending application/mercurial-0.1 content. The error page will be sent resulting (for at least lighttpd) in the following headers: Content-type: application/mercurial-0.1 Content-type: text/html which result in req.proto = 'application/mercurial-0.1, text/html' fix issue344

add [diff] section to hgrc documentation

inst.reason isn't alway in the form (errno, strerror) urllib2.urlopen("foobar://foo") is an example where inst.reason is a string fix issue383

fix hg help <ext> for extension that do not define any command solve issue462

mq: fix strip failing to unlink a bundle os.unlink doesn't know how to deal with urls

symlinks: minimal support for symlinks in merge/update This will get angry, confused, and sad if you try to merge a symlink with a regular file.

symlinks: add flags param to wwrite Now wwrite can set symlink and exec for files

replace filehandle version of wwrite with wwritedata

unify encode/decode filter routines

symlinks: add _link checking function

symlinks: use is_link wherever is_exec is used

symlinks: don't complain about symlinks

symlinks: add a linkfunc

symlinks: add basic symlink functions to util.py

symlinks: check whether a filesystem supports symlinks

exec: remove last flag from is_exec

exec: add execfunc to simplify exec flag support on non-exec filesystems

pull umask-checking up

exec: checkexec checks whether filesystem supports exec flags

expanded bash_completion for transplant extension

Yield entries from [paths], too, when completing -R/--repository.

Corrected synopsis for transplant.

Improved error message for extensions overriding commands (with test): - Old text "module foo overrides bar" was misread as overriding module bar. - Only print a single warning line per extension instead of one for each command.

sync with stable

Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.

test-manifest-merging: we only need to remove files

Make test-manifest-merging less likely to delete the whole filesystem

Send encoding information in rss header

Fix a pygettext complaint

spelling fix

mq: remove unecessary code, duplicate with util.opener

hgk: (re)optimize reading of changelog and manifest

mq: use contexts

hgk: use contexts

hgk: remove unused code, node2 is always set

extdiff: use contexts

bugzilla: use contexts, simplify

acl: use contexts

hgweb: fix unused import

hgweb: use contexts, fix coding style

commands.py: use contexts in various places (debug*state, revert)

cmdutil.py: use contexts in findrenames

commands.py: use contexts in export

add possibility to pass flags when testing with the Makefile

archival.py: use contexts

patch: use contexts for diff

context: create a filectxt with filelog reuse

context: fix a bug in workingfilectx.renamed

make it possible to use changectx to create a filectx

remove various unused import

add date attribute to workingfilectx

fix tab vs space

test-manifest-merging: we only need to remove files

Merge with mpm

Make test-manifest-merging less likely to delete the whole filesystem

convert-repo: add option to attempt to sort by date

convert-repo: add CVS exec bit support

Fix removed file cornercase for CVS convert-repo

convert-repo: add CVS branch support

convert-repo: add basic CVS import support

merge with crew

grep: remove count handling, simplify, fix issue337

grep: incrementing is always False during 'iter'

Merge with crew

Send encoding information in rss header

pass the extra dict in rawcommit

Merge with mpm

Merge with crew-stable

sample.hgrc: hgk extension is now in hgext. Use churn as example for contrib.

purge extension doesn't need "#!/usr/bin/env python". (from the Debian package: deb_specific__hgpurge.py.patch)

hgweb: simple tests

hgweb: add raw manifest template

hgk - fix CR issues on windows

Update convert-repo usage comments

convert-repo: add some smarts autodetect source and destination repo types autodetect read and write capabilities of converters default destination directory (<src>-hg) default map file (<dest>/.hg/shamap) more verbose by default add a -q switch add IO functions

Merge with crew

Teach hgweb about revlog.LookupError

Move README info to wiki

Move test suite docs to the wiki

hg in: if no incoming csets, remove existing bundle

writebundle: overwrite existing bundle file

incoming/outgoing: return failure if no changes found

Add revlog.LookupError exception, and use it instead of RevlogError. Remove repo.LookupError, which devolves to the revlog version.

Add some modules to the demandimport ignore list for Windows

Sync with -stable

demandimport: blacklist _hashlib again (imported in ImportError try block)