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

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

zsh: make option lists more compact

Merge with mpm

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

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

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

Merge with crew

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.

Some README updates

Remove some old documentation that belongs on the wiki

Move rewrite-log to contrib

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

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.

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.