Ignore dummy copies in dirstate and localrepo.filecommit()

context: fix workingctx.fileflags() execute bit

sshserver: Don't try to close fp if mkstemp failed

Add a normalize() method to dirstate This method returns the normalised form of a path. This is - the form in the dirstate, if available, or - the form on disk, if available, or - the form passed on the command line normalize() is called on the type-'f' result of statwalk. This fixes issues 910 and 1092

Add a new function, fspath The function, given a relative filename and a root, returns the filename modified to use the case actually stored in the filesystem (or None if the file does not exist). The returned name is relative to the root, but retains the path separators used in the input path. (This is not strictly necessary, but retaining the path separators minimises misleading test suite failures). A win32-specific implementation (using win32api.FindFiles) is possible, but it has not been implemented as testing seems to demonstrate that the win32-specific code is not significantly faster (thanks to the caching of results in the generic code).

Add a folding() method to dirstate The method returns True if the dirstate is on a case folding filesystem.

update: add "(nobackup)" to help text of option --clean

update: improved help text Using the term "the repository's working directory" instead of just "working directory" to make it nearly impossible to confuse it with $PWD. Also, this new wording better conveys the fact that update applies to the working dir as a whole (no matter what the $PWD currently is).

keyword: mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message

tag: record tag we're superseding, if any (issue 1102)

merge from crew-stable

fix traceback in hgweb when URL doesn't end in one of the archive specs If the last n charecters of the URL doesn't match an entry in archive_specs req.form never has a key 'type'. When achive() looks up 'type' in the form dict it causes a traceback rather than printing an error message.

mq: qdiff: support all diffopts

keyword: disable expansion for annotate Keyword expansion should not be annotated. Annotate revision when unexpanded keyword was inserted. Add test.

convert comments to docstrings in a bunch of extensions

merge from crew-stable

Truncate input to 1K when using pygments guess_lexer. This function appears to be exponential with input length.

paper: fix reference to coal tags template

Truncate input to 1K when using pygments guess_lexer. This function appears to be exponential with input length.

hgweb: add paper style derived from coal

Merge with crew

webcommands: fix increments lost by 894875eae49b

Merge with crew

hgweb: show cset node and description when hovering over annotate prefix

Merge with crew-stable

help: move "revision syntax" help topics into online help Move the "Specifying Single Revisions" and "Specifying Multiple Revisions" help topics from the manual page into the helptable so they are available both online and in the manual page.

help: helptable is an ordered collection The helptable is used for helptopics listed in the manual page, so the order of topics should not be random. Convert it from a dictionary into a tuple of tuples. Also reorder helptable entries to keep previous manual page order.

help: list special help topics with -v

help: enable listing of a subset of the command list Instead of giving the "command %s is ambiguous" error message with a bare list of possible command, display help list for all commands starting with the given string.

addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).

Merge with crew-stable

test-mq-qrename: test added patch renaming

mq: handle added patch renaming correctly

drop superfluous param from revlog.addgroup()

copies: teach copies about dirstate.copies When we're using copies() to find changes between the working directory and its first parent for diff/status/etc., use dirstate.copies() directly. This avoids doing a full statwalk for simple diffs (issue1090) and removes a special case from the status command.

mq: introduce the qfinish command

merge from crew-stable

Merge with crew-stable

resolve: add file codes to doc string

merge from crew-stable

Make test-bundle-type work on MacOS 10.4.11 head on MacOS Tiger doesn't have a -c option.

localrepo: fix partial merge test (issue 1111)

Fix bad span tag in Readme

Merge with crew-stable

merge from crew-stable

mq: don't update the working copy on strip if parents aren't stripped * * *

mq: qimport: explain insertion point in doc string

test-convert-mtn: test descriptions with quotes

convert.monotone: fix quotes and backslashes in change descriptions.

Active branches fix (issue1104)

hgweb: correctly validate permissions with streamclone pulling

Fix bad span tag in Readme

test-mq-merge: test mq merge and explicit patch queue

mq: qpush -n fix

tests: don't run test-convert-cvs if there's no cvs server

improve help text for clone -U

Added signature for changeset d5cbbe2c49ce

Added tag 1.0.1 for changeset d5cbbe2c49ce

merge from crew-stable

mq: lose the trailing whitespace

improve help text for push (explanation of -r)

merge from crew-stable

merge from crew-stable

Merge with crew-stable