gitweb: Fixed manifest template opening an extra div tag

gitweb: Fix summary page ellipsis line colspans

Make "hg incoming -r revision_number" work for remote repos (issue566) Uses the remote repository's lookup method as pull does and only transfers what is needed to calculate incoming changesets. One minor problem: As only the needed changesets are transfered and stored in a local bundle repository, the tip tag of this bundle is shows despite not being the tip changeset of the remote repository. (see "+tag: tip" in tests/test-incoming-outgoing.out in this patch)

accept -r REV in more places Commands affected: * update * merge * backout

Merge with crew-stable.

use documented convert-repo interface

document conversion interface

Merge with crew-stable.

Make hg import --exact work when a new branch is created by an import.

Alter test to test import --exact to make sure it works with branches.

Add ability to parse branch information to hg import

Add a test for the Branch header being in hg export.

Fix issue 563: error in _hg_commit in the contrib/zsh_completion script.

Fix issue 562: .hgignore requires newline at end. End-of-lines characters where discarded without any check for existence.

Test issue 562: .hgignore requires newline at end

Fix hg import --exact bug that hangs hg on failure.

Make mergepatch save queue now that qpush isn't.

Add branch information to hg export.

Add ui.patch option. ui.patch overrides the default patch/gpatch command and options.

Fix issue483 - mq does not work under windows with gnu-win32 patch. Add --binary option to patch command under win32.

mercurial.el: fix error on hg-read-rev() with small tip, and cleanups * Fix error if tip revision is smaller than hg-rev-completion-limit If tip revision is 10, "hg log -r -100:tip" fails. * Remove dependencies on cl package at runtime Quote from GNU Emacs Lisp Reference Manual, Emacs Lisp Coding Conventions: > * Please don't require the `cl' package of Common Lisp extensions at > run time. Use of this package is optional, and it is not part of > the standard Emacs namespace. If your package loads `cl' at run > time, that could cause name clashes for users who don't use that > package. * Check XEmacs at compile time Since byte-compiled file is not portable between GNU Emacs and XEmacs, checking type of emacs can be done at compile time. This reduces byte-compiler warnings. * Defvar variables binded dynamically and used across functions * Combine status output string to state symbol alist into a variable, and use char instead of string for key of state alist * Make hg-view-mode as minor-mode * Define keymaps as conventions

mq: add qgoto command.

Fix typo in bugzilla extension.

Fix test-patchbomb for crew

mq.el: add mq-signoff, to sign off on a patch

mq.el: don't fill half the screen with a single line of output.

mq.el: add hook to run when finishing the edit of a patch.

imported patch mq-refresh-git.patch

mq.el: allow mq-diff to take a git option.

mq.el: add mq-diff function.

mq.el: add mq-edit-series function.

mq.el: add mq-new function.

Fix up patchbomb test

add test for patchbomb extension.

contrib/hgsh: Check for .hg/store as well as .hg/data. This is required by the new repository layout.

MQ: tidy up if a qpush is interrupted. This aborts the transaction, makes sure the dirtied dirstate isn't written out, and cleans up the working directory.

Merge with stable

merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.

branch.cache: silently ignore I/O and OS errors

context: fix workingfilectx._changectx

mercurial.el: don't raise an error from find-file-hook find-file() shouldn't fail even if unreadable .hg directory is exists. Not enabling hg-mode is sufficient for that senario.

mercurial.el: move defmacro of hg-do-across-repo before use Macros must be defined before use to be byte-compiled properly.

Unconfuse font-lock

Add fast-forward branch merging

Merge with crew-stable. HG: changed hgext/mq.py

simplemerge: flush stdout before writing to stderr. Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.

Move win32 find_in_files from util_win32 to util.

mq: fix qtop failure when the series ends with guarded patches.

Test qtop breaking when series ends with guarded patches.

Merge with stable

mq: account for readheaders munging in qrefresh

Merge with crew-stable

Update Windows build instructions.

merge: reorganize some hunks in findcopies

merge: simplify a check in checkcopies

merge: expand and simplify the invalid handling for directory moves

merge: fix a bug detecting directory moves When all the files in a directory are moved, it may be incorrectly marked as moved even if it contains subdirectories.

merge: clarify the findcopies code

verify: hold write lock Verify will report spurious errors if commits or pulls happen during verify.

Also restore old rm -A behavior for inexact patterns

Fix rm -A with no patterns, which I just broke.

Make rm --after simply mark files as removed, unless --force is also given

Add hgwebdir.fcgi to contrib

Flesh out bisect help text

Merge with crew

Fix minor mismerge. The caching of umask ended up being duplicated.

run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.

Add notes about configuring a merge program

Update copyright year and change to range

Use patch.patch() when checking for patch availability. The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.

Merge with crew

Fix find_in_path not including some file extension logic under win32. Windows shell resolves utility path by combining PATH, the utility name and a set of file extensions from PATHEXT.

Fix bad reference to RepoError in import command

Refactor commands.serve to allow other commands to run as services. This introduces a new function, cmdutil.service.

Merge with stable

Do not automatically rename an atomicfile if a write to it has generated an exception.

merge with stable

Make copy --after work for files that have been hg added.

When reloading the dirstate, recompute ignore information if needed.

dirstate: speed up write by 50%.

dirstate: make parents() faster. This allows localrepository.status() to avoid reading all but the first 40 bytes of the dirstate in the common case of running "hg status".

localrepository.status: only acquire wlock if actually needed. This speeds up the common case of not needing to update the dirstate, and avoids the need to reload and parse the dirstate "just in case".

util._matcher: speed up regexp matching. In 4babaa52badf, Benoit made a change that substantially slows matching when a big .hgignore file is in play, because it calls into the regexp matching engine potentially hundreds of times per file to be matched. I've partly rolled back his change, so that we only call into the matcher once per file, but preserved the ability to report a meaningful error message if there's a syntax error in the regexp.

Merge with crew-stable

Merge with crew-stable

Work around problem where 'del os.environ["FOO"]' doesn't update environment. test-hook failed since changeset 949516072388 because of this on Solaris 8.

Use python instead of shell printf with \x for test-simplemerge-cmd Needed e.g. to be compatible with Solaris.

Merge with crew.

change tests to use simplemerge by default

polish the simplemerge command; add a test

actually port simplemerge to hg - use bdiff instead of patiencediff; this is a larger change, since bdiff works on 2 multi-line strings, while patiencediff works on 2 lists; - rename the main class from Merge3 to Merge3Text and add a Merge3 class that derives from Merge3Text. This new Merge3 class has the same interface from the original class, so that the tests still work; - Merge3 uses util.binary to detect binary data and raises util.Abort instead of a specific exception; - don't use the @decorator syntax, to keep python2.3 compatibility; - the test uses unittest, which likes to print how long it took to run. This obviously doesn't play too well with hg's test suite, so we override time.time to fool unittest; - one test has a different (but still valid) output because of the different diff algorithm used; - the TestCase class used by bzr has some extras to help debugging. test-merge3.py used 2 of them: - log method to log some data - assertEqualDiff method to ease viewing diffs of diffs We add a dummy log method and use regular assertEquals instead of assertEqualDiff. - make simplemerge executable and add "#!/usr/bin/env python" header

Import 3-way merge code from bzr merge3.py is imported as contrib/simplemerge test_merge3.py is imported as tests/test-simplemerge.py

add mdiff.get_matching_blocks

Merge with crew-stable.

hg serve: don't do DNS lookups

Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize() - fix off by 11 when checking if there are more hunks (found by Maris Fogels) - bail out if start is greater than end - check if new hunk starts after start/end/len block of current hunk as the pointer can wrap around on very large values, reproducible with import mpatch; mpatch.patchedsize(12, 'x'*12)

Work around python 2.5.1 tarfile regression

Avoid float rounding errors when checking http protocol version.

Merge with stable

Merge with crew

test-command-template: improve test coverage

command line templates: add formatnode filter This will print a full hash node with --debug and a short one otherwise. Use it with some default templates and in map-cmdline.default to print the parents. This should fix issue538.

fix 'hg <not-log> -v --template foo' with revisions without copies

merge: fix quadratic behavior in find-copies

Merge with stable

hgweb: fix rfind bug in PATH_INFO handling

Merge with crew

Merge with stable

Merge with Matt

Add graphlog extension

Merge with crew-stable

Merge with crew

mq: fix qtop when some patches beneath are guarded

mq: test qtop with holes in the patch sequence.

hgweb: make PATH_INFO handling slightly more robust

Merge with crew

Merge with crew-stable

Merge with crew-stable.

Merge with stable

minor typo fix in templater's docstring

Add test for issue 529 - "mq aborts when merging patch deleting files".

mq: don't abort when merging a patch that removes files

atomicfile: don't copy the original file if it'll be truncated

use atomictemp files to write the dirstate

use atomictemp files to write branch.cache

util.opener: if requested, use atomicfile even if the file doesn't exist Right now, surprisingly enough, if you request an atomic file but the file still doesn't exist, you get a regular file. AFAICS, the only time this happens is during the initial creation of the dirstate.

cache os.umask even on windows

pull umask-checking up