hg serve: don't lookup user-supplied names/addresses

Split convert extension into common and repository type modules

Removed trailing \n in calls to util.Abort()

Some small cleanups for convert extension: - repo doesn't need to be imported - util.Abort doesn't need \n - space after comma - long lines - spacing

Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.

Make sure the changelog mentions files whose flags changed These changes don't actually need a new filelog entry (see next patch), but if we don't mention the files in the changelog, it becomes much harder to find all changesets that touch a file (not even a "hg log --removed file" will work).

run-tests.py: set ui.slash = True This should make things easier for pysh.

test-config-case: print only the Section we're interested in. This allows us to add additional settings to the global hgrc file created by run-tests.py without breaking this test.

Add ui.slash hgrc setting This will make most commands print paths using "/", regardless of the value of os.sep.

docopy: use repo.pathto to format paths for printing

Add dirstate.pathto and localrepo.pathto. Every time util.pathto is called, we have to pass the repo root and the repo cwd. dirstate.pathto is a simple convenience function that knows about the root and the cwd arguments. It's still possible to pass the cwd as an optimization. localrepo.pathto is a convenience function that just calls dirstate.pathto, just like localrepo.getcwd. dirstate.pathto becomes a single point that converts most (all?) paths from the internal representation to some OS-specific relative path for display purposes.

Use absolute paths in revert.

Use absolute paths in docopy.

Use absolute paths in addremove. This is more consistent with other places in the code, which only use the "relpath" returned by cmdutil.walk for display purposes.

Add some more smart when initializing destination repository

Fix hgext/convert/__init__.py rights

Include convert extension in packages setup (reported by Christian Ebert and Eric Hopper)

convert: map CVS HEAD to default branch

ui: make readsections() abort when configuration cannot be read.

Removed trailing whitespace and tabs from python files

Fixed python2.3 incompatibility (rsplit) in cvs code of convert extension

Add a wrapper script for convert extension

Turns convert.py into a real extension

Move convert-repo to hgext/convert/__init__.py

Fixed test output for changed glog (. instead of @)

Issue a warning if "-r ." is used with two working directory parents. Rationale for not aborting instead: The first parent is usually more important as it is the local branch during a merge and commands like 'hg diff' and 'hg diff -r.' behave still identically (except for the warning of course). Added a test for log -r. with one and two parents.

graphlog: Print . instead of @ for working directory parents "." is accepted as an alias for the first working directory parent by -r/--rev

Remove atomicfile class. The interface provided by opener(atomic=True) is inherently unsafe: if an exception is raised in the code using the atomic file, the possibly incomplete file will be renamed to its final destination, defeating the whole purpose of atomic files. To get around this, we would either need some bad hacks involving sys.exc_info (to make sure things work in except: blocks), or an interface to say "file is complete; rename it". This is the exact interface provided by atomictempfile. Since there are no remaining users of the atomicfile class, just remove it.

Use atomictemp files to write the dirstate. atomic files are not safe in all cases.

test-serve: let run-tests.py kill the daemons If the daemons die while the tests are still running, we'll get additional "killed!" messages, making the test fail.

Fix bug in "hg serve -v"

Add test reproducing a bug in "hg serve -v"

Merge with crew-stable

hgk: display tags that contain spaces

hgk: added -selectbackground grey to canvases

merge with stable

Obfuscate author in gitweb shortlog (issue578)

Fixed indentation in hgext/notify.py

merge with crew-stable

wsgicgi: change stdin to binary mode

Also check the index file size when deciding whether to reload a revlog. This should fix some spurious failures from test-clone-pull-corruption (issue552).

use .extend instead of .append in readtags

hbisect: fix a typo in error message

patch.diff: avoid calling workingctx().manifest() Right now, to generate the manifest of the working dir, we have to perform a full walk of the working dir, which will be very slow, especially if we're interested in only a small part of it. Since we use the manifest only to find out the mode of files for git patches, manually build an execf function to do it. This should fix issue567.

Merge with crew-stable

hgk - fix CR issues on windows

Add sending date to notify message. When using SMTP, no date field was set into the message, which causes it to be displayed as being send on 1st january 1970 on most MUA.

Merge with crew.

patchbomb: Fail early if no revs given to email

patchbomb: Fix typo.

patchbomb: Hoist sender config higher.

Automated merge with http://hg.intevation.org/mercurial/crew

patchbomb: Validate email config before we start prompting for info.

Introduce find_exe. Use instead of find_in_path for programs. The behaviour of find_in_path was broken for config options containing path names, because it always searched the given path, even when not necessary. The find_exe function is more polite: if the name passed to it contains a path component, it just returns it.

ui: Rename has_config to has_section.

patchbomb: Defer the import of readline. If imported at the top of the module, the import appears to succeed, but raw_input doesn't acquire magic editing fu. I suspect this has something to do with the newish demandimport code, because the prior code worked with demandload.

patchbomb: Don't prompt for headers until sure we have revs to export. The prior behaviour was to always prompt for headers, and only then bomb out if there were actually no revs to send.

Add support for url#id syntax This allows you to do: hg clone http://server/repo#stable which is equivalent to: hg clone -r stable http://server/repo Future incoming, outgoing, and push commands will default to using this id because it's recorded in the default path. Other commands that accept URLs (push, pull, bundle, incoming, and outgoing) also accept this syntax.

clone: checkout the "default" branch if available

mq: pass a URL to clone

Warn about large files on hg add

merge with stable

Make "hg incoming -r revision_number" work for remote repos (issue566) Uses the remote repository's lookup method as pull does and only transfers what is needed to calculate incoming changesets. One minor problem: As only the needed changesets are transfered and stored in a local bundle repository, the tip tag of this bundle is shows despite not being the tip changeset of the remote repository. (see "+tag: tip" in tests/test-incoming-outgoing.out in this patch)

Corrected similarity parameter used in test-addremove 0.5 meant 50% in the early stages of addremove -s, now 50 has to be used.

addremove: comparing two empty files caused ZeroDivisionError (found by Giorgos Keramidas)

Add archive download links to hgweb search template

merge with crew

gitweb: Fixed-up search template It seems that the search template has been forgoten over time, and needed major revamping.

gitweb: Add search box to the summary page

gitweb: file diff: Display metadata in same order as changeset does

gitweb: file annotate: Display metadata in same order as changeset does

gitweb: file rev template: Display metadata in same order as changeset does

gitweb: changeset template: remove manifest link from cset metadata

purge: add --include and --exclude options

hgweb: use generator to count parity of horizontal stripes for easier reading. - use web.stripes in all places and consistently - start with parity0 for lists generated in reverse (e.g. changelog)

gitweb: shortlog: display nav links near the bottom

gitweb: file log: display nav links near the bottom

gitweb: file log template: removed excesive whitespace

hgweb: manifest: pass parity for the '[up]' link

gitweb: manifest template: do not include trailing slash in directory names

gitweb: Add title separator to tags template

gitweb: changelog template: removed excessive whitespace

gitweb: shortlog template: removed excessive whitespace, added title bar. The title bar is currently empty, this is just a preparation for filling it with content.

gitweb: Fixed manifest template opening an extra div tag

gitweb: Fix summary page ellipsis line colspans

accept -r REV in more places Commands affected: * update * merge * backout

Merge with crew-stable.

Fix issue 563: error in _hg_commit in the contrib/zsh_completion script.

use documented convert-repo interface

document conversion interface

Merge with crew-stable.

Fix issue 562: .hgignore requires newline at end. End-of-lines characters where discarded without any check for existence.

Test issue 562: .hgignore requires newline at end

Make hg import --exact work when a new branch is created by an import.

Alter test to test import --exact to make sure it works with branches.

Add ability to parse branch information to hg import

Add a test for the Branch header being in hg export.

Fix hg import --exact bug that hangs hg on failure.

Make mergepatch save queue now that qpush isn't.

Add branch information to hg export.

Add ui.patch option. ui.patch overrides the default patch/gpatch command and options.

Fix issue483 - mq does not work under windows with gnu-win32 patch. Add --binary option to patch command under win32.

mercurial.el: fix error on hg-read-rev() with small tip, and cleanups * Fix error if tip revision is smaller than hg-rev-completion-limit If tip revision is 10, "hg log -r -100:tip" fails. * Remove dependencies on cl package at runtime Quote from GNU Emacs Lisp Reference Manual, Emacs Lisp Coding Conventions: > * Please don't require the `cl' package of Common Lisp extensions at > run time. Use of this package is optional, and it is not part of > the standard Emacs namespace. If your package loads `cl' at run > time, that could cause name clashes for users who don't use that > package. * Check XEmacs at compile time Since byte-compiled file is not portable between GNU Emacs and XEmacs, checking type of emacs can be done at compile time. This reduces byte-compiler warnings. * Defvar variables binded dynamically and used across functions * Combine status output string to state symbol alist into a variable, and use char instead of string for key of state alist * Make hg-view-mode as minor-mode * Define keymaps as conventions

mq: add qgoto command.

Fix typo in bugzilla extension.

Fix test-patchbomb for crew

mq.el: add mq-signoff, to sign off on a patch

mq.el: don't fill half the screen with a single line of output.

mq.el: add hook to run when finishing the edit of a patch.

imported patch mq-refresh-git.patch

mq.el: allow mq-diff to take a git option.

mq.el: add mq-diff function.

mq.el: add mq-edit-series function.

mq.el: add mq-new function.

Fix up patchbomb test

add test for patchbomb extension.

contrib/hgsh: Check for .hg/store as well as .hg/data. This is required by the new repository layout.

MQ: tidy up if a qpush is interrupted. This aborts the transaction, makes sure the dirtied dirstate isn't written out, and cleans up the working directory.

Merge with stable

merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.

branch.cache: silently ignore I/O and OS errors

context: fix workingfilectx._changectx

mercurial.el: don't raise an error from find-file-hook find-file() shouldn't fail even if unreadable .hg directory is exists. Not enabling hg-mode is sufficient for that senario.

mercurial.el: move defmacro of hg-do-across-repo before use Macros must be defined before use to be byte-compiled properly.

Unconfuse font-lock

Add fast-forward branch merging

Merge with crew-stable. HG: changed hgext/mq.py

mq: fix qtop failure when the series ends with guarded patches.

Test qtop breaking when series ends with guarded patches.

simplemerge: flush stdout before writing to stderr. Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.

Move win32 find_in_files from util_win32 to util.

Merge with stable

Merge with crew-stable

Update Windows build instructions.

merge: reorganize some hunks in findcopies

merge: simplify a check in checkcopies

merge: expand and simplify the invalid handling for directory moves

merge: fix a bug detecting directory moves When all the files in a directory are moved, it may be incorrectly marked as moved even if it contains subdirectories.

merge: clarify the findcopies code

mq: account for readheaders munging in qrefresh

verify: hold write lock Verify will report spurious errors if commits or pulls happen during verify.

Also restore old rm -A behavior for inexact patterns

Fix rm -A with no patterns, which I just broke.

Make rm --after simply mark files as removed, unless --force is also given

Add hgwebdir.fcgi to contrib

Flesh out bisect help text

Merge with crew

Merge with stable

hg serve: don't do DNS lookups

Fix minor mismerge. The caching of umask ended up being duplicated.

run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

Add notes about configuring a merge program

Update copyright year and change to range

Use patch.patch() when checking for patch availability. The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.

Merge with crew

Fix find_in_path not including some file extension logic under win32. Windows shell resolves utility path by combining PATH, the utility name and a set of file extensions from PATHEXT.

Fix bad reference to RepoError in import command

Refactor commands.serve to allow other commands to run as services. This introduces a new function, cmdutil.service.

Do not automatically rename an atomicfile if a write to it has generated an exception.

merge with stable

Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize() - fix off by 11 when checking if there are more hunks (found by Maris Fogels) - bail out if start is greater than end - check if new hunk starts after start/end/len block of current hunk as the pointer can wrap around on very large values, reproducible with import mpatch; mpatch.patchedsize(12, 'x'*12)

Make copy --after work for files that have been hg added.

When reloading the dirstate, recompute ignore information if needed.

dirstate: speed up write by 50%.

dirstate: make parents() faster. This allows localrepository.status() to avoid reading all but the first 40 bytes of the dirstate in the common case of running "hg status".

localrepository.status: only acquire wlock if actually needed. This speeds up the common case of not needing to update the dirstate, and avoids the need to reload and parse the dirstate "just in case".

util._matcher: speed up regexp matching. In 4babaa52badf, Benoit made a change that substantially slows matching when a big .hgignore file is in play, because it calls into the regexp matching engine potentially hundreds of times per file to be matched. I've partly rolled back his change, so that we only call into the matcher once per file, but preserved the ability to report a meaningful error message if there's a syntax error in the regexp.

Merge with crew-stable

Work around python 2.5.1 tarfile regression

Merge with crew-stable

Avoid float rounding errors when checking http protocol version.

Work around problem where 'del os.environ["FOO"]' doesn't update environment. test-hook failed since changeset 949516072388 because of this on Solaris 8.

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

Merge with crew.

change tests to use simplemerge by default

polish the simplemerge command; add a test

actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header

Import 3-way merge code from bzr merge3.py is imported as contrib/simplemerge test_merge3.py is imported as tests/test-simplemerge.py

add mdiff.get_matching_blocks

Merge with stable

Merge with crew

merge: fix quadratic behavior in find-copies

Merge with crew-stable.

test-command-template: improve test coverage

command line templates: add formatnode filter This will print a full hash node with --debug and a short one otherwise. Use it with some default templates and in map-cmdline.default to print the parents. This should fix issue538.

fix 'hg <not-log> -v --template foo' with revisions without copies

Merge with stable

hgweb: fix rfind bug in PATH_INFO handling

Merge with crew

Merge with stable

Merge with crew

hgweb: make PATH_INFO handling slightly more robust

Merge with crew

Merge with Matt

Merge with stable

Add graphlog extension

Merge with crew-stable

mq: fix qtop when some patches beneath are guarded

mq: test qtop with holes in the patch sequence.

Merge with crew-stable

minor typo fix in templater's docstring

Merge with crew-stable.

Add test for issue 529 - "mq aborts when merging patch deleting files".

mq: don't abort when merging a patch that removes files

atomicfile: don't copy the original file if it'll be truncated

use atomictemp files to write the dirstate

use atomictemp files to write branch.cache

util.opener: if requested, use atomicfile even if the file doesn't exist Right now, surprisingly enough, if you request an atomic file but the file still doesn't exist, you get a regular file. AFAICS, the only time this happens is during the initial creation of the dirstate.

cache os.umask even on windows

pull umask-checking up

Merge with crew-stable.

help: log --keyword is case-insensitive

hgweb: expand keyword search to full list of files

log: expand keyword search to full list of files

run-tests.py: use coverage.py with "#!/usr/bin/env python" tests

run-tests.py: small cleanup

run-tests.py: use coverage.py with *.py tests

run-tests.py: tell coverage.py to ignore errors Otherwise there'll be some IOErrors when it tries to open python files created during the execution of e.g. test-hook.

test-bad-pull: try to avoid timing-related failures

Try to find diffstat in PATH before calling it At least on Solaris, /bin/sh will print a "command not found" message even if we redirect stderr.

Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output This should make it easier to discover global options. As a bonus, they are no longer displayed by something like a hg -v help dates

revlog.py: fix/tweak read ahead code in lazyparser

Merge with Matt

Merge with stable

merge: fix a bug where copies were ignored

Merge with Matt

merge: fix a bug where copies were getting ignored

Move back the purge extension in hgext

purge: abort with missing files avoiding problems with name-mangling fs In a name mangling filesystem (e.g. a case insensitive one) dirstate.walk() can yield filenames different from the ones stored in the dirstate. This already confuses the status and add commands, but with purge this may cause data loss. To prevent this purge refuses to work if there are missing files and has a 'force' option if the user knows it is safe. Even with the force option purge checks if any of the missing files is still available in the working dir: if so there may be some problem with the underlying filesystem, so it unconditionally aborts.

Merge last few matcher/locate fixes.

locate: don't print "file not found" messages. This should fix issue204.

change relglob: patterns to be consistent with glob: patterns With this change, you have to use "hg locate 'hgweb/**'" to locate all the files in directories named hgweb. OTOH, "hg locate '*l'" will locate only files that end with "l" - e.g. a file called "hg.py" will not be matched just because it's in a directory whose name ends with "l" (e.g. "mercurial").

Revert changeset ef1f1a4b2efb; add another test for glob: patterns With that changeset, it's impossible to use a glob: pattern to match e.g. all files ending in .py - glob:**.py would also match all files in a directory called dir.py.

Fixups for recent changes in revlog version handling

hgweb: don't display heads in gitweb-style summary page

hgweb: display named branches in gitweb-style summary page

test-ssh-clone-r: avoid a shell script

test-ssh: avoid a shell script

test-init: avoid a shell script

test-rename-merge2: avoid a shell script

test-merge6: avoid a shell script

test-merge1: avoid a shell script

test-filebranch: avoid a shell script

Use printf(1) instead of using bash-specific shell code. Submitted by: Benoit Boissinot <bboissin@gmail.com>

test-ssh: use printenv.py

test-static-http: use printenv.py

test-http: use printenv.py

test-push-http: use printenv.py

test-bundle: use printenv.py

test-hook: use printenv.py

Add tests/printenv.py This is a small script that can be used as a hook to print the HG_* environment variables without relying on the shell.

Add a filename for the bundle

Slight refining to help text in patchbomb.py

hgweb: short hash for tip archive name

add util.lexists

Improve documentation for patchbomb and email

Add common bundle/outgoing options to hg email

Add ability to send bundles to patchbomb extension

Fixed spacing in assignment of REVLOG_DEFAULT_VERSION

Merge with crew

changelog: optimize delayed updates for clone vs pull pull index updates get redirected to memory, then appended on finalize clone index updates get sent to 00changelog.i.a, then renamed on finalize

Merge with -stable

tags: require -f to replace an existing tag based on a patch from Johan Herland <johherla@online.no>

tags: fix abababa case, with test case

Merge with crew

restructure changelog file appending - make appending code proper part of changelog with delayupdate/finalize - use simplified appender that tracks pending data in memory - eliminate old appendfile and helper classes - update addchangegroup to use new interface and reuse the existing changelog

appendfile: handle only changelog.i file

appendfile: remove unused manifest code

revlog: simplify revlog version handling - pass the default version as an attribute on the opener - eliminate config option mess

revlog: don't pass datafile as an argument

use os.path.islink instead of util.is_link; remove util.is_link

Add some tests for symlink tracking

Fix localrepo.copy to deal with symbolic links.

Backup symbolic links when reverting

fix util.copyfile to deal with symlinks

hg-relink: do not compare .d files

Make import opportunistically use merge information

Add import --exact. When this option is set, import will apply the patch (which must be generated by export) to the parents specified in the patch, and check that the node produced by the patch matches the node ID in the patch.

Add --outgoing option to patchbomb

Merge additional fixes for my matcher changes

glob:<directory> patterns match the files in that directory. This makes the behaviour of glob: patterns more consistent: hg status glob:dir and hg status -I glob:dir will match the same files. It's also consistent with the fact that {rel,}path patterns recursively match the contents of a directory.

Pass normalized directory names to the ignore function This fixes a bad performance regression caused by dd0d9bd91e0a.

tests: expand test-commit a bit to test 'hg commit .' too

fix hg commit . in the repo root

transplant: fix ignoring empty changesets (eg after filter)

Merge with crew-stable.

debugsetparents: wlock the repo before updating the dirstate

avoid _wsgioutputfile <-> _wsgirequest circular reference We use the _wsgirequest object itself as the output file object. To avoid a "self.out = self" which would create another circular reference, we make the "out" attribute a trivial property.

avoid wsgiapplication <-> MercurialHTTPServer circular reference

hgwebdir: break templater -> templater circular reference This is essentially another instance of the same problem fixed by the parent changeset. See its commit message for the details.

hgweb: break templater -> templater circular reference The problem were some functions passed in the "defaults" argument during the templater creation which use "self.t" directly. This creates the cycle: hgweb object -> templater object -> defaults dict -> footer function -> hgweb object Instead of completely avoding the cycle, we break it after using the templater.

Add hg-relink script to contrib

merge with crew-stable

Fixed synopsis for some mq commands

hg qseries -m: guards file was not ignored

Tests for qapplied/qunapplied fixes (417c2068cb92 and ce6c364ebb2a)

Simplified qseries and hg qapplied to fix some bugs caused by optimization: - hg qapplied -v now works consistendly to hg qunapplied -v, i.e. showing guarded (or unapplied because they were guarded during hg qpush) patches. - hg qapplied <patchname> now works again

Fix issue443: inconsistent output of "hg qunapplied -v" 1. Don't skip over unpushable (guarded) unapplied patches. 2. Don't display unpushable patches, unless -v is given, otherwise guarded and unguarded patches can't be distinguished.

Merge some matcher fixes/cleanups and add some more hg locate tests

util._matcher: remove superfluous variable

add some more tests to hg locate

make the output of test-locate more readable

util._matcher: use "." as the root of empty {rel,}path patterns Should fix issue332. Really.

Merge with crew-stable

avoid a traceback with hg branch newbranch; hg up

Fix handling of paths when run outside the repo. The main problem was that dirstate.getcwd() returned just "", which was interpreted as "we're at the repo root". It now returns an absolute path. The util.pathto function was also changed to deal with the "cwd is an absolute path" case.

pass repo.root to util.pathto() in preparation for the next patch

hgweb: handle IOErrors and OSErrors during unbundle This allows the client to display a reasonable message to the user (e.g. "Permission denied: .hg/lock"), instead of the current "<url> does not appear to be an hg repository".

hgweb.unbundle: call req.httphdr only after the last possible call to bail

Work around a urllib2 bug in Python < 2.4.2 When urllib2 base64-encodes the password needed for the Proxy-authorization header, it forgets to remove the trailing "\n". Later, a "\r\n" sequence is appended to every header, as required by the standard. Some proxies interpret the resulting "\n\r\n" sequence in the same way as "\r\n\r\n": end of headers. This usually doesn't cause trouble for this request, but when the proxy tries to read the next one, it thinks the request starts with some garbage and returns a "400 - Bad Request" error.

Fix confusing message from hg revert (issue332) % mkdir sub1 % touch sub1/file1 % hg add sub1/ adding sub1/file1 % hg rev sub1 sub1: No such file in rev e4c586763258 forgetting sub1/file1

Merge with stable

Merge with crew

revlog: attempt to gracefully handle some interleaved damage

merge with crew-stable

Merge with hg-stable

Merge with mpm

Merge with -stable

tags: add --remove

tags: remove unused variables

Make the tags algorithm smarter

Refactor tags code to prepare for improving the algorithm

merge with crew-stable

Only hg repositories override [paths], not simple directories (fixes issue510)

git-send-email compatibility: stop reading changelog after ^---$

mq: add qparent tag (first parent of qbase)

Merge with -stable, fix small test failure

Remove dummy branch hack from tests

Move branch read/write to dirstate where it belongs

Minor default branch cleanups

Move branches.cache to branch.cache Keeps old clients from conflicting with new caches, makes features logic unnecessary.

"default" is the default branch name

Make [PATCH] removal slightly more robust

Remove undo log after mq operations that rollback would break

Refresh file size after partial qrefresh. This makes a subsequent hg revert; hg status work.

Clarify update help text for update without an explicit revision

Improve hg branch -f help text

Add test for branch shadowing

branch: require --force to shadow existing branches

Strip [PATCH...] from message subject when importing patches

Merge a bunch of matcher and locate fixes.

Optimize return value of util._matcher for hgignore case

Optimize return value of util._matcher for common command line case This will trigger every time somebody runs something like "hg diff" or "hg status" without any arguments. The important part here is returning util.always as the match function, which is a much simpler (and faster) function than the usual return value, and allows other code to just skip the filtering if it knows all files will match.

remove unused "head" hack from util._matcher

locate: exit(1) if we didn't print any file

change locate to use relglobs by default This makes its default behaviour useful again (issue108), and changes it search the entire repository by default (instead of just the cwd), just like all other commands. It also hides issue204 by default, but you'll still see the same behaviour if you give it a relpath: pattern.

localrepo.walk: if we're walking a specific revision, sort the files This is more consistent with our behaviour while walking the working directory.

dirstate.statwalk: explicitly test for ignored directories This removes a hack where we appended '/' to a dirname so that: - it would not appear on the "dc" dict - it would always be matched by the match function This was a contorted way of checking if the directory was matched by some hgignore pattern, and it would still fail with some uses of --include/--exclude patterns. Things would still work fine if we removed the check altogether and just appended things to "work" directly, but then we would end up walking ignored directories too, which could be quite a bit of work. This allows further simplification of the match function returned by util._matcher, and fixes walking the working directory with a --include pattern that matches only the end of a name.

util._matcher: unify pattern normalization This should fix issue347. It also highlights one issue with the directory walking code when you have an --include pattern that matches the end of a filename. This is fixed by the next patch.

make the output of test-walk more readable

util.*matcher: change default "names" argument names=['.'] means "include (recursively) only files from the current subdir"; the function then did a hack to walk the whole tree. Clean that up. This also fixes a problem where "--include ." works in a subdir, but not on the tree root.

util._matcher: fix handling of path: patterns

util._matcher: fix handling of relglob: patterns

A 'glob:foo?bar' pattern determines a root - the tree root

Leave normalization of patterns to util._matcher Passing [] to util.cmdmatcher accidentally fixes walking of files with "\n" in the name.

util._matcher: update comments This should match the code better. Except for bugs...

remove obsolete code from patch.diff repo.status already does this filtering. If the caller supplies a set of changes, it's his responsibility to filter out what he doesn't want.

small globprefix fix

Merge with crew-stable

Test update to branch tip

Make update with no node jump to the tip of the current branch

fix qrefresh'ing an empty patch This is not superefficient (the commit will have to walk the whole tree), but it works.

statwalk: don't put self.root in the files list That list is supposed to contain internal, normalized names ("/"-separated, relative to the repo root), not OS-native paths.

fix qclone to a remote repo This fixes issue467. -stable still needs something like revision 55578a8d7e84 - mq: allow push if -r is given explicitly. In the meantime, hg qpop -a; hg qclone . ssh://... is a workaround.

Save an absolute path in repo.path This should keep things working if the process changes directories after creating a repo object.

merge with crew-stable

Add tests for .hg/branches.cache feature list.

Add a features list to branches.cache to detect caches of old hg versions. The leading space in the written file makes sure that the feature list never can match an existing version, even if the first feature can be read as hex. Additionally old hg versions display the id with --debug, too.

Store empty (default) branch in branch cache, too. Operations on this branch don't work otherwise. Reading branches.cache had to be adjusted to allow an empty label. Adjusted reading of the cache tip for symmetry, no functional change here.

small fixes for the parent patch - format.usestore is a boolean option - python wart: ("revlogv1") is a string, not a tuple - only create a dummy changelog if we're using a store - add a test

Merge with crew

Allow disabling store format to work with absurdly long filenames

hgweb: use the given revision in the name of the archive If you ask for an archive in hgweb by tagname the directory in the archive should include the tagname not the changeset-id.

incoming/outgoing: print the name of the other repo

localrepo.status: use manifest.find on "lookup" files

localrepo.status: fcmp gets a getnode function instead of the manifest

fix manifest.find

merge with crew-stable

Fix sed expression in test-notify to be more portable.

Fix help text for hg status -i

purge.py: fix invocation of statwalk

Delete the README for purge, putting the useful informations in comments

Delete the Purge class, refactoring Purge.purge() in dopurge()

Do not use 'self' in the purge() method Avoid any reference to 'self' in Purge.purge() to allow its refactoring in a simple function.

Use nested functions instead of object methods

Merge _remove_file() and _remove_dir() in a single function

Use "f in dirstate" instead of "dirstate.state(f) == '?'"

Reduce the absolute/relative path conversion in the purge extension

Make the purge extension use the statwalk walker from the dirstate object

Yield directories in dirstate.statwalk()

Add a test for the purge extension

merge with crew-stable

Don't truncate tag and branch names after 30 chars (introduced 73860ffbe798) with test added for a long (local) tag name.

patchbomb: Strip more than one trailing dot (and spaces between them)

patchbomb: Allow to specify subject of single-patch-series (issue475)

test-abort-checkin: use a hook to abort the commit This should make it more portable.

test-bad-extension: avoid printing the file name This should make it simpler on windows

make test-acl a bit more digestable for windows

Create the parent directory when checking out symlinks.

Fix addremove for symlinks to non-existent files

Avoid some false positives for addremove -s The original code uses the similary score 1 - len(diff(after, before)) / len(after) The diff can at most be the size of the 'before' file, so any small 'before' file would be considered very similar. Removing an empty file would cause all files added in the same revision to be considered copies of the removed file. This changes the metric to bytes_overlap(before, after) / len(before + after) i.e. the actual percentage of bytes shared between the two files.

Merge with crew-stable

mq: abort cleanly when invalid patch name is given to qguard

Close keepalive connections to fix server traceback

don't return uninitialized memory from bdiff.blocks() bdiff.blocks() returns a dummy match at the end of both files; the length of that chunk is never set, so it will sometimes contain random heap garbage. There are apparently workarounds for this elsewhere: # bdiff sometimes gives huge matches past eof, this check eats them,

web/server: disable address reuse option for BaseHTTPServer on windows On windows, a socket with the SO_REUSEADDR option set is able to bind to any port, even if there's already an active socket listening on it. test-http: check server address cannot be reused.

stdout raises EINVAL when flush() is called on a closed pipe under win32. Maybe the exception should be caught and translated at raise location instead (sshserver.py).

localrepo: stream_in may raise ZeroDivisionError with nul float elapsed argument.

streamclone: stream_out tried to decodefilename non-normalized paths

Add _xmlplus to the demandimport blacklist. (HGCIA was failing to load.)

Suppress <stdout> before hg export -v (regression from previous patch).

Let patch.export handle any fp-like object

merge with crew-stable

Unified #! paths for python scripts and removed them for test modules.

Use the mercurial i18n infrastructure in the purge extension

Print relative names in the purge extension

Merge with crew

Merge with stable

merge: fix renaming of subdirectories under renamed directories

Break core of repo.tag into dirstate/hook-free repo._tag for convert-repo

Use only integer part of mtime in workingfilectx.date(), fixes test-context.py Similar to what is done in dirstate.status() (changeset 882e703eaa94) and has to be removed when Mercurial switches to subsecond granularity.

Merge with crew

Merge with crew

Merge with crew

convert-repo: use .git/objects/ rather than .git/HEAD to detect git repos

Don't keep trailing white space in cvs tags

Change a bit cvsps arguments - Force updating the cache - Use internal cvs implementation, reducing overhead - Use quiet mode

Fixed workingfilectx.date() (found by Thomas Waldmann) with test.

merge with crew-stable

test-notify: adapt to sed shipped with MacOS MacOS X' sed does not have the \? repetition operator.

git binary patches: don't print the header for identical files

git binary patches: use hashes to detect identical files

add test for diffing identical binary files

Don't lie that "binary file has changed" Without -a option to "hg diff", mdiff.unidiff reported that "Binary file foo has changed" without even trying to compare things. Now it computes MD5 of old and new files, compares them and makes the conclusion.

add some tests for qpush/qpop error codes

Modify qpush/qpop idempotent operations to return success Modify qpush/qpop such that idempotent instances of the operations return success. That is, repeated qpush -a, qpop -a, qpush patch-name or qpop patch-name will return success. The end goal of each of these operations is to reach a particular state. Whether or not the patches were already applied does not affect that state or operation status. Likewise, be careful to retain the error status on a qpush/qpop without arguments when the end/beginning of the series has been reached.

mq: propagate the return error of pop

util_win32.py: fix user_rcpath Fixes issue504.

Combined the two os_rcpath methods into a single one near rcpath in mercurial/util.py The os_rcpath method delegates to system_rcpath and user_rcpath from the different platform implementations.

merge with crew-stable

hgweb: catch util.Abort raised by addchangegroup Right now, if a pretxnchangegroup hook fails, we send some HTML error message to the client and the transaction is not rolled back (issue499). Catching util.Abort allows us to send a decent message to the client and for some reason makes the rollback complete. This patch is not perfect since it doesn't fix the reason why the transaction wasn't rolled back (maybe some circular references?). Also, the transaction is aborted only after we've sent the response back to the client and the "transaction aborted" message ends up in the logs of the web server.

notify: don't try to fix addresses if notify.domain is not set

mail.py: don't try to use TLS if python doesn't have SSL support This should hide the traceback from issue501.

git patches: handle renames of binary files

hgweb/server.py: use hg.repository to create a repo object

qclone: don't call reposetup manually

extdiff: open files in binary mode Problem noticed by Darrell Gallion.

Make extdiff work at root directory

Fix util.shellquote on windows.

Fix accessing the repo through a symlink.

Fix hg showconfig traceback with values that aren't strings

hgweb: allow static files to be served directly by the HTTP server

Unified *_rcpath so the interface is similar across operating systems Changed os_rcpath to combine system_rcpath and user_rcpath. Changed system_rcpath and user_rcpath to both return a list of paths to add to the combined rcpath for both Windows NT and other platforms.

convert-repo converts symlinks from git

merge with crew-stable

hgwebdir: try to get web.style and web.motd from the ui.config system This finishes fixing issue253. As a bonus, web.style and web.motd settings from ~/.hgrc will be used for the hgwebdir index page.

Pass a ui from create_server to hgwebdir and a repo from hgwebdir to hgweb This allows repo pages to respect hg serve --webdir-conf <file> --style=gitweb (part of issue253). Since we're creating a ui object anyway, use it as the parentui of the ui objects created for every repo entry. This has the unintended side-effect that --name=foo on the command line will set the name of all repos. If one of the repos being served has a .hg/hgrc owned by a user that is not trusted, hg will now print the "Not trusting file..." warning when reading it. This is consistent with the behaviour from a hg serve from inside the repo.

hg serve: call setconfig on the parentui It makes sense to do this on the "global" ui object, since command line options should affect the whole process. This should fix hg serve --style=gitweb inside a repo (part of issue253).

Prevent type exception on concatenation if diffstat returns None. This will most often occur if diffstat is not installed in the target platform, though may also happen in other cases where diffstat fails to execute. Signed-off-by: Sean Dague <sean@dague.net>

Switch CGI stdout to binary on windows Problem diagnosed by Andrei Vermel.

Fix dirstate fail at drive root on Windows

Try to pass repo.ui to reposetup hooks The ui object we received in this function may belong to another repo, which could be confusing from the hook point of view. Trying to use the ui object from the newly created repo should avoid this confusion.

BeOS compatibility support

transplant: remote bundle source was not closed before deleting the fetched bundle. It fails under win32 because "normal" opened files cannot be removed.

mq: qinit -c creates a repo even after a regular qinit

Handle functions as the value of a hooks.<name> config variable This should make it easier for extensions to add a hook when they're loaded.

allow values that aren't strings in util.configparser

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