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