Make revlog error slightly less scary

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.

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

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

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

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

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

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

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

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

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