Mercurial > hg > mercurial-crew-with-dirclash
annotate comparison.txt @ 460:6409d9a0df43
add dirstate debugging commands
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
add dirstate debugging commands
As I've played with various different merges and more recently
rawcommit, I've found the following patch to be very very helpful in
figuring out whether the dirstate is being left in a consistent or
inconsistent state with respect to the current manifest.
I attempted to deduce the invariants that were assumed by the current
code, and then check it in this code.
I may or may not have captured the design intent in this check; if not,
I'd be very happy to hear more clearly what was intended, so that I can
write tests to that expectation.
Anyway, here's the patch. Not sure if it's a good idea to commit it to
the mainline, or just leave it as a debugging aid. I attempted to
package it so that it doesn't interfere with normal usage.
Michael Fetterman
(tweaked by mpm: remove -d magic)
manifest hash: 869f5b5f954dc0f46ba27322359e811d5e21d71c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCvP77ywK+sNU5EO8RArmtAKCCVuI2slANzWZ26P5edtH/ixdwNwCfZLWl
5P+V+C92II3usO4YW2MULKY=
=/Pv4
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 24 Jun 2005 22:51:39 -0800 |
parents | 17e66e1a0382 |
children | 2073e5a71008 |
rev | line source |
---|---|
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
1 Mercurial git BK (*) |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
2 storage revlog delta compressed revisions SCCS weave |
139 | 3 storage naming by filename by revision hash by filename |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
4 merge file DAGs changeset DAG file DAGs? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
5 consistency SHA1 SHA1 CRC |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
6 signable? yes yes no |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
7 |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
8 retrieve file tip O(1) O(1) O(revs) |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
9 add rev O(1) O(1) O(revs) |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
10 find prev file rev O(1) O(changesets) O(revs) |
139 | 11 annotate file O(revs) O(changesets) O(revs) |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
12 find file changeset O(1) O(changesets) ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
13 |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
14 checkout O(files) O(files) O(revs)? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
15 commit O(changes) O(changes) ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
16 6 patches/s 6 patches/s slow |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
17 diff working dir O(changes) O(changes) ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
18 < 1s < 1s ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
19 tree diff revs O(changes) O(changes) ? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
20 < 1s < 1s ? |
139 | 21 hardlink clone O(files) O(revisions) O(files) |
22 | |
23 find remote csets O(log new) rsync: O(revisions) ? | |
24 git-http: O(changesets) | |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
25 pull remote csets O(patch) O(modified files) O(patch) |
139 | 26 |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
27 repo growth O(patch) O(revisions) O(patch) |
139 | 28 kernel history 300M 3.5G? 250M? |
58
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
29 lines of code 2500 6500 (+ cogito) ?? |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
30 |
2ab801e0ea9f
A quick set of comparisons between hg, git, and bk
mpm@selenic.com
parents:
diff
changeset
|
31 * I've never used BK so this is just guesses |