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.

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

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.

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

Merge with crew

merge: minor simplification

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.

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.

Remove manifest.readflags

Change remaining users of manifest flags

Switch to simpler manifestdict

Merge: use single objects for tracking manifests

Merge: save away mode bit so that we don't need manifest later

Merge manifest refactor work

Combine manifest dict and flags dict into a single object This gets rid of the need to track two objects and might save memory. This might be faster implemented as a subclassed dict with auxiliary functions to access a sparse flags dict.

manifestflags: eliminate remaining users of direct dict access

Use strings for manifestflags to allow storing multiple flags

Start using manifestflags methods

Add manifestflags class

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

mq: only add mq attribute to local repo

mq: apply patch is any posative guard matches this is like guards command from quilt package.

fetch: fix test fail

mq: do not allow to push from repo with patches applied

call reposetup functions of extension modules whenever repo created

mq: test commit in repo with patches applied

Disallow commit over an applied mq patch.

qselect: add --pop, --reapply options

Fix some tests for portability.

Merge with crew, fix most tests

Merge: combine force and forcemerge arguments

Merge: move most tests to the beginning

Merge: refactor err and failedmerge -> unresolved

Refactor update locking slightly

Merge: combine choose and moddirstate to partial

Rename merge.allow -> merge.branchmerge

Use demandload @ syntax

Introduce update helper functions: update, merge, clean, and revert

Teach demandload how to import as

Factor doupdate into _lookup + hg.update

Fix extensions for merge change

mq: make guards more strict, add tests

mq: drop qversion command

fetch: hold lock and wlock across all operations

tests: forgot to add test-mq-guards.out

fetch: lock repo across pull and commit

fetch: drop commands.doupdate

test-fetch: make output stable

fetch: fix breakage from mpm. add test so will not break again.

mq: new commands qselect, qguard implement quilt-style guards for mq. guards allow to control whether patch can be pushed. if guard X is active and patch is guarded by +X (called "posative guard"), patch can be pushed. if patch is guarded by -X (called "nagative guard"), patch cannot be pushed and is skipped. use qguard to set/list guards on patches. use qselect to set/list active guards. also "qseries -v" prints guarded patches with "G" now.

fix permission of test-mq-qsave

mq: add join method

Make mq camelcase consistent with the rest of hg.

Add basic qsave/qrestore test.

Update qsave to use StatusEntry; don't throw exception on bad status lines.

Update mq to use new logmessage arglist from 2794:bd8a9a94139f

Merge with crew

Move repo.verify

revlog.lookup optimization

Remove **opts arg from commands.doupdate

Move merge code to its own module Pull update and merge3 out of localrepo into merge.py s/self/repo/ Add temporary API function in hg.py Convert all users

Add a doc string

fetch: add missing import.

fetch: do not fetch if working dir modified

new extension: fetch -> combine pull and merge/update pull changes from remote repo. if changes add new head: merge with new head, commit result. else: update working dir to new head. this makes useful command like git 'pull' command.

commands.logmessage: simplify calling.

localrepo.update: allow to suppress commit reminder.

mq: unused variables, improper usage of 'is [not]', undefined variable

mq: codingstyle

mq: remove unecessary test

mq: fix variables shadowing builtin

util.patch: use shellquote

mq: use more portable util.parse_patch_output instead of handrolled version.

Add portable shell-quoting function; teach mq to use it.

mailbomb: add a comment and remove the bcc in a more pythonic way

Add '.' as a shortcut revision name for the working directory parent.

make error better.

merge with self.

fix output of test-backout.

Test suite for log --follow and --follow-first.

Add log option --follow-first to follow only the first parent of merges. This can be useful to extract a single line of development.

Make log --follow revision range start default to working dir parent.

Make log --follow without a file list follow a single head. This includes all the parents or children (depending on the direction of the revision range).

merge with brendan.

Use StatusEntry class instead of repeated status line parsing. This small cleanup abstracts out repeated instances of (rev, name) = applied[x].split(':'), making it easier to use applied or change the status file format.

mq: make queue.unapplied useful as api

Import say a file is not tracked after patching : test case

mq: simplify save_dirty

Add -f option to qfold; improve qfold documentation.

Clean up qnew help text.

tests: fix output for test-backout

allow None for path of hg.repository

mq: rename read_series as parse_series, make simpler and faster

fix call to commands.setremoteconfig

mq: print matches if patch name not unique

clone: replace long help string of inaky with doc comment.

Breakup clone -r extra text help to fit in 80 columns

Expand clone help with hardlink information

fix hg backup option recommendation for auto-merge

import: make patch apply if run in subdir fix is same as for mq patch. patch apply code should be merged.

hgcommand.vim: requirements & doc self-install more consistent; cosmetics Check for availability of builtin system(). Set 'compatible' while sourcing script. File operation during doc self-install: Escape spaces in ex-commands. Use quotes in system calls. Incremented revision number(s). Size of patch is due to cosmetic cleanups: Removal of spaces at line endings. <SID>Prefix to functions when called.

fix mq test output.

merge patches from brendan cully that did not apply clean against tip.

Add -s option to qseries: display first line of patch header.

Check for parent/mod as well as parent.mod in findext. Debian/Ubuntu ship a system-wide hgrc that loads extensions using the syntax hgext/extension=, rather than hgext.extension=. Although the extensions work correctly, hg help <extension> doesn't understand this form without this patch.

Add more verbose help text to mq commands.

Add -m, -l, -e options to qfold.

Add -f option to qdelete, to remove patch file.

mq: add qmv as alias for qrename

New self-explanatory command qrename.

[darcs2hg] Windows compatibilty patct Originally submitted by Daiju Kito 1. single quote didn't work in several cases 2. os.unlink tries to delete tmpfile when it's called. It won't wait like unix.

New mq command qfold: Merge patches into the current patch. Patches should be in the series file but not yet applied.

Add command qheader to display the header of a given patch.

Add option -e/--edit to qrefresh, to edit the existing header.

Change patch header as well as commit message with qrefresh -m or -l.

Remove pointless reposetup hook from hgk.py

import: switch from application/x-patch to text/x-diff christian ebert says his mailer was broken.

mq: correct the use of super The first argument passed to super is supposed to be the class where it's being used, not self.__class__ - the two can be different when there's inheritance involved.

log: add -f/--follow option, to follow rename/copy

clean up hg.py: move repo constructor code into each repo module

merge with mpm.

Kill ui.setconfig_remoteopts This brought too much knowledge about command line particulars into the ui code. Moved to commands.py.

pull: allow to pull from bundle file without need for bundle: syntax

avoid calling (cd ...) with `nil' as a directory name When (hg-root) cannot determine the current Mercurial root, print an error message instead of trying to evaluate (cd nil).

fix output file format %r

hbisect.py: don't rely on __del__ to write the current state. This is yet another page of the "Thou shalt not do too much inside __del__ methods" book, in the "demandload and __del__ don't go well together" chapter. The bisect extension is broken in 0.9.1: $ hg bisect init $ hg bisect bad Fatal Python error: Interpreter not initialized (version mismatch?) Aborted (yes, I tripled checked my instalation to make sure the problem is not there) It's been broken since revision fe1689273f84 moved the import of the binascii module into a demandload. (In details: the first time that "hg bisect bad" (or good) is called, there are still no revisions saved in .hg/bisect/*, so bisect.__init__ doesn't call hg.bin on anything. So, when we reach __del__, the binascii module still hasn't been imported and we get that "nice" message above.)

hgcommand.vim: cleanup of doc self-install code

import: allow application/x-patch for funny patch from christian ebert

patchbomb: do not write Bcc

merge with crew.

mq: add basic tests

mq: allow to apply patches in subdir of repo again i broke it in 35caf437a201.

merge with tah

Add test mq keeping a reference to localrepo which can't remove journal on exit.

mq: update to handle repomap not longer used

mq: replace module-wide repo hash with a repo attribute

mq: do not hold a reference to repo in tags override Instead, replace repo's class object with a subclass.

patchbomb: fix generation of message-id when sending attachments node was set to bin(node) before message-id was created

merge with crew.

mq: add qclone command

hg.py: add islocal() and defaultdest() functions, refactor islocal tells if a repo or url is local. defaultdest returns default path for clone if explicit path not given. clone can now take repo or url as source

makes 'hg diff' diff the file in sorted order

merge with tonfa

reupdate the options after loading the repo local .hgrc could possibly override them, command line take priority

merge with upstream

Fix test permission

Fix test-mq-qnew-twice exit code and output.

mq: fix queue.apply to not call os.chdir() call to os.chdir broke "hg -R dirname qpush". instead pass -d (change directory) option to patch command.

mq: move many error messages to util.Abort

mq: do not allow to qnew a patch twice

run-tests.py: skip tests that should not run. print message when any test is skipped. count skipped tests.

make mq test more portable.

patchbomb: add content-disposition to make display inline and add filename if rev being emailed has tag that ends in .patch or .diff then use that as filename. else make up filename from name of repo.

patchbomb: optionally send patches as inline attachments

merge with crew.

make introductory message of patch series text/plain

run-tests.py: fix diff output when test-foo.out doesn't exist. Previously, if test-foo.out doesn't exist and test-foo outputs something, the first line of the diff will look like this: -+changeset: 0:0acdaf898367 (note the leading "-")

Allow tests that end in .py and .bat Revision 6ed46bad9530 disallowed tests that have a '.' in the name, but that also disallows tests that end in .py and .bat, even though run-tests.py has some code to special case them.

Merged backout head.

Backed out changeset 2ab464771b7d15c60014996d2853efc92cdb8465 - it always runs chmod - uses chmod in an unsafe way - if somebody does a clone of a repo, runs 'make tests', everything is fine, so he can assume the original repo is fine, too, but it is not.

mq: strip should not blow away local changes This changes the mq strip command to abort if there are any changes in the working directory.

mq: fix qnew and qimport to deal with series file comments qnew and qimport did not take comments into account when deciding where to place new patches in the series file.

mq: qpop should act like quilt pop qpop patchname would pop the named patch off the stack. This is slightly different from how quilt pop works. quilt pop pops everything up to the named patch.