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

Update [extdiff] configuration sample for vimdiff, taking acount cmd.xxx and opts.xxx configurations item.

Add support for diffstat in commit emails, and move diffstat from patchbomb to patch

cat: default to working dir parent instead of tip This introduces a defaultrev function that chooses the working dir parent if a revision isn't specified, and uses it in several places.

merge with brendan

hgk: add --limit, and revranges

hgk: add revision numbers

mq: handle patch names containing ":"

Move revision parsing into cmdutil.

Avoid negative block sizes in lazyparser. This fixes a bug introduced by changeset baa3873eb387 .

mq: add qdelete --forget option This removes an applied patch from the series and status files without popping it. It is useful when an mq patch has been applied upstream.

mq: do not update an empty working directory after strip. Closes #296.

mq: Add --git option to qrefresh

Add the -s option to `hg help qseries`.

sshrepo: don't try to validate when creating the repo - This removes the "repo not found" error when cloning or init-ing a remote repo. - Since the remote hg will abort if the repo already exists we don't need to validate it.

Make qrename handle directory targets; closes #333.

Fixed python2.3 incompatibility (rsplit) in qpush/qpop with index.

Added tests for qpush/qpop with index.

Fixed OSError "No such file or directory: None" and make IOError consistent. The None error occurs when the current working directory is no longer available, e.g. because it was removed in another shell.

If local repository is missing, make error message clearer. Faheem Mitha suggested finding a better error message. The nice error message is taken from cogito.

don't let lazyparser read more data than it can handle This should fix issue368.

document changelog format

merge with brendan

strip: strip changelog before manifest

extdiff: do not shell-quote options to new commands revert a change introduced by 453097750fbf

Include section name and parameter name (if available) in config errors. Added tests for this.

Never apply string formatting to generated errors with util.Abort. Otherwise error messages containing % chars yield errors or worse. Fixed (hopefully) all users of util.Abort.

hg merge: fix lookup of branch add some tests for branch usage

merge with crew

hgk.py: fix for a bug introduced in 32fd512ca7c0

allow shell-quoting in command defaults

hgk.py: use mercurial.patch functions when possible

git --diff: fix traceback when getting mode change - use the manifest instead of the mode in the working dir if the diff is against two revisions - add a testcase

hgk.py: use nullid instead of a constant

hgk.py: fix warnings from pychecker - unused variables - usage of undefined variables (opts and filterfiles)

hgk.py: add an optional file list to debug-diff-tree this solves a problem when hgk was trying to display merges diff

really treat the right side of acl.{allow,deny} as a list of users the current implementation seems to expect only user per pattern, which contradicts the documentation available at the file beginning.

merge crew with hg-churn

Fix for Python 2.3 compatibility. Note: Name of comparing function of sort() is "cmpfunc" in Python 2.3 and "cmp" in Python 2.4.

hgk: use short changeset hashes this fixes the missing tags on hgk window

merge with brendan

unlink temporary patch files even when an exception is raised

Remove temporary git patch files

Fix git patch application when cwd != repo.root

Detect git patches in patchbomb makepatch function

merge with hg-churn

[churn] Moved churn extension from hgext to contrib

[churn] Fix progress bar not incrementing when merge cset is encountered

[churn] progress meter

[churn] Ignore merge csets Merge changesets attributed a large number of lines to people that didn't actually develop it, but simply merged the code. By ignoring merges, we get a more accurate picture of how much code everyone changed.

[churn] repo.changes was renamed to repo.status

Merge with mpm

Merge with Brendan Cully

Add revision range support

[churn] Fixed churn ignoring the first commit

[churn] Trivial cleanup

[churn] Trivial cleanup suggested by Thomas

[churn] Cleanup suggestions from tonfa Use demandload Be smarter about the final list creation

Churn extension

add document on command defaults

do not enable verbose output if quiet is specified in the cmdline

clone: simplifying dest repo creation since creating a repo raises an exception if the repo already exists, there's no need to try to create one. add some test for repo creation when the destination exists

sshrepo: when creating a repo, raise an error if it already exists

localrepo: move the repo creation code, fail if the repo exists

sshrepo: flush stderr before connecting to the hg server

gitweb: add file links to filelog page

gitweb: add annotate links to changeset page

Merge with crew

Add --git support to hg email

Add --git to hg export

merge with brendan

Call patch.diff directly instead of printdiff - this also saves an extra walk of the working directory.

Remove dates from git export file lines - they confuse git-apply

Find the system's MD5 binary. Different binaries calculate MD5 checksums on different systems. Try a couple known programs and only calculate and verify the checksum if they exist. This should silence warnings on eg OpenBSD.

gitweb: fix annotate page display problem on IE (6.0) Bad support of "white-space: pre" property.

gitweb: fix file page display problem on IE (6.0) Bad support of "white-space: pre" property.

gitweb: fix issue 349

Document the fact that revert might overwrite .orig files

Add a hint for revert --all when aborting

fix incorrect warning when walking on a particular rev when a directory was given instead of a file it reported incorrectly 'No such file or directory in rev <rev>' we test if the file is a prefix directory

fix errors reported by pychecker mercurial/merge.py:174: No global (mode) found mercurial/merge.py:253: No global (errno) found

Fixed an exception in notify extension (b2a_hex argument incorrect) Detailed messages was - incoming.notify hook raised an exception: b2a_hex() argument 1 must be string or read-only character buffer, not stringio

minor docstring fix for revert

Allow for MB/sec transfer rates in test-http-proxy and test-ssh. Also make the test more specific in test-http.

load extensions only after the ui object has been completely initialized This fixes a traceback printed when hg tries to print another traceback after an extension fails to be loaded. Add a test for that.

Only read .hg/hgrc files from trusted users/groups The list of trusted users and groups is specified in the [trusted] section of a hgrc; the current user is always trusted; "*" can be used to trust all users/groups. Global hgrc files are always read. On Windows (and other systems that don't have the pwd and grp modules), all .hg/hgrc files are read.

Fix hgk extension due to 4ec58b157265 refactoring

merge.

merge: add remove to the action hash

merge: combine merge and get lists

merge: remove redundant if

merge: eliminate mw manifestdict, do everything with m1

merge: eliminate usage of m1 after working manifest creation

merge: simplify working dir manifest generation

merge: simplify some update logic

merge: hoist partial code out of manifest loops

merge: minor simplification

merge: rename mysterious variable

merge: add backwards variable

mq.el: Add comment to mq-edit-finish.

mq.el: add ability to edit a patch.

qheader: exit withh meaningful error code.

Emacs: add mq.el, early support for Mercurial Queues.

MQ: Make more commands return meaningful errors.

mercurial.el: deal with more vagaries of "hg status". If we run "hg status" on a file that does not exist, it prints an error message. Attempt to extract the name of the file.

qrefresh: exit with status 1 if no patches applied.

mercurial.el: add hg-cwd

mercurial.el: speed up mode line updates.

mercurial.el: add hg-status.

mercurial.el: use parents in modeline, not tip

mercurial.el: fix hg-chomp.

mercurial.el: fix calls to goto-char.

mercurial.el: get rid of unportable, unperformant use of replace-regexp.

merge.

Support the demandload syntax "@" in packagescan

merge.

Support foo@bar notation as demandload module spec.

Make test-strict append to $HGRCPATH, like other tests do since 61fcd9fac434.

Merge with tah

Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc and add documentation for this.

Clear contents of global hgrc for tests before running each test. This fixes running test-mq-qdiff after test-mq, because of changed settings.

tag: shorten hash in default commit message Move default message to commands.py Pass node in binary for consistency Remove default arguments Fix up tests

Only show long hashes with --debug, not --verbose

Demote a pull note to a debug message