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

Add ui.strict config item. This turns off command matching by unambiguous prefix, and is a good thing if you want to write future-proof scripts. This fixes issue 314.

Ignore .DS_Store directories These are used by Finder on OS X.

Allow for MB/sec transfer rates in test-http

patch queue: portability.notes

mq: fix bad interaction between demandload and update of commands.norepo problem was that commands.norepo was not updated properly.

revert: add -a as alias for --all

revert: require --all to revert all files.

fix typo in mail.py

fix incoming -p

dirstate.py: when comparing mtimes, use only the integer part. Python 2.5 can return timestamps with subsecond resolution.

localrepo.status: detect clean files even when the mtime has changed

Avoid Python 2.5 warning demandload.py:112: Warning: 'as' will become a reserved keyword in Python 2.6

extdiff: make new diff commands pick up their options correctly

addremove: add -s/--similarity option progress on issue 295.

fix comment.

merge.

addremove: do not deprecate. command is too useful to drop. is also best place to try autodetect of rename/copy by content similarity.

merge.

fix issue 322. do not allow to add files that shadow files or directories already in dirstate.

merge.

add missing import of errno

merge.

add other dir/file case to test for issue322.

Teach annotate to follow copies.

Add self to contributors

add test for issue 322. no .out file because issue is still live.