contexts: improve filectx eq test

Merge with -stable

patchbomb: add --desc, to specify a file containing a series description

merge with crew-stable

Merge with crew-stable.

merge: fix unnecessary rename merges on linear update (issue631) If one side's revision is identical to the ancestor, we skip the rest of the copy detection logic.

convert: Use clone's behaviour for the default destionation name. Adjusted the documentation for this and for the fact that the destionation is created even if a name is specified.

test-symlink-basic: require symlinks availability

Add hghave utility and run-tests.py support. hghave detects system features like symlinks availability at run-time. Tests can be skipped by starting them with: "$TESTDIR/hghave" symlink || exit 80 The 80 exit status triggers hghave output handling by run-tests.py. Also, tests output can be locally patched on the fly to match reference output.

run-tests: extract correct status when script terminates with exit

Merge with -stable

diff: correctly handle combinations of whitespace options

hg grep: handle re.compile errors & update tests/test-grep

typo fix

Re: mercurial.el and hg-version-other-window hg-version-other window is unimplemented in mercurial.el. The version below works for me, YMMV.

Use isinstance instead of type == type

convert: record the source revision in the changelog

Use wsgi.url_scheme instead of ad-hoc CGI checks. Instead of each place in hgweb_mod that needs to check for SSL or get the protocol scheme (http vs. https) doing it ad-hoc, make them just look at the wsgi.url_scheme which because of previous patches is now always set correctly.

cosmetics

Make hg serve set the wsgi.url_scheme property correctly. This fixes the bug where hg serve with SSL will always detect the wrong urlbase for templates. This is also part of unifying the CGI interface and hg serve interface to both use standard wsgi.

Handle CGI SSL detection via HTTPS environment better. Some servers send on/off, 0/1, yes/no, and may be upper or lower case. This fix will handle all of those permutations. It was inspired by the detection done in in some other wsgi python web applications I looked at.

merge with crew-stable

Make {urlbase} work in templates when https is used.

replace .hgtags instead of appending to it when doing a raw commit

handle nonexistent .hgtags in raw _tag

Export extra in _tag so convert can set the branch of a tag

archive: abort on empty repository. Fixes #624.

mq: improve qclone error handling when patch directory is not a repository.

Fix test-debugcomplete for new --certificate option

Add SSL support to hg serve, activated via --certificate option

Correct inadvertent line ending change.

Fix for win32text corrupting files that have CRLF line endings. (issue302) Also generate a warning when encountering this condition. From Shun-ichi Goto in attachment win32text-patch3.txt for issue 302.

Add --line-number option to hg annotate (issue506) Line numbers are separated from the last annotation element with a colon, like with many other commands, e.g. (hg) grep or compiler errors. Idea and tests by FUJIWARA Katsunori.

Allow filectx.annotate to return the line number of first appearance.

Check for conflict markers in hgmerge (issue471)

merge with crew-stable

Removed deprecated hg:// and old-http:// protocols (issue406)

hgwebdir: check for repo foo before browsing subdirectories of foo/

Merge with crew

hgweb: browse subdirectories before checking whether parent directory is also a repository

Use a prefix for debuginstall tempfiles. This way you know where the files came from if they don't get removed.

python 2.3 does not have sorted

Sort changelog extra dict to avoid possible nondeterminism

Last change broke new-style URLs

hgwebdir: do not walk up the given path looking for a repository. It is there or it isn't.

merge with crew-stable

hgwebdir: show only trailing part of path when browsing subdirectories

gitweb: add notfound template

hgweb: let hgwebdir browse subdirectories

convert: svn code movement (no actual changes)

convert: svn: avoid parsing already-seen logentries due to branch following

Merge with main

convert: svn: some improvements in memory usage

archive: make the %r escape work.

serve: respect settings from .hg/hgrc create_server was looking only at the root ui object, ignoring any settings from .hg/hgrc. To keep respecting command-line arguments, commands.serve must also call repo.ui.setconfig.

Fix inconsistency for the stream_out capability in hgweb During some experiments of mine, the uncompressed cloning could not be enabled for hgweb.cgi nor hgwebdir.cgi though the server claimed to be stream_out capable. The only solution was to enable it using the user's .hgrc file. This solution is not acceptable when publishing the repos through an HTTP server because the CGI runs as a www dedicated user whose's home hgrc file may not be accessible to users publishing their repos through their userdir. For such cases we could end up with this typical debug output: hg --debug clone --uncompressed http://server/hg/project destination directory: project sending capabilities command capabilities: lookup changegroupsubset stream=1 unbundle=HG10GZ,HG10BZ,HG10UN sending stream_out command abort: operation forbidden by server The error lies in the fact the hgweb object defines new accessors to the repo configuration that trust things by default (untrusted=True) but the streamclone:stream_out function uses the usual accessors to the repo.ui object, which do not trust by default (untrusted=False) Fix this inconsistency, adding a new parameter to the stream_out function. hgweb then forces a "trust by default" behavior.

improve warning for hg add foo; hg mv foo bar

util._hgexecutable: default to 'hg' This should make hooks work even if util.set_hgexecutable is not called (e.g. hgweb.cgi). Fixes issue625.

archive: add symlink support

archive: use util.opener when archiving files. This simplifies the code a bit and makes it easier to support symlinks.

localrepo.wwrite: use opener.symlink This makes us fall back to regular files if symlinks are not supported.

Add symlink method to util.opener. Differences from os.symlink: - the symlink name is relative to the opener base directory - if a file with that name already exists, it's removed - if necessary, parent directories are created - if the system (OS or filesystem) doesn't support symlinks, a regular file is created. Its contents are the symlink target.

turn util.opener into a class

Fixed double slash for doc install path introduced by using $DESTDIR (issue620) $MANDIR already is an absolute path so the extra / isn't needed.

hg log: Move filtering implicit parents to own method and use it in templater. Extended test repo in test-command-template to contain changeset to test this.

Strip whitespace from changeset description in changeset_templater. changeset_printer already does this, too.

merge with crew-stable

Add html docs and use for help shortcut

Merge with stable

Merge with crew-stable

merge: fix adding untracked files on directory rename (issue612) Fix from Brendan Added test case

extensions: untangle some recursive dependencies

interhg extension allows you to change changelog text like InterWiki.

setup.py not executable: change instructions at beginning of file

Merge with stable

convert: svn: remove svn_paths wrappers

convert: svn: use revmap to parse only new revisions in incremental conversions

convert: export revmap to source. Sources may be able to use it to optimise their own log fetching

convert: svn: defer get_log parsing until after get_log completes. According to the documentation, it is not safe to perform any other operation on the ra object until get_log completes.

convert: move some code into common init function

Merge with crew

alias: remove dead code

convert: call superclass init from engine init functions

Merge with crew-stable

test-archive: stop checking md5 absolute values Different tar/zlib versions can generate different binaries.

Fix issue589 wording problem

Fix serve on Windows without win32* modules.

test-demandimport: match upper-case hexadecimal

Add alias extension

merge with crew-stable

convert svn: minor improvement to tag detection. The better way is probably to list the latest tags directory and look up the last log message for each entry. This is surprisingly annoying to do.

convert: svn merges produce hard-to-trace file entries. Ignore them for now.

convert: svn: autodetect /branches, /tags, /trunk. Various other branch handling improvement attempts too.

convert: svn: pull out broken batching code, add alpha tags support

convert: svn: get parent for branch creation events

convert: add optional module argument to svn._fetch_revisions

convert: svn: parse log entries as they arrive instead of deferring it

convert: svn: move some debug output to verbose

convert: another typo in svn.latest

convert: typo in svn.latest

convert: svn: add function to get the latest revision touching a path Make it work for HTTP URLs

convert: svn: add an early return to move most changeset parsing out an indent level

convert: svn: use a separate mempool for each ls in the 1.4 fallback path

Remove specific version requirement and point to latest versions of Mac Python downloads.

children extension: Don't abort when looking at the null revision. Since 62c56d8f368b revlog.children only returns real children, so this is no longer a problem.

merge with crew-stable

Add extension to provide the 'hg children' command (with tests)

merge with crew-stable

Merge with tah

convert: make convertsource option handling transparent

Added import test for [PATCH] subject and message body with subject

patch.extract: fix test-import breakage introduced in the previous changeset

patch.extract: do not prepend subject if the description already starts with it

convert: svn: skip revisions without file entries

convert: svn: disable batched fetch - get the whole log immediately

convert: svn: add revnum() to convert rev to revnum

convert: svn: abort if module stat fails

convert: fetch svn changes on demand (in batches)

convert: svn: convert branch trunk to default

convert: svn: fix fallback directory listing code when importing a submodule

convert: remove svn debugger trap

convert: import all branches from git repositories

convert: gitcmd wrapper for os.popen

convert: activate subversion engine Fail gracefully if the subversion python bindings are not installed. Support --rev option to convert as well as URL@rev.

convert extension: Add SVN converter

convert extension: stripped-down svn transport module

convert: split converter into convertsource and convertsink

convert: move *** empty log message *** into commit class

convert: initialize source after destination, cleaning up if source is unusable

convert: add -r argument specifying latest revision to convert

convert: ove recode method into converter_source

Merge with crew-stable

Merge with Adam Spiers

mercurial.spec: convert extension now installs files into hgext/convert/

buildrpm: fix rpm release number calculation It was broken when patch queues were in use.

buildrpm: auto-generate %changelog in .spec file Top entry is tip; subsequent entries are the version tags from .hgtags.

mercurial.spec: include CONTRIBUTORS, COPYING and man pages in rpm

mercurial.spec: include various utility files from contrib/ in rpm Files included: hgk convert-repo hg-ssh hg-viz git-rev-tree bash_completion zsh_completion mercurial.el

mercurial.spec: add BuildRequires Add build dependencies from README as block quote.

mercurial.spec: fix when default python prefix != rpm %{_prefix} e.g. on SUSE Linux Enterprise 10

Convert default mercurial.ini file to Windows line endings

merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test

Fixed calling the merge script and reporting errors in debuginstall (issue617)

Fix revlog.children so the real children of the null revision can be calculated.

hgweb: use lrwxrwxrwx as the permissions of a symlink

Make hg add foo; hg mv foo bar work. - foo will be removed (the user has a copy of its contents in bar) - bar will not be marked as a copy (there was no committed version of foo). We print a warning telling that to the user. Fixes issue269.

test-copy2: use status -C instead of debugstate | grep copy

test-rename: use hg status -C; don't use hg debugstate | grep copy

Make hgk handle filenames with spaces (issue49)

Use "--config ui.report_untrusted=false" for hg calls in hgk, fixes issue523. tcl's exec yields an error if output to stderr happens and isn't redirected to a file, so the warnings about untrusted .hg/hgrc caused problems in hgk. The warning is still printed when executing 'hg view', so the user can see it when using it from the shell.

Added full URL to debug output if something doesn't look like an http hg repo. This way it is easier to debug problems with failing subcommands, like changegroupsubset due to permission problems, when generally accessing the repository works fine.

Handle extensions with defined but empty cmdtable

mq: more qdelete help text tweaks

mq: require patch argument or revision for qdelete

Make hg glog abort if unused arguments are given.

Abort if earlygetopt fails to detect an option. Otherwise it could happen that a command is used on the wrong repository, because abbreviations of --cwd or --repository were ignored.

Simplified earlygetopt and made it remove parsed options and values. The order of aliases is no longer important, too.

Disallow short earlygetop option combined with other short options While "hg commit -qRfoo" can be read as "--quiet --repository foo", "hg commit -mRfoo" should be "--message Rfoo".

Fix tgz archival on Windows. Making tgz's on Windows has been broken by 06de65673ec2 due to not being careful enough about binary mode opens.

Updated command tables in commands.py and hgext extensions. - Marked for translation where extensions already had _() - Corrected indentation - fixed a few synopsises

Catch illegal boolean values in hgrc nicely. With hg 0.9.3 the section and parameter name wasn't printed, with hg 0.9.4 there was a traceback for ValueError.

Added test for earlygetopt fixes (36d23de02da1 and 79cc512a34ed)

Fix earlygetop for short options with unnecessary spaces removed Examples: hg log -qR foo hg log -Rfoo hg log -qRfoo

Fix and test 'hg backout' without or with too many revisions.

Added signature for changeset fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694

Added tag 0.9.4 for changeset fb4b6d5fe100

Update binary installer files.

mq: regularize patch header creation. Do not prefix qnew patches with [mq]: when a message has been given. Always use [mq]: as the prefix for generated commit messages.

convert: "unknown" is a string

OpenVMS patches

fix 'convert' with single commit repositories The attached patch passes the three 'convert' testcases, and also is able to successfully convert the git.git repository.

backout: report short hash in commit message

New config option: ui.report_untrusted (defaults to True)

Make earlygetopt return a list of all option values, use the last value. This fixes: "hg -R" showing a useful error instead of traceback "hg -R foo --repository bar" using bar instead of foo And provides a way for other users of earlygetopt to accept more than one value.

Fixed sorting inside nearly sorted sections in hgrc.5

Make changeset_printer respect ui diffopts

mq: support qnew -I/-X and file name lists

Merge with mpm

mq: document that qinit -c may be run later

gitweb: do not mix shortlog and changelog in summary page.

Add option "hidden" to hgwebdir. TODO: should this option be renamed to 'hide_from_index' or maybe to 'index_ignore' (like Apache's mod_autoindex) ?

Add support for RFC2822 to util.parsedate().

Makefile: remove *.pyd files on "make clean".

Makefile: change "make local" to build a fully working local version.

gitweb: hide email addresses in shortlog with |person

Make shortlog the default page in hgweb

hgweb: improve shortlog formatting shorten author with |person don't shrink font (default font is presumed to be preferred reading size) set widths based on font ems rather than page percents.

strip: move strip code to a new repair module

strip: simplify bundle helper

strip: pull core strip logic into its own function

unbundle: accept multiple file arguments update test-bundle for multiple unbundle support

convert: handle new cvsps with Tags: and multiple tags.

cat: return an error on failure

tests: add merge test for changeset 9fe267f77f56 When all the files in a directory are moved somewhere else, and new files are added in changesets of the local branch, a subsequent pull and merge shouldn't rename the locally added files too.

purge: add the clean alias inspired by git-clean and svn-clean

mercurial.el: ignore errors on hg-after-save-hook() Don't signal an error even if running hg command fails. Otherwise, succeeding hooks won't be called.

mercurial.el: change default log range to tip:0 If the tip revision is smaller than hg-rev-completion-limit (defaults to 100), "hg log -r tip:-100" fails. Since performance does not differ between "hg log -l 50 -r tip:0" and "hg log -l 50 -r tip:-100" even on large repository, default range can be changed from "tip:-100" to "tip:0" without any drawbacks.

Command in doc comment is now on a single line, fixed after previous formatting broke it.

purge: don't delete ignored files if --all is not specified

Enable to select encoding in hgrc web section This patch provides character encoding setting in each repository. After this patch, You can use multi encoding repositories with one mercurial server.

merge with main

hgk: Use $HG instead of hg (see 849f011dbf79)

hgeditor: Use $HG to run 'hg diff' (see 849f011dbf79)

Remember path to 'hg' executable and pass to external tools and hooks as $HG.

archive: remove spurious flag_bits setting This makes zip -T on resulting archives work. File permissions are still retained.

convert: sometimes git forgets the author

Merge with main

merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.

rollback: update help for issue316

transplant: fix locking order

git patches: correct handling of filenames with spaces Add a trailing TAB to the "--- filename" lines if there's a space in the file name. This allows patch(1) to work correctly. The same is done for diff --nodates. This was originally suggested by Andrei Vermel, but at the time I thought git was doing something different.

Work around urllib2 digest auth bug with Python < 2.5 This should fix issue570.

dirstate.status: if a file is marked as copied, consider it modified After a "hg copy --force --after somefile cleanfile", cleanfile shouldn't be considered clean anymore.

Merge with Eric Hopper

Change branches to sort 'active' branches first, and add an option to show only active branches.

merge: warn user about divergent renames

Merge with crew

Handle CTRL+C in serve under Windows.

identify: take a path to a remote repo Rather than using -R, we take a path as an argument. This lets us use url#branch syntaxes that may be in hgrc.

dispatch: parse local hgrc for paths

hgweb_mod.archive(): Use 'key' instead of builtin 'id'.

Remove useless variable assignments in util.opener. The original idea might have been to prevent circular references, but as this assignment would have created another reference, this makes no difference.

identify: work with remote repos

identify: add support for output flags

identify: accept a revision argument

identify: use contexts

context: add tags() method

identify: show nullid for empty repo

Backed out changeset cfa477946181824f4c769580ebf59710090ba08a Only printenv was changed, not the actual execution of hooks. And not setting an empty value might cause problems on platforms which can't always remove variables from the environment.

Adjust note about variables not being set for empty values.

Kill trailing spaces

mq: test that qpush cleans things up when it fails

dirstate.invalidate: clear dirty flag

dirstate: fix typo

update the output of test-help and test-globalopts

Fix dispatch error message when not in a repo

archive: test md5 consistency

timestamp of gzip archives taken from changeset context

Test attempt to remove nonexistent tag

tag: abort when trying to remove nonexistent tags

Small fixes for 8e503fa54d2d (hg heads branch)

Add option to heads to show only heads for current branch.

Provide a version independent way to use the set datatype.

Fix read mode when importing patch.

Add tests for ui.patch regression.

patch: fix ui.patch regression introduced by 62019c4427e3. The idea is ui.patch is either empty or wisely filled by user.

printenv: filter empty environment variables for portability.

Merge with crew-stable

Document empty environment variables not being passed to hooks under Windows.

Merge with crew-stable

test-annotate: add a test for issue 589.

Fix issue 589: "undelete" sequence leads to crash.

Add test for debugrename

Fix debugrename --rev option

Updated copyright notices and add "and others" to "hg version"

Use printenv.py for pre/post-command-hooks (fixes tests on Solaris, too)