Fix undetected change bug in rename tests

Handle odd-sized base85 input and output

Put in backslash again, it was needed to disable an asciidoc macro. Backed out changeset c05b0cc6b1485bb240e118a2be9e1d52bb25fd65

Corrected typo in date format, found by Rob Landley.

Make test-bundle-r executable.

add -r/--rev and --base option to bundle --rev is used to specify a target rev (like pull or clone) --base REV is used to specify a base instead of a target repo the target repo is assumed to have all the rev specified in --base

Update test output

Merge with crew

merge: copy fixes and tests Fix up "already seen" logic Fix merge action in remote copy case Add status message Add lots of merge+copy/move test cases

Add a base85 codec

hgweb: fix filerevision raw URL

disallow commands on non local repository

Moved hgweb map-* files into their style directories and adjusted them.

hgweb: Search templates in templatepath/style/map, too, using a common function. This allows for web templates to be self-contained in a directory, which makes copying and modifying them easier.

ssh: make the error message more clear, add a testcase

hgweb: be more conservative about expanding SCRIPT_NAME

Add {getentries} to default style

hgweb: fix NWI parsing when hgwebdir isn't at /

hgweb: convert gitweb to NWI

hgweb: provide means for handling query parameters

Some versions of sed don't support .\+, so use ..* instead. Reported by Christian Ebert for MacOS X.

Un-debugify debugconfig to showconfig. (issue 317)

hgweb: Added safety net for PATH_INFO starting with double slash. This happens e.g. when using the following apache config: RewriteRule (.*) /hgwebdir/$1 [PT] instead of the less readable (but more correct): RewriteRule (.*) /hgwebdir$1 [PT]

merged NewWebInterface

Update templates to use NewWebInterface

Rename default style to old

hgweb: support for generating and parsing NWI URLs

Teach hgwebdir about new interface

hgweb: extract raw prefix from NWI commands

hgweb: accept NewWebInterface URLs

merge with upstream

merge: fixes for merge+rename findcopies: ignore files renamed on both branches applyupdates: change remove flag to move recordupdates: record copy actions, including local moves and deletions

Make status -C work with merge+rename

merge: add rename following Currently disabled by default, enable with [merge] followcopies = 1

merge: reduce manifest copying

merge with crew

Add documentation about the date formats allowed in the command line

util.strdate: assume local time when no timezone specified

util.strdate: compute timestamp using UTC, not local timezone

merge with upstream

merge: reorder dirstate update slightly for correctness

patchbomb: update --attach to use cmdutil.make_filename

hgweb: fix manifest link in gitweb summary

Corrected install location of manpages. (man/manSECTION/ instead of man/man.SECTION/)

Fix static file serving over HTTP on Windows. Files to be served should be opened in binary mode.

mq: update qfold to call delete correctly

Make changectx.filenode raise repo.LookupError on failure

Merge with upstream

merge: use new working context object in update

contexts: add working dir and working file contexts add workingctx add workingfilectx extend filectx.annotate for rev=None extend filectx.ancestor

context: simplify repr methods

contexts: use __getattr__ rather than try/except in changectx

context: make filectx remember changectx in changectx.filectx

Make filectx lazier Lazy opening of filelog, lazy lookup of filenode and changeid

merge: remove old merge function

merge: extend file merge function for renames

Fix minor indentation problem in template-vars.txt

Install all files/subdirectories below templates. This is needed because styles are now in their own subdirectory.

Applied coding style to setup.py

Use parentrevs shortcut in filectx.annotate