Merge with main

merge with main

use parent.__setattr__ instead of __dict__

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

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

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

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]

Replace demandload with new demandimport

Remove deprecated old-style branch support

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.

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 mpm

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

Merge with crew

Add doc notes about revert and hg status vs diff

merge with main

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.

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

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

Teach convert-repo to deal with mixed charsets in git

Merge with crew

Merge with mpm

Merge with mpm

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

zsh: remove deprecated -f option for hg update

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

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

Update dates help topic

Update tests

parsedate: add UTC and GMT timezones

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

parsedate: allow '' for epoch

parsedate: use Abort rather than ValueError

add debugdate command

Merge with crew

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

Removed unused parameters/options of update command.

Add "null" pseudo-tag pointing to nullid

hgk: show view in short command list

move patterns topics

move environment topic

Generate docs for help topics

Allow topics to be callables

Add basic support for help topics and a dates topic

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

merge with crew

Fix revrange() call in the churn contrib

introduce localrepo.spath for the store path, sopener fixes

localrepo: change aftertrans to be independant of the store path

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

Merge with crew

bundlerepo: don't hardcode the revlog filename

make hg commit <dirname> work again

imported patch collision

imported patch folding

Make quoting in test-encoding simpler

update test-debugcomplete

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

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

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