context: clean up parents()

context: simplify changeid logic

use repo.changectx(None) to get a workingctx

context: avoid using None for working parent

use repo.changectx rather than context.changectx

context: consistently return p1 context for None

lookup: optimize '.' Remove error messages as behavior is documented in hg help revs

Remove RSS/atom links from coal/paper index

Improve archive links in coal/paper index

graph: fix JavaScript issues to make it work on IE

fix default branchheads() argument (e85951aeec6e was very broken)

fix dumb test failure introduced in 855851eae70f

Improve hgwebdir index in coal and paper styles

graph: improve script hiding tricks

graph: optimize rendering by appending all nodes at once

Fix gitweb to not say shortlog instead of graph.

tighter default argument selection in localrepo.branchheads()

merge from crew-stable

use ${PYTHON} var in doc/Makefile as well

merge: only in-branch merges can be implicit

get repo.branchheads() to use working directory's branch by default

kill some trailing spaces

graph: display branch name alongside tags

test-commit: test unset date is not read as epoch origin

Fix commit date (issue1193) The None check in workingctx prevents calling util.makedate when date is not explicitly given.

convert: hg sink commits without working dir

convert: reintegrate file retrieval code in sinks It simplifies the sink interface and all the sinks to handle files data as they want.

context: add memctx for memory commits

merge with crew

coal: remove double template entry

localrepo: interpret ctx.filectx() exception as a missing file

localrepo: do not expose workingctx options These are implementation details and probably of no use to client code.

localrepo: extract _commitctx() from commit() _commitctx() takes a single changectx like argument. It gives way to commits from memory only.

context: let workingctx.date(), .user() and description() be overriden

localrepo: let commit() get extra data from workingctx

localrepo: hide commit() file selection behind workingctx

localrepo: replace dirstate by workingfilectx in filecommit()

context: let workingctx parents be overriden

graph: limit the number of displayed changest to a reasonable value

LookupError should have same __str__ as RevlogError

templates: graph lacked bottom search in default style

templates: fix navigation links for graph entries

make revlog.LookupError inherit from KeyError This will improve integration with external applications which depend on KeyError, which is usually raised by __getitem__ calls.

cvsps.py: remove unused Changeset member of logentry

tests: make new convert-cvs tests executable

graph: tweak the indentation algorithm

cvsps: fix a final whitespace nit

tests: fix test breakage from graph template changes

merge incorporation of graph into paper style

hgweb: Fix up non-coal styles to support graph.

make graph view work with paper style

add graph page to hgweb

convert: cvs.py - Allow user to use built-in CVS changeset code. tests: add two testcases for CVS conversion with builtin CVS including a testcase for issue 1148.

convert: cvsps - User interface to CVS changeset code in cvsps.py

cvsps: fix up some whitespace

convert: cvsps.py - code to generate changesets from a CVS repository

merge with crew-stable

Merge with crew-stable

localrepo: remove useless sort() call

merge transplanted cset back from crew-stable

Fix python2.3 incompatibility introduced by a2b13cac0922.

run-tests.py: Make tests run with python2.3 if HGTEST_* is set. optparse of python2.3 does not transform default values to the specified type so e.g. "HGTEST_JOBS=4" (introduced in 07c3cd695b48) causes tests to abort, because options.jobs is set to '4' instead of the number 4.

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

hgk: difftree must match all files when supplied list is empty

status: fix "added" attributes renamed in bf2bf986ff87

doc/hgrc.5.txt: add anchors for sections Enables links into hgrc.5.html of the form: hgrc.5.html#section

merge from crew-stable

gendoc: add anchors for commands Enables links into hg.1.html of the form: hg.1.html#command

mq: add correct documentation for qpop

Backed out changeset ff5ef3c0fe10 (fixes wrong documentation)

Slight improvement to qpop arguments help

test-mq: update qdiff summary output

mq: make qselect fail properly on an empty guard

mq: expand help text for qdiff Thanks to Waldo for thinking about this and formulating some text.

status: refactor status command - directly calculate a list of states to show - simplify repo.status call - use zip to build file list - only add relevant copies to copy dict

match: cleanup match classes a bit

match: remove files arg from repo.status and friends

match: remove files argument from patch.diff

match: use match.files() for patch.diff

match: stop passing files through commitfunc

status: use match helpers for various users

churn: simplify hg status call

match: use helpers for cmdutil

match: add always, never, and exact methods

remove default arg from patkind

resolve: use cmdutil.match

dirstate: remove default from status list_unknown

purge: remove unused 'missing' logic

dirstate: minor status cleanups

status: rename type_ to state

walk: use match.bad in statwalk

walk: use match.dir in statwalk

walk: make dirstate.walk return a single value too

walk: return a single value

walk: remove cmdutil.walk

walk: remove rel and exact returns

walk: remove more old badmatch logic

walk: remove remaining users of cmdutils.matchpats

cmdutil: switch commit to match

walkchangerev: use new match objects

walk: pass match object to cmdutil.walk - introduce cmdutil.match - change args to cmdutil.walk - create match objects for walk calls

walk: begin refactoring badmatch handling

walk: remove files arg from repo.walk and dirstate.walk

walk: introduce match objects

walk: kill util.cmdmatcher and _matcher

purge: use cmdutil.matchpats

purge: eliminate dopurge

walk: eliminate some default variables

coal: fix CSS errors as reported by Firefox

add compression type type parameter to bundle command

add support for HG10GZ bundles to bundlerepo.bundlerevlog()

tests: fix test-highlight output, changed in ccc2481e3954

merge from crew-stable

rename --after: do not unlink source file (issue910) "rename --after a.txt A.txt" on case mangling systems (e.g. Windows) erroneously deleted A.txt (even if modified).

Make mercurial easy installable again

webcommands: pass full author to annotate, fix templates (issue 1054)

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

merge from crew-stable

mq: fix qdiff -U (it apparently never really worked)

mergetools.hgrc patch

mergetools.hgrc patch

merge from crew-stable

merge from crew-stable

coal: put link fragment at the end of the url (after session vars)

merge from crew-stable

mq: don't commit local changes on pushing empty patch (issue1087)

remove trailing spaces

mq: add a little documentation on qpush -f

ignore *.pyd files *.c modules on Windows are compiled to *.pyd

Merge with crew-stable, fix test output

Merge with crew-stable

replace usage of os.popen() with util.popen() To make this possible, I added a mode parameter to both implementations of util.popen(), defaulting to 'r' (as it does in the Python stdlib).

test-merge-internal-tools-pattern: make executable

convert: fix svn file copy detection code

convert: fix svn branch source detection corner case It was confused by composite-looking revisions made by copy + remove.

convert: cleanup svn file copy handling

convert: handle past or foreign partial svn copies Subversion allows revisions to be composed of subparts coming from revisions before the parent or from other part of the repository. There is no simple representation for these now, keep the changes but do not track their origins.

convert: more cleanup in svn directory copy handling

convert: svn directory copy handling cleanup

convert: improve subversion branch filtering

convert: rename get_entry_from_path() into an svn_source method

convert: fix subpaths detection in svn source

test-convert-svn-branches: short identifiers are more legible

cmdutil: handle and warn about missing copy revisions

localrepo: forbid nullid copyrev

verify: check copy source revlog and nodeid

Merge with -stable

removing unused local ccache in patch.diff

merge with -stable

merge: replace readline() call, missing from posixfile_nt

Merge with crew-stable

remove trailing whitespace introduced in cfeeac24fc1e

templates/coal: spell class correctly in {fileentry}

repo: add rjoin method

parseurl: make revs optional

Hoist localpath to the top level

test-imerge: disable due to massive brokenness

use internal merge tool when specified for a merge-pattern in hgrc It is possible to specify in the hgrc file that one of the internal merge tools (internal:fail, internal:local or internal:other) be used for performing merges on files matching a given pattern. However, this setting is not being acted upon (the merge tool is not found). This patch fixes that.

test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.

fix import with -p0

context: handle untracked files in filectx.fileflags()

resolve: new command - add basic resolve command functionality - point failed update and merge at resolve

python-2.6: use sha wrapper from util for new merge code

fixed missing sorting in test-dumprevlog The test failed at random because the order of files was non-deterministic, which produced diffs in test output.

test-dumprevlog: fix extra path separator under MacOSX The "find .hg/store/ -name '*.i'" command returned paths with extra separators like '.hg/store//00changelog.i'.

Merge from main.

Add a batch file driver for Windows

merge: introduce mergestate

Merge with crew-stable.

win32text: actually import util so util.binary() can be used

issue 1053: heavily qualify the "cp -al" advice for cloning

Get rid of reimplementations of util.binary

Let util.binary check entire data for \0 (issue1066, issue1079)

keyword: check for '\0' in entire data before acting util.binary might not be safe enough, as it fails eg. on certain pdf files (issue1066).

keyword: make overwrite() arguments mandatory

keyword: compact setting of optional arguments

keyword: privatize remaining monkeypatches by moving them into reposetup Make it more transparent if and when monkeypatches are needed.