Merge with stable

Fix wrong module reference in copyfile exception

setup.py: reload __version__.py after writing it. write_version loads __version__.py before writing it (see 7eb694a1c1af), so we have to explicitly reload it to use the correct version. Problem diagnosed by Christian Ebert.

fix strip'ping the second parent of a merge

install reposetup hook right after loading the extension

Open bundle files in binary mode

convert-repo: handle packed git tags

lazyindex: handle __delitem__ in loadblock

commit: catch IOError filecommit can still raise IOError if we're on a filesystem without support for symlinks.

Merge with crew-stable

filecommit: don't forget the local parent on a merge with a local rename

Fallback to ascii if getpreferredencoding raises an exception Fixes issue478.

unbundle: don't use urllib if it's a local file

docopy: deal with globs on windows in a better way

Explicitly expand globs on Windows

mtime can be -1 after a merge and cause tracebacks on win32. Output "unset" instead.

Adjust documentation for 78a0dd93db0b (empty username to force specifying it)

hgwebdir: class hgwebdir should also accept a configparser instance

transplant: test non-local source

transplant: update to current writebundle API

mq: Mention usage of hg add/remove/copy/rename in qrefresh help text.

add pserver support to convert_repo

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

hgk: remove embedded nulls in descriptions

mq: allow push if -r is given explicitly

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

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

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

merge with crew

grep: remove count handling, simplify, fix issue337

grep: incrementing is always False during 'iter'

Merge with crew

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

Send encoding information in rss header

pass the extra dict in rawcommit

Merge with mpm

Merge with crew

Move README info to wiki

Move test suite docs to the wiki

hg in: if no incoming csets, remove existing bundle

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

Teach hgweb about revlog.LookupError

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

Added signature for changeset 27230c29bfec36d5540fbe1c976810aefecfd1d2

Added tag 0.9.3 for changeset 27230c29bfec

fix calculation of new heads added during push with -r fix issue450

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

demandimport: handle already-loaded nested modules in subload

Merge with crew

demandimport: fix import x.y.z as a when x.y is already imported.

Merge with stable

merge with crew-stable

Adjust test-help output for the change in 3c82ab166eea.

Fix test-hup for different output of ls on at least MacOS X and Solaris 8.

convert-repo: update usage information

Make 'hg sign' behave like other commands: Default to current parent.

doc fix: hg tags defaults to current parent revision, too. Additionally use better language for the help text for tag, cat and manifest.

doc string fix: hg cat and manifest default to current parent revision.

Using --date "" isn't possible, so don't document epoch. (see issue447)

convert-repo: avoid adding bogus value to shamap on tag update

convert-repo: fix recoding of committer

merge with crew-stable

Include hg.1.gendoc.txt in doc/MANIFEST to prevent unnecessary rebuild.

Regenerate hg.1 manpage if help text in help.py changes.

merge with crew-stable

util.system: fix quoting on windows

templater.py: fix obfuscate

Make demandimport pass all tests on python2.5.

Merge with crew-stable

fix strip on windows c: was interpreted as a protocol, prepend file: to the bundle file name

Don't use node length for calculating revision number length. Done by moving repo.lookup of revisions from commands.export to patch.export

Make sequence number on hg export start at 1 (as documented for %n). Add test.

Merge with main

demandimport: ignore _hashlib and email.mime This makes things work with Python2.5. A better fix would be to fix demandload to use __getattribute__ to be more transparent.

Fix setup.py warning

merge with main

Disable demandloading in setup.py

Simplify i18n imports

Fix demandload bits of setup.py py2exe support

Fix a pygettext complaint

Enable gettext translations The new demandimport eliminates most of the gettext performance hit of importing gettext, which was doubling the run time for 'hg'. Now, with 'hg tip': dummy: .09530s no translations: .09638s translations: .09755s

Merge with crew

use parent.__setattr__ instead of __dict__

Merge with main

Replace demandload with new demandimport

Remove deprecated old-style branch support

merge with crew-stable

Corrected synopsis for many commands. Use CMD instead of FILE for -e and --remotecmd (thanks, Neal Becker)

merge with hg-stable

Fix copy detection corner case We were aborting if the copied from rev was before the cut-off limit, rather than the copied _to_ rev. The copied from rev can be arbitrarily old.

Merging crew-stable

Set charset encoding for hgwebdir, too. (And remove extra spaces in the corresponding place in hgweb)

merge with crew

spelling fix

patchbomb: use ui.edit to compose summary mail

zsh: better fix for partial completions Properly handle relative paths followed by partial filenames hg add ../path/to/file/partial[TAB]

mq: fix qheader without args when guards are applied after qtop

Fix test output for test-mq-guards (changed by 22d18051f9e5)

fix MANIFEST generation

mq: auto-ignore guards in qinit -c

mq: fix explain_pushable for negative guards

Add instructions how to redo/finish failed merge with local working directory. b2ae81a7df29 already implemented this for branch merges.

hgweb.cgi and hgwebdir.cgi fixes/cleanups for user configurable parts: - "import os" was missing in hgwebdir.cgi, added to comments for both script. - HGENCODING has to be set before importing hgweb, otherwise you'll get mixed encoding in changelog vs. file content/diffs. - "import sys" is only needed when changing sys.path - document purpose of cgitb.

Added signature for changeset 36a957364b1b89c150f2d0e60a99befe0ee08bd3

Added tag 0.9.2 for changeset 36a957364b1b

Make make dist a bit quieter

Automatically build MANIFEST for make dist

Remove hard-coded version numbers and release notes from packaging

Use UTF-8 in .hg/branch

Indicate the purpose of the dummy changelog file in itself. Otherwise people getting an error message with an old installation might wonder why this file is corrupted.

fix reserved char on windows, '[]+' are allowed

fix errors spotted by pychecker

debuginstall: fix an incorrect variable

Uniformisation of commit help for -m and -l. Addition of the -m and -l options for hg import. 'hg tag' still lacks the --logfile option which short form conflicts with its --local option.

streamclone: remove unnecessary test, pconvert names

debuginstall: fix a copy/paste error

Merge Benoit's .hg/store support

switch to the .hg/store layout, fix the tests

create the encode and decode functions for the store

add "requires" file to the repo, specifying the requirements

move code around

don't use localrepo.__init__ to create the dest repo with clone+hardlinks

Add some remedies and a username check to debuginstall

Update README to mention hg debuginstall

Make debuginstall actually attempt to use external patch and merge This will catch some tricky problems with tools and setup.

Make test-encoding return 0

Add debuginstall command to do basic install tests

make transcoding more robust default to ASCII abort if unknown encoding wrap abort strings with _ add test

remove unnecessary call to umask

Show the destionation for clone if not specified manually.

Removed unneeded OSError exception handler. OSErrors will already be handled in the outside try/except.

Fixes test-encoding for python2.3 and minor cleanups: - Use koi8-r instead of euc-jp, as the later isn't available in python2.3. - Add unicode representation for latin1 e', too. - Use date "1000000 0" like in other tests (though not strictly needed because we no longer use %c as default datestr format).

Use util.always instead of creating a new lambda function in show_changeset and simplify the expression.

Fix log regression where log -p file showed diffs for other files

Fix hg serve -6 getsockname handling

Allow the user to specify the fallback encoding for the changelog Example: use EUC-JP instead of ISO-8859-1: [ui] fallbackencoding = EUC-JP

Removed unknown option -t in test-status

Merge with mpm

Merge with crew

Add doc notes about revert and hg status vs diff

Merge with mpm

context: don't spuriously raise abort when a file goes missing.

Add notes about diff/merge asymmetry to export, diff, and log

transplant: don't add extra newlines to changelog entry in filter

merge with main

Teach convert-repo to deal with mixed charsets in git

log: convert branch names to the local encoding

fix encoding conversion of branch names when mq is loaded

fix hg diff -r ''

Fixed indentation, spacing and a typo (debugdata->debugdate) in commands.table.

Merge with crew

Remove date parameter from merge

Add --date support to update and revert Add finddate to find the tipmost revision that matches a date spec Add --date option to update Add --date option to revert Don't pass backout's -d option to revert

Merge with mpm

Add --date support to log Add --date opt Filter log with matchdate Fix "-{days}" match format

Add date matching support Add extended date formats (eg "Dec", "2006") Add a couple missing basic date formats Improve default date element scheme to parsedate Add matchdate function to match a date spec Add -e switch and range matching to debugdate

Merge with mpm

Update dates help topic

Update tests

parsedate: add UTC and GMT timezones

improve date parsing for numerous new date formats Add lots of new date formats Formats without year, month, or day default to current Strip leading and trailing whitespace

parsedate: allow '' for epoch

parsedate: use Abort rather than ValueError

add debugdate command

zsh: fix completions with relative paths hg add ../foo/bar[TAB] now does what you expect

zsh: remove deprecated -f option for hg update

Merge with crew

hgk: show view in short command list

move patterns topics

move environment topic

Generate docs for help topics

Allow topics to be callables

Add basic support for help topics and a dates topic

Don't report an error when closing heads during local push (issue387)

Removed unused parameters/options of update command.

Add "null" pseudo-tag pointing to nullid

use forward "/" for internal path and static http, fix issue437

merge with crew

Fix revrange() call in the churn contrib

introduce localrepo.spath for the store path, sopener fixes

localrepo: change aftertrans to be independant of the store path

Use python instead of shell printf with \x sequences for test-encoding. Needed e.g. to be compatible with Solaris.

Merge with crew

make hg commit <dirname> work again

imported patch collision

imported patch folding

Make quoting in test-encoding simpler

update test-debugcomplete

hgweb: report detected character set Add comments on overriding charset to CGI scripts

test-encoding: copy a bundle from TESTDIR rather than constructing one

Hex-encode ! in test-encoding printf Naked ! tends to confuse shells

Add output for encoding test

Add a charset encoding test case

tests: set a default encoding for running tests (ASCII)

Add documentation for charset encoding options

Add global options for setting encoding and encodingmode

Handle transcoding of branch names

Handle transcoding of tags

Handle transcoding of username and description in changelog

Add functions for transcoding and manipulating multibyte strings

Add encoding detection

bundlerepo: don't hardcode the revlog filename

merge with crew

Move ellipsis code to util.ellipsis() and improve maxlength handling.

Use UnexpectedOutput exception instead of RepoError in sshrepo, too.

Change sshrepo.repoerror() into a more flexible sshrepo.raise_(). Now every exception can be raised with a cleanup, not only hg.RepoError.

Don't show traceback on 'hg clone -r unknown ssh://hg.example.com/'.

fix qseries -v and guards interaction - rename "status" variable to avoid shadowing an argument - use a better test to determine whether a patch is applied

changegroup.py: delay the loading of the bz2 and zlib modules

Ignore all errors while parsing the branch cache.

small fixes for test-newbranch - hg tip doesn't use the branch cache; use hg log -r in its place - commit doesn't use a HG_MERGE environment variable - change the dates from "0 0" to "1000000 0"

transplant: split filter args into changelog entry and patch

transplant: log source node when recovering too.

transplant: clobber old series when transplant fails

merge with crew

Use unsigned version format. This way can use one additional bit, and when encountering invalid revlogs with the first bit set don't produce python warnings or strange error messages.

Improve error message for unknown revlog flags. Old: unknown flags 120000 for ... New: unknown flags 0x0012 for ...

Merge with crew

transplant: "filtering %s\n"

Don't require a diff which accepts the -N option.

Compatibility fix for 'ln -sf'. ln of Solaris 8 only accepts "ln -f -s" (in that order), but as the -f isn't needed here, I simply dropped it.

additional fixes for issue436

Fix test-rename-dir-merge for different implementations of ls.

Fix test-notify for systems without or with a different version of diffstat. Some diffstat versions say "1 file changed", others "1 files changed".

merge with upstream

verify: add rename link checking

Make revlog error slightly less scary

add test for issue436

Fix argument handling for hg -v pull -v x (issue 436)

update bugzilla extension to use ui buffers

add test for the notify extension

fix notify with new ui buffering

use ui buffering in changeset printer delete old uibuffer class delete old stringio class move show to _show add new show that uses ui.pushbuffer to buffer add new flush that writes buffered data add props arg to changeset_printer to match _templater

add a simple nested buffering scheme to ui

make manifest friendlier switch to using context code ..which uses first parent by default show file hashes only with debug switch show permissions with verbose fix up tests

Add missing test output

Fix test permission

merge: handle directory renames commit: handle new copy dirstate case correctly findcopies: keep a map of all copies found for directory logic add dirs filter check for merge:followdirs config option generate a directory move map find files that match directory move map manifestmerge: add directory rename cases applyupdates: skip actions with None file add "d" action recordupdates: add "d" action add simple directory rename test

merge: pull findcopies helpers inside, refactor checkpair to checkcopies

merge: move check for empty ancestor into findcopies

merge: only store one direction of copies in the copy map simplify checkpair generate copied hash from copy map make copy cases more symmetrical

merge: add copied hash to simplify copy logic

merge: remove unused match logic from findcopies

merge: report destinations of moves in merge action messages

transplant: recover added/removed files after failed application

transplant: preserve filter changes in --continue log

transplant: fix --continue; add --continue test

transplant: show_changeset moved to cmdutil

Make sed expression in test-committer compatible with GNU sed 3.x.

only print a warning when no username is specified - revert most of 8b55c0ba - display the username during interactive commit

add a comment about '\n' and '\r' and streaming clone

add test for issue433

fix hg log -r ''

handle files with more than one git binary patch

handle files with both git binary patches and copy/rename ops

Make context __eq__ handle arbitrary RHS values

Add transplant extension

don't create the .hg/data at init time

context: None is not a valid filenode (revert from 23ede9e7ad4d)

update rewrite-log for tip ; chmod it

merge: Don't search for copies across unrelated manifests

Expand test-commit to cover one of the recent bugs.

Make mq use changegroup.writebundle for writing strip backups.

Removed unused ui parameter from revpair/revrange and fix its users.

Use 'bundletype' instead of 'type' to not shadow built-in function.

BZ2Compressor already defaults to compresslevel=9.

fix writebundle for bz2 bundles

fix push over HTTP to older servers

Don't generate git patches that rename a file to multiple destinations With this patch, instead of generating N renames, we'll generate 1 rename and N-1 copies. Ideally the rename should come after the copies instead of before them, but that'd be harder to do.

handle git patches that rename a file to more than one destination

qrefresh: fix handling of copies in the fast path

qrefresh: fix handling of added files (including copies) in the slow path

qrefresh: respect --git even in the slow path

add --git option to qdiff

diff: better detection of renames when comparing with the working dir.

fix typo in mercurial/patch.py

renamedbetween: only return (file, node) pairs that exist in the original rev

diff: improve detection of renames when diffing across many revisions

Merge with crew

mq: add --git option to qimport -r

Make qrefresh help more explanatory for options -m, -l and -s

Improved examples for network support in README. - Simplified 'hg serve' example, -p80 needs root anyway. - Example for ssh:// with relative or absolute path. - merges need to be committed.

Corrected "waiting for lock on repository FOO held by BAR" message. BAR was the error number and not the locker name. Use repr on BAR, so problems can be detected easier.

Handle locking exceptions if streaming clone can't lock the repo. (Issue324)

Don't step into an endless loop when lock file is empty.

Issue424: mq patch loses guard when qrenamed

correct remote heads test in prepush

add docstring to reachable

reorder tests in prepush It's more useful to show the new branches message than the unsynced changes message.

fix qseries -v when there are unapplied patches

Indentation cleanups for 2956948b81f3.

fix warnings generated by pygettext.py.

Update trusted_users only after we've seen a file not owned by the user

Avoid looking up usernames if the current user owns the .hgrc file Converting uids into usernames may be somewhat expensive when NIS or LDAP is involved.

Use a variable to explicitly trust global config files

Revert almost all of 5be434785317; add a test Because of file copies, we should update the manifest dict only after committing all files.

avoid unnecessary copy merges

white space and line break cleanups

Merge with crew.

Use nullrev+count instead of count-1 in a newly introduced expression. Before that repo.changelog.tip() was used, but this yields a node. Of course many more places should be changed like this, this was just done as an example.

abort if explicitly committed files are not found or not tracked

unduplicate bundle writing code from httprepo

remove duplicate zgenerator in httprepo

create a readbundle function

move write_bundle to changegroup.py

remove legacy hg parents REV syntax

add log --removed

rename and copy are no longer experimental

alphabetize help_ in commands

remove relpath

refactor rawcommit

refactor debugrenamed

move show_version to version_

move walkchangerevs to cmdutils

Consolidate brinfo handling

changeset templater: convert some unnecessary yields to returns

further simplify stringify

ui: remove last vestiges of header buffering

commands.docopy: pay attention on whether paths use "/" or os.sep

fix util.pathto All users of this function pass a local path (which uses os.sep) as the first argument and a "/"-separated path as the second argument.

don't use readline() to read branches.cache The posixfile_nt class used on windows doesn't have that method.

merge with upstream

Refactor log ui buffering and patch display

refactor header handling for changelog formatting

templates: move changeset templating bits to cmdutils

templater: changeset templater reorganization and optimizations

templater: speed up changeset writes and stringify

changeset_templater: remove changes arg

templater: simplify parsestring

template: fold template() into __call__, minor optimizations - use non-grouping operator to avoid some extra processing - avoid copying and updating defaults - unnest main template body - avoid returning extra empty string if format

templater: simplify cache and remove filter argument in __call__

templater: simplify template function

templater: take cStringIO out of indent

templater: remove cStringIO from stringify

templater: remove cStringIO for fill

templater: use str.decode in parse_string

bundle: don't use sets.Set

revlog: reachable actually takes a node

util: add copyfile function

hgweb: internalize some socket details

remove unused imports

zsh: typo in commit completion

issue228: Fix repositories at the filesystem root (/ or C:\) Thanks to Robert Shaw and other people on the list for the suggestions.

Export changelog dict in localrepo.commit

tests: add -i switch Prompt to accept changes for tests where output changed

tests: add -R switch Restarts at first .err file if one exists, otherwise runs all tests

tests: sort test list if running all tests

Fix accessing a repository via -R/--repository through a symlink. Sometimes the repository root was compared to os.getcwd(), which always uses the canonical path without symbolic links in it. This would changes self.root of the localrepo objects to always use os.sep as the directory separator, which is implicitly assumed in some places, but may not be the case if somebody uses -R foo/repo on windows.

Merge with upstream

Fix up parent display in logging For changesets with a first parent nullid, but not rev 0, we ought to display a null parent.

Clarify untracked file merge message

localrepo: factor commit and rawcommit note: rawcommit with an empty text will now launch the editor

localrepo.commit: little cleanups - use a list for new fileids - sort the removed files

Remove references to documentation that was removed in da9506fe2710

Corrected documentation for return value of python hooks.

Fixed directory name having an extra dot on "hg archive -t tbz2 foo.tbz2". Problem reported by Rob Landley.

Try hgweb unbundle methods in the order presented by the server. If no common bundle format is found, push is aborted.

Client support for hgweb unbundle with versions.

Add allowed bundle types as argument to hgweb unbundle capability. Arguments to capabilities were added before the 0.9.1 release, so there are no compatibility issues. Mercurial 0.9 didn't support http push. Using HG10GZ, HG10BZ and HG10UN has the advantage that new bundle types can be added later and the client doesn't have to try sending them first and reacting on errors sent by the server.

hgweb: remove debugging print

hgweb: introduce a new capability for sending a compressed bundle the header of the bundle is the same as a on-disk bundle HG10UN: uncompressed HG10BZ: bz2 HG10GZ: gzip no header means uncompressed (old client)

hgweb: if the server supports it, send a compressed bundle

Use httpconnection even with proxies. This should give us HTTP keepalive when we talk to proxies and should allow us to stream a file in unbundle (instead of reading everything into a string). This should fix issue376.

issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)

hgweb: split URLs containing spaces or other escaped characters correctly

zsh: perform ~ expansion on _hg_root

mq: handle qpush -a with empty series

zsh: compute repository root instead of forking hg

zsh: complete users in ssh URLS

zsh: support remote cloning

zsh: add optional remote directory cache

sshrepo: fix the parsing of the ssh url

zsh: complete SSH directories

zsh: complete unknown commands normally

merge with crew

hgweb: fix handling of path for old style template - path from old style are prefixed by '/', make cleanpath strip them - make manifest() use relative paths, that was the only function using '/' prefixed paths

merge with crew

merge with backout

Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140

Backed out changeset 66a17364c30ef0804153093cfaccf830e563928a

Check for at least having a final release of python 2.3.0 in setup.py Mercurial uses features that are not in 2.3a1.

test for git empty new files

git patch: create empty added files

zsh: tab-complete status results by directory Filter diff and revert for modified files only, unless -r is given.

filelog: rename filelog.size() to filelog.len() filelog.size() is misleading for users of revlog.size() since it doesn't return the size of the revision.

revlog: more nullrev fixes

revlog: return 0 as offset for nullid

doc: clone doesn't create a working directory in remote repos

revlog.size() fix handling of rev == -1

use workingcontext.files() to detect if the repo is unclean

allow update to switch to a different branch if the repo is clean

Explicitly use REVLOGV0 instead of 0 in bundlerepo.

Define and use nullrev (revision of nullid) instead of -1.

Correct optimization from 3464f5e77f34; add a test. If there are two (or more) heads that point to the same .hgtags node, we can safely skip parsing the file in all but the last head. (In 3464f5e77f34, we were parsing the file in the first head and skipping all the others.)

log speedup: don't call revlog.node if we don't have to

log speedup: use list.extend to avoid an explicit loop

log speedup: use parentrevs in log and changeset_printer.show

log speedup: set quiet/verbose/debugflag in the fake ui object

log speedup: use only ui.write in changeset_printer.show - ui.status is not very useful, since this code is never executed when ui.quiet is true. - explicitly checking for ui.debug allows a regular hg log to run without looking at the manifest index - the calls to ui.note were converted for consistency

log speedup: walkchangerevs: filter the files only if we need them This speeds up hg log and significantly reduces memory usage (max RSS goes from ~92MB to ~21MB on the kernel repo), since we no longer store all the revisions in the cache.

Inform the user about the new URL when being redirected via http. Additionally the changed code ensures that the new URL is used, even if it doesn't end with the query string.

Stripping of query string (since 88b4755fa48f) stripped too much (issue327) rstrip(qs) not only strips qs from the right, but it continues stripping every char at the end of the URL that occurs on qs.

Merge with upstream

small refactoring of path normalization in dirstate.statwalk

Make util.unique return a list

Simplify ignore logic in dirstate.walk - kill blockignore hack - pull pconvert out of imatch - skip imatch when not ignoring

shortname: truncate at '.' too

improve walk docstrings

convert dict(zip(x,x)) to dict.fromkeys(x)

minor hg grep simplification

simplify dirstate walking - kill walkhelper - stop passing dc around - remove unused stat arg from statmatch (renamed imatch)

kill makewalk function

Pull getchange out of walkchangerevs

Make revrange return a list of ints so that callers don't have to convert

simplify revrange and revpair

lookup(str(x)) -> lookup(x)

Fixups for hg grep - kill trimuser function - remove ucache - simplify descending logic - fix files with matches logic - correct tests

Turn bundle file into a string for http push, for urllib2 over proxies.

Force the content-length header to be a string in httprepo.unbundle. (Needed for Python2.3 compatibility)

Use the new UnexpectedOutput exception in httprepo, too.

New UnexpectedOutput exception to catch server errors in localrepo.stream_in If the unexpected is a string, the empty string will be mentioned, and long strings are cut to at most 400 chars.

Some clarifications for pull/push protocols: - List file:// and static-http:// - Mention that you can pull from bundle files - List http and https as valid push targets, but emphasize that this feature has to be enabled.

httprepo: record the url after a request, makes pull + redirect works POST+redirect doesn't work in python, as a workaround we record the url from the previous GETs so that when we do a POST it uses the redirected url fix issue327

add AIX to the list of compilers that don't have inline keyword

zsh: support remote URLs

zsh: suppress mq completion error messages outside of repository

zsh: suppress error message for status completion outside of repository

Turn of "Not trusting file" logging when running hgweb and hgwebdir (hg serve still shows the warning)

use untrusted settings in hgwebdir

use untrusted settings in hgweb The only exceptions are web.static and web.templates, since they can be used to get any file that is readable by the user running the CGI script. Other options can be (ab)used to increase the use of the cpu (allow_bz2) or of the bandwidth (server.uncompressed), but they're trusted anyway.

add untrusted argument to patch.diffopts

add --untrusted to showconfig

save settings from untrusted config files in a separate configparser This untrusted configparser is a superset of the trusted configparser, so that interpolation still works. Also add an "untrusted" argument to ui.config* to allow querying ui.ucdata. With --debug, we print a warning when we read an untrusted config file, and when we try to access a trusted setting that has one value in the trusted configparser and another in the untrusted configparser.

Only read .hg/hgrc files from trusted users/groups The list of trusted users and groups is specified in the [trusted] section of a hgrc; the current user is always trusted; "*" can be used to trust all users/groups. Global hgrc files are always read. On Windows (and other systems that don't have the pwd and grp modules), all .hg/hgrc files are read. This is essentially the same patch that was previously applied as revision 494521a3f142.

zsh: add revrange completion

zsh: add qbase and qtip to qapplied completions

zsh: use standard tags where possible

mq: support qimport -

hgcommand.vim: doc install delete into "black hole", g: prefix global vars.

merge with crew

Corrected hg synopsis.

zsh: complete qguard with +/- guard prefixes

hgcommand.vim: remove deprecated -b option from hg parents.

zsh: complete qapplied, qdiff, qfold, qguard, qimport, qnext, qprev as well as qrename, qselect, qseries, qunapplied and qtop.

Merge with mpm

Update tests for removed commands

Remove update -m, deprecated for 0.9.1

Remove the undo command, deprecated pre-0.9

Remove forget command, deprecated pre-0.9

Fix excessive complaining from hg log -b

Remove some more deprecated options from help syntax summaries

Hide deprecated flags in help unless verbose

Remove old fish-merge test

zsh: make option lists more compact

Merge with mpm

Merge with crew

Some README updates

Remove some old documentation that belongs on the wiki

Move rewrite-log to contrib

zsh: rewrite This version of zsh completion handles global options more correctly, completes options for command abbreviations, and does much more lazy evaluation.

Show number (-v) and list (--debug) of changesets with bundle/pull/push etc.

fix graph traversal in commands.bundle (it wasn't O(n))

Corrected help text for bundle.

Corrected synopsis of hg heads

Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.

revlog.py: always return tuples from parents and parentrevs There's at least one place doing parentrevs(rev) != (rev-1, -1), which is always true with revlog v0, since parentrevs returns a list in this case.

Remove [-b] options from help syntax lines

Deprecate old --branch/branches options

add branch and branches commands

test-mq-caches: look up a revision that does not exist to force cache creation

Merge with mpm

Merge with crew

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

hgweb: add heads to gitweb summary

zsh: cache hg help output

zsh: complete according to the -R option if specified

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.

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

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

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

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)

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

merge: if filemerge skips merge, report as updated

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

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

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

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

merge: turn followcopies on by default

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

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

Merge with crew

make manifest-merging test reproduceable

Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:

gitweb: add file diff view

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.