Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 10:35:19 -0500] rev 2828
Merge: move most tests to the beginning
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:26:00 -0500] rev 2827
Merge: refactor err and failedmerge -> unresolved
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:19:20 -0500] rev 2826
Refactor update locking slightly
Matt Mackall <mpm@selenic.com> [Tue, 08 Aug 2006 09:11:16 -0500] rev 2825
Merge: combine choose and moddirstate to partial
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 23:53:04 -0500] rev 2824
Rename merge.allow -> merge.branchmerge
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 23:18:16 -0500] rev 2823
Use demandload @ syntax
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 22:54:33 -0500] rev 2822
Introduce update helper functions: update, merge, clean, and revert
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 22:35:36 -0500] rev 2821
Teach demandload how to import as
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 20:54:03 -0500] rev 2820
Factor doupdate into _lookup + hg.update
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 17:26:09 -0500] rev 2819
Fix extensions for merge change
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 09 Aug 2006 09:38:11 -0700] rev 2818
mq: make guards more strict, add tests
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 17:11:36 -0700] rev 2817
mq: drop qversion command
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 17:08:59 -0700] rev 2816
fetch: hold lock and wlock across all operations
Vadim Gelfer <vadim.gelfer@gmail.com> [Wed, 09 Aug 2006 02:04:49 -0700] rev 2815
tests: forgot to add test-mq-guards.out
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:40:08 -0700] rev 2814
fetch: lock repo across pull and commit
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:37:41 -0700] rev 2813
fetch: drop commands.doupdate
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:23:02 -0700] rev 2812
test-fetch: make output stable
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 16:09:26 -0700] rev 2811
fetch: fix breakage from mpm.
add test so will not break again.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 21:42:50 -0700] rev 2810
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.
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 18:14:03 -0700] rev 2809
fix permission of test-mq-qsave
Vadim Gelfer <vadim.gelfer@gmail.com> [Tue, 08 Aug 2006 18:12:48 -0700] rev 2808
mq: add join method
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:59:32 -0700] rev 2807
Make mq camelcase consistent with the rest of hg.
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:48:24 -0700] rev 2806
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:48:18 -0700] rev 2805
Update qsave to use StatusEntry; don't throw exception on bad status lines.
Brendan Cully <brendan@kublai.com> [Mon, 07 Aug 2006 14:12:03 -0700] rev 2804
Update mq to use new logmessage arglist from 2794:bd8a9a94139f
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 16:47:06 -0500] rev 2803
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 07 Aug 2006 16:27:09 -0500] rev 2802
Move repo.verify
Matt Mackall <mpm@selenic.com> [Thu, 03 Aug 2006 21:24:19 -0500] rev 2801
revlog.lookup optimization
Matt Mackall <mpm@selenic.com> [Thu, 03 Aug 2006 20:06:05 -0500] rev 2800
Remove **opts arg from commands.doupdate
Matt Mackall <mpm@selenic.com> [Thu, 03 Aug 2006 15:24:41 -0500] rev 2799
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
Matt Mackall <mpm@selenic.com> [Thu, 03 Aug 2006 13:07:57 -0500] rev 2798
Add a doc string
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 19:08:55 -0700] rev 2797
fetch: add missing import.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:33:14 -0700] rev 2796
fetch: do not fetch if working dir modified
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:27:38 -0700] rev 2795
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.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:23:04 -0700] rev 2794
commands.logmessage: simplify calling.
Vadim Gelfer <vadim.gelfer@gmail.com> [Mon, 07 Aug 2006 17:22:17 -0700] rev 2793
localrepo.update: allow to suppress commit reminder.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 17:27:05 +0200] rev 2792
mq: unused variables, improper usage of 'is [not]', undefined variable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 17:24:13 +0200] rev 2791
mq: codingstyle
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 17:20:51 +0200] rev 2790
mq: remove unecessary test
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 17:18:53 +0200] rev 2789
mq: fix variables shadowing builtin
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 16:42:36 +0200] rev 2788
util.patch: use shellquote
Brendan Cully <brendan@kublai.com> [Sat, 05 Aug 2006 14:59:47 -0700] rev 2787
mq: use more portable util.parse_patch_output instead of handrolled version.
Brendan Cully <brendan@kublai.com> [Sat, 05 Aug 2006 15:23:26 -0700] rev 2786
Add portable shell-quoting function; teach mq to use it.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 06 Aug 2006 16:03:02 +0200] rev 2785
mailbomb: add a comment and remove the bcc in a more pythonic way
Brendan Cully <brendan@kublai.com> [Fri, 04 Aug 2006 14:36:03 -0700] rev 2784
Add '.' as a shortcut revision name for the working directory parent.
Vadim Gelfer <vadim.gelfer@gmail.com> [Sat, 05 Aug 2006 02:00:09 -0700] rev 2783
make error better.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 04 Aug 2006 10:38:17 -0700] rev 2782
merge with self.
Vadim Gelfer <vadim.gelfer@gmail.com> [Fri, 04 Aug 2006 10:37:40 -0700] rev 2781
fix output of test-backout.