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

Move raw theme into subdirectory

Move RSS theme into subdirectory

Move gitweb theme into subdirectory

[extendedchangelog] add extra metadata in the changelog entry - add a third item in the date field that holds arbitrary key:value items

[extendedchangelog] encode/decode function encode '\n', '\r' and '\0'

fix warnings from pychecker

Fix gitweb index archive link

merge with crew

test-merge-revert2 solaris fix

Make filectx.__init__ use LookupError

hgweb: add methods to get contexts from request

Raise LookupError in changectx.filectx if filenode can't be found

Add hg.LookupError

Whitespace/Tab cleanup

Add gitweb style hgwebdir

Add style support to hgwebdir

hgweb: use contexts in more handlers

filelog.annotate is now obsolete

correctly find the type of 'id' in revlog.lookup

merged brendan's hgweb cleanups

hgweb: teach siblings and callers to use contexts

Add lookup method to filectx

hgweb: kill off #filenode#

hgweb: kill #manifest#

Remove duplicate walkopts + dryrunopts from addremove.

Merge with upstream

merge: minor nullid cleanup

context: add __nonzero__ methods

merge: use repo.parents and parent contexts in update

Add str methods to contexts

Add equality operators to changectx and filectx

localrepo.parents: return null context for no parents

Add localrepo.parents to get parent changectxs.

Remove unneeded (and bashismic) export HGMERGE=true.

Templater expects an iterable copies variable (fixes notify).

Remove single character equivalent of --nodates (was -D)

Add -D/--nodates options to hg diff/export that removes dates from diff headers and replace uses of sed in the tests with --nodates.

Documentation clarification for --update option to pull and unbundle

Show copies in hg log. The format is: copies: destination (source)...

Abstract manifest block parsing.

Make hg.repository work with no path argument

merge with crew

Make "hg log --style=changelog > changelog" work (issue338) Style files in templates/ now take precedence over current directory. This can be overridden with --style=./changelog if really neeeded. Added test for issue338.

Clarify precedence for template/style in commands.show_changeset(): Display format will be the first non-empty hit of: 1. option 'template' 2. option 'style' 3. [ui] setting 'logtemplate' 4. [ui] setting 'style' If all of these values are either the unset or the empty string, regular display via changeset_printer() is done.

add remoteopts to bundle command

factor opts: remote repo access options

factor opts: --dry-run option

factor opts: walk options

factor opts: move globalopts to a more logical place we will put other options at the same place

mq: raise util.Abort instead of using sys.exit(1)

mq: don't write applied patches into series twice in restore

mq: bail out if a patch appears more than once in the series file. Closes: #379.

mq: add --summary to qapplied, qunapplied, qtop, qnext and qprev This moves most of the queue display code into qseries.

Merge with crew

Documentation fixes for addremove. - It is no longer deprecated, but the short help still included (DEPRECATED). - Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.

hgk: fix mixup of --limit and REVRANGE in hgk call

gitweb: cosmetic fixes. Fix the padding around the changelog description. Alternate row colours for the changeset file list.

hgweb: yield filenode as well as node in annotate, use filenode in annotateline

hgweb: fix changeset link in annotate view.

shortuser should stop before the first space character. Examples: "Foo Bar <foo.bar AT example DOT com>" -> "foo.bar" (instead of "foo.bar AT example DOT com>" as it was before.) "Foo Bar" -> "Foo"

hgweb: make annotate line revisions point to annotation for that rev

hgweb: fix annotate bugs The parent and child links were broken.

hgweb: use filectx.annotate instead of filelog

Refactor annotate copy support.

merge with mainline

merge: move partial filtering out of manifest merge

merge: move findcopies after workingmanifest

findcopies: shortcut for empty working dir

do not disclose proxy user and password in debug messages

fix users of dirstate.copies broken by b1f10d3223c1

Merge with crew

findcopies: use dirstate rename information

dirstate: add copies function rename copies to copymap

Add core copy detection algorithm This adds findcopies, which detects merge-relevant copies between files in a pair of manifests back to the merge ancestor. While the merge code invokes the copy detection routine, it does not yet use the result.

context: change filectx repr to use @ Avoids confusion with rev:nodeid syntax used elsewhere

optimize revlog.lookup when passed hex(node)[:...] Instead of converting each node from the filenode to a hex form, convert the arg to a bin form. For a revlog with 26711 entries, doing 100 lookup: before: ~18s after : ~13s

cleanups in revlog.lookup - add comments - do a clean separation of the different cases - don't use a list of each possible node when doing the lookup, just keep the previous entry

context: add __repr__ methods

filectx: lazy linkrev usage

restore filectx.changectx() method

fix newline in error message

add comments in cachefunc

filectx.annotate: return filectx for each line instead of rev

Add cachefunc to abstract function call cache

Make filectx lazier - some users never use filenode

context: handle fileid or changeid == 0

merge with crew

mq: Add --rev argument to qimport, to adopt existing changesets.

manifest.py: remove unnecessary method

Switch revlog.ancestor to use revisions rather than nodeids

mpatch: Fix for malloc corner case on AIX

Merge with crew

Abstract ancestor algorithm into generic function Make depth calculation non-recursive Add simple shortcut for linear ancestry Convert context to use ancestor function make memoized parents function Convert revlog to use ancestor function

Merge with crew

filectx: add rename-aware ancestor algorithm This code works but may trigger recursion depth issues

changectx: add ancestor function

filectx: allow passing filelog in init to avoid opening new filelogs

filelog: make metadata method private

filectx: add rename traversal for parents()

tests: add new test; test-mq-qrefresh

qimport: rename patch to patchname to avoid shadowing module

Move defaultrev into changectx This also causes tag on a repository with no working directory to default to tip.

fix warnings spotted by pychecker

hgweb: fix errors spotted by pychecker

extdiff: use the default option only if the default program is used

Merge with mainline

merge: simplify actions with helper function

merge: simplify local created logic

merge: simplify prompt code

merge: simplify exec flag handling

merge: simplify tests for local changed/remote deleted

merge: more simplification of m2 manifest scanning

merge: reorder tests on m2 items in manifestmerge

merge: eliminate redundant security check duplicated in applyupdates

merge: eliminate confusing queued variable

merge: remove no longer possible clause

merge: move apply and dirstate code into separate functions

merge: remove linear variable

merge: simplify hook code

merge: linear_path -> linear

merge: pull manifest checks and updates into separate functions

merge: remove now unused umap dict

merge: pull manifest comparison out into separate function

Merge with mainline

merge: move set_exec to actions

merge: add forget to action list

merge: add codes to action list, eliminate None elements

merge: convert actions to list

Merge with backout

Back out trusted hgrc change for now Backed out changeset 494521a3f1425

Merge with crew

merge: fold umap and added into m1 manifest

merge: make unresolved a counter

merge: use context code to retrieve manifests