merge with crew

fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff

Don't generate git diff header for empty diffs

Add base URL to hgwebdir templater (fixes index page when the URL does not have a trailing /)

NWI base URL detection fixes

make manifest-merging test reproduceable

Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:

merge with upstream

merge with upstream

fix localrepo.status when dealing with x-bit changes

extend test-flags

merge with upstream

merge with crew

bundle --base: use the right set for the base

fix bash completion of debug commands; add test for debugcomplete The debugconfig -> showconfig renaming broke things.

merge: pull user messages out to hg.py - add _update for shadowing in clone - add _showstats helper - remove update parameter defaults - move stats message and merge help messages

merge: update some docstrings

merge: various tidying update tests to handle corrected output and new workingctx display

context: change workingctx str() from . to <node>+

merge: use contexts in checkunknown and forgetremoved

merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests

context: add cmp for filectxs

merge: pull file copy/move out of filemerge

merge: unify merge and copy actions

merge: swap file and mode args for act()

merge: finish removing nodes from action list

hgweb: add file sizes to manifest browsing

hgweb: remove obsolete listfiles function

merge: eliminate nodes from action list - eliminate my and other from merge and copy - eliminate node from get - use mctx for get - fix bug flag = a[2:] - pass mctx to recordupdates - use new filectx.size in recordupdates

filectx: add size method

run-tests: add --first switch to exit on first error

run-tests: add --retest switch -r reruns tests for which a .err file exists

filemerge: use contexts rather than my and other

fix workingfilectx parents and ancestor functions

merge: pass contexts to applyupdates

merge: don't call hooks for revert - don't call hooks for revert - use extra variables to avoid swapping contexts

merge: use contexts for manifestmerge - take ma, backwards, and copy out of update - move findcopies call inside manifestmerge - pass repo rather than ui

commit: unify file-level commit code

Use filelog.cmp in checkfilemerge

merge: remember rename copies and parents properly on commit record copies in dirstate even if rename was remote this lets us record it properly at commit teach checkfilemerge about copies, including merge cases pull old copy code out of commit extend rename-merge1 test to show file index

[patchbomb] prepend leading zeros in the "[PATCH N of M]" string Without this patch, if one tries to send a patch bomb with more than 9 patches, the resulting subjects are not easily alphabetically sortable. For example: ... [PATCH 9 of 10] [PATCH 10 of 10] This patch prepends as many leading zeros as necessary. E.g., [PATCH 09 of 10] or [PATCH 009 of 100]

merged now fully working base85 codec, though currently unused.

merge with upstream

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

Add a base85 codec

Fix undetected change bug in rename tests

Update test output

Merge with crew

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 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

patchbomb: update --attach to use cmdutil.make_filename

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

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: reorder dirstate update slightly for correctness

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

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

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

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

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

do not disclose proxy user and password in debug messages

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.

merge: move partial filtering out of manifest merge

merge: move findcopies after workingmanifest

findcopies: shortcut for empty working dir

fix users of dirstate.copies broken by b1f10d3223c1

Merge with crew

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

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

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

tests: add new test; test-mq-qrefresh

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

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

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

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()

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

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.

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.

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.

merge: fold umap and added into m1 manifest

merge: make unresolved a counter

merge: use context code to retrieve manifests

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

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

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.

merge with self.

load extensions from every hgrc. before this change only extensions in global hgrc files were loaded. now extensions in per-repo hgrc are loaded.

refactor extension loading.

merge with brendan.

mq: fix appliedname

mq help text updates and speling fixes

Add qnew -e option.

allow qrefresh to take a list of files; closes #96.

Fix test-mq-qdiff; add -I and -X options to qdiff

Fix qfold after recent changes

sed portability fixes

Teach mq about git patches

Move import's working dir update code into patch.updatedir

Solaris portability fixes

Fix bug #345. The last hit for a file might have been before the last window, so we can't clear copies. To reduce the load, we only store real copy entries instead of storing hashes for every revision.

patchbomb: import new mail module

mail: fix connect

merge with tah

Fix hgweb's patch display in changeset view.

hgext: more patchbomb documentation + Add a description of how to enable this extension + Note which command it provides (it's not very easy to guess that "hgext.patchbomb" enables the "email" command, unless one can read Python sources) + Expand the descriptions of the -n and -m options of "hg email". + Mention that formail is (commonly) part of the procmail package.

make new tests executable.

tests: new test for the bisect extension

tests: new test for "hg annotate"

override previous merge with mpm. merge at ef8ee4477019 was bad.

redo merge with mpm. previous merge at ef8ee4477019 was bad.

merge with mpm.

Unify mq and hg patch invocation. This makes patch a little less verbose by default, so the tests had to be updated.

merge.

make test-mq-qdiff executable.

tests: new test for mq qdiff command `hg qdiff .' is supposed to work but it is currently broken. This test should help us verify when it gets fixed.

merge with other head by default, not tip. fixes issue 339.

merge with mpm.

Tune a bit the extdiff toplevel comments/samples. * Capitalize the first letter of all sentences * Add an example for GNU diff(1) 'context diff' mode. * Explain the requirement for separate cmd.xxx and opts.xxx options in .hgrc, which hopefully will guard against users trying to add: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff -Nprc5 which fails for recent crew builds with: $ hg cdiff . making snapshot of 1 files from rev 07dc4a569f4e making snapshot of 1 files from working dir diff -Nprc5: not found The correct way to do this is by separating the cmd.cdiff and opts.cdiff parts like this: [extdiff] # Add a new Mercurial command called `cdiff', which calls # GNU diff(1) in 'context diff' mode. cmd.cdiff = diff opts.cdiff = -Nprc5 so add it as a new example and explicitly describe it in the extdiff comments.

Fixed test-extdiff. diff-like tools usually return 1 if differences are found. Currently the extdiff returns 256, but that's a different topic (consolidating return code handling in hg).

A fix for --prune.

Adjusted test to changed help output.

merge with jeffpc

Use demandload in hgk

Add diff --git option

extdiff: fix bugs. add test.

Allow qdel to delete multiple patches.

Replace qdel/qfold -f option with -k/--keep.

Properly shell-quote arguments in extdiff

Update extdiff for recent refactoring

Test for log --prune.

hgweb: partially revert 4ec58b157265 The change from self.repo.ui.diffopts() to ui.diffopts() causes a traceback when the diff of a changeset should be displayed in the web interface. Revert to self.repo.ui.diffopts() for now.

merge: consolidate dirstate updates

merge: use file size stored in revlog index Add size method to filelog to handle nodes with renames

merge: move forgets to the apply stage

trivial bool() cleanup

filelog.cmp: return 0 for equality spotted by Alexis Carvalho

merge: hoist some working manifest logic out of merge loop

merge: working manifest new/changed To remove dependence on m1 during manifest comparison, we distinguish between new and changed states in mw.

merge: factor out exec bit merge function

Use revlog hash comparison technique in merge

Move cmp bits from filelog to revlog

Move ui.sendmail to mail.connect/sendmail

Move ui.diffopts to patch.diffopts where it belongs

filelog: add hash-based comparisons For status, rather than reconstruct full file versions from revlog for comparison, compare hashes.

Merge with crew

cmdutil.matchpats: allow include/exclude to be optional.

add default values to arguments of walk etc.

move commands.addremove_lock to cmdutil.addremove

move walk and matchpats from commands to cmdutil.

fix patch.patch.filterfiles. now test-diff-subdir passes.

make test-diff-subdir executable.

tests: new test for hg diff of a subdirectory only

Make clear that hg pull -r REV pulls "up to" a revision. The existing message was a bit confusing, making the reader believe that only the specific revision is pulled.

Use cached hg-root-dir instead of rediscovering by a second call to (hg-root). We have the path we need already as the value of hg-root-dir.

hgweb: repo.changes() is now called repo.status()

remove localrepository.changes. use localrepository.status instead.

refactor text diff/patch code. rename commands.dodiff to patch.diff. rename commands.doexport to patch.export. move some functions from commands to new mercurial.cmdutil module. turn list of diff options into mdiff.diffopts class. patch.diff and patch.export now has clean api for call from 3rd party python code.

merge.

manifest.execf is now a function.

merge.

grep: add --follow support.

grep: display correct user/revision for --all in reverse. Also handle multiple occurrences of the same line by storing linestates in an array instead of a dict, and using difflib to compute the difference between linestates.

util: qualify name properly.

mq: demandload more

commands.import: refactor patch parsing into patch.extract.

merge git patch code.

Tests for git import

Remove debugging line

Fix bad merge with crew

Move patch-related code into its own module.

Teach import to understand git diff extensions. Vanilla patch chokes on git patches that include files that are copied or renamed, then modified. So this code detects that case and rewrites the patch if necessary.

update copyrights.

merge.

Fix some bugs introduced during the manifest refactoring

Fix "hg qnew -f foo" without -m The refresh method assumes it has a string.

merge with mpm.

import: get lock and wlock one time this makes import of many patches 6x faster in kernel repo.

Adjusted documentation for hgrc's "[smtp] host" for change in 9f745d3675d4.

fix test output