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