Vadim Gelfer
2eab8e108e
merge git patch code.
2006-08-12 12:47:18 -07:00
Vadim Gelfer
dc377b58c1
update copyrights.
2006-08-12 12:30:02 -07:00
Vadim Gelfer
d9b62ad587
merge.
2006-08-12 12:12:23 -07:00
Alexis S. L. Carvalho
219803f060
Fix some bugs introduced during the manifest refactoring
2006-08-12 08:53:23 -03:00
Alexis S. L. Carvalho
27e6e90b97
Fix "hg qnew -f foo" without -m
...
The refresh method assumes it has a string.
2006-08-12 09:24:04 -03:00
Vadim Gelfer
ea424c45c0
merge with mpm.
2006-08-12 11:53:12 -07:00
Brendan Cully
8ebc2ba929
Tests for git import
2006-08-11 16:56:31 -07:00
Brendan Cully
81f4208ee0
Remove debugging line
2006-08-11 16:55:48 -07:00
Brendan Cully
140c2e7776
Fix bad merge with crew
2006-08-11 16:30:24 -07:00
Vadim Gelfer
013660dbaa
refactor extension loading.
2006-08-11 16:12:14 -07:00
Brendan Cully
4f1b3a83bb
Move patch-related code into its own module.
2006-08-11 15:50:16 -07:00
Brendan Cully
7601c19932
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.
2006-08-11 15:50:07 -07:00
Vadim Gelfer
f878066622
import: get lock and wlock one time
...
this makes import of many patches 6x faster in kernel repo.
2006-08-11 14:50:41 -07:00
Matt Mackall
5c0d170547
Remove manifest.readflags
2006-08-11 11:00:38 -05:00
Matt Mackall
44b96c96eb
Change remaining users of manifest flags
2006-08-11 10:57:42 -05:00
Thomas Arendsen Hein
8d8bec1f32
Adjusted documentation for hgrc's "[smtp] host" for change in e579f762cc2a.
2006-08-11 09:11:54 +02:00
Matt Mackall
756da188ad
Switch to simpler manifestdict
2006-08-10 22:38:56 -05:00
Vadim Gelfer
c21702b07b
fix test output
2006-08-10 17:37:57 -07:00
Vadim Gelfer
a1eb2e0ec1
mq: only add mq attribute to local repo
2006-08-10 17:33:08 -07:00
Vadim Gelfer
cefae5007c
mq: apply patch is any posative guard matches
...
this is like guards command from quilt package.
2006-08-10 17:18:55 -07:00
Vadim Gelfer
bfa688e22b
fetch: fix test fail
2006-08-10 17:02:11 -07:00
Vadim Gelfer
375ed90afa
mq: do not allow to push from repo with patches applied
2006-08-10 16:10:59 -07:00
Vadim Gelfer
5a39b6dc91
call reposetup functions of extension modules whenever repo created
2006-08-10 15:44:05 -07:00
Vadim Gelfer
4bb52754b3
mq: test commit in repo with patches applied
2006-08-10 15:02:18 -07:00
Brendan Cully
00705b2507
Disallow commit over an applied mq patch.
2006-08-10 11:18:48 -07:00
Vadim Gelfer
65c989bccf
qselect: add --pop, --reapply options
2006-08-10 14:58:10 -07:00
Matt Mackall
c676e5167a
Merge: use single objects for tracking manifests
2006-08-09 22:07:13 -05:00
Matt Mackall
f048c758d8
Merge: save away mode bit so that we don't need manifest later
2006-08-09 17:11:01 -05:00
Matt Mackall
7c0506a4f5
Merge manifest refactor work
2006-08-09 15:03:46 -05:00
Matt Mackall
de8f408ebb
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.
2006-08-09 14:53:03 -05:00
Danek Duvall
9c364cbd6e
Fix some tests for portability.
2006-08-09 12:05:40 -07:00
Matt Mackall
76c5adea2f
Merge with crew, fix most tests
2006-08-09 13:55:18 -05:00
Vadim Gelfer
626fbfdeed
mq: make guards more strict, add tests
2006-08-09 09:38:11 -07:00
Vadim Gelfer
594d062505
mq: drop qversion command
2006-08-08 17:11:36 -07:00
Vadim Gelfer
b365694c04
fetch: hold lock and wlock across all operations
2006-08-08 17:08:59 -07:00
Vadim Gelfer
3a361df8d7
tests: forgot to add test-mq-guards.out
2006-08-09 02:04:49 -07:00
Vadim Gelfer
fa92533acd
fetch: lock repo across pull and commit
2006-08-08 16:40:08 -07:00
Vadim Gelfer
03412632fc
fetch: drop commands.doupdate
2006-08-08 16:37:41 -07:00
Vadim Gelfer
e946d15d30
test-fetch: make output stable
2006-08-08 16:23:02 -07:00
Vadim Gelfer
9b3aa8dfc1
fetch: fix breakage from mpm.
...
add test so will not break again.
2006-08-08 16:09:26 -07:00
Vadim Gelfer
3ea890331f
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.
2006-08-08 21:42:50 -07:00
Vadim Gelfer
f2173a1253
fix permission of test-mq-qsave
2006-08-08 18:14:03 -07:00
Vadim Gelfer
07b40a89d5
mq: add join method
2006-08-08 18:12:48 -07:00
Matt Mackall
55b6f733d9
Merge: combine force and forcemerge arguments
2006-08-08 10:56:48 -05:00
Matt Mackall
94db72708b
Merge: move most tests to the beginning
2006-08-08 10:35:19 -05:00
Matt Mackall
f8ef0497f7
Merge: refactor err and failedmerge -> unresolved
2006-08-08 09:26:00 -05:00
Matt Mackall
0b0ee1ba50
Refactor update locking slightly
2006-08-08 09:19:20 -05:00
Matt Mackall
60a6e68764
Merge: combine choose and moddirstate to partial
2006-08-08 09:11:16 -05:00
Matt Mackall
26928ff9de
Rename merge.allow -> merge.branchmerge
2006-08-07 23:53:04 -05:00
Matt Mackall
ba80b068a7
Use demandload @ syntax
2006-08-07 23:18:16 -05:00
