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

add test for issue436

verify: add rename link checking

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