Mercurial > jhg
diff cmdline/org/tmatesoft/hg/console/Bundle.java @ 169:8c8e3f372fa1
Towards initial clone: refactor HgBundle to provide slightly higher-level structure of the bundle
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Wed, 23 Mar 2011 14:13:11 +0100 |
parents | a3a2e5deb320 |
children | f26ffe04ced0 |
line wrap: on
line diff
--- a/cmdline/org/tmatesoft/hg/console/Bundle.java Tue Mar 22 21:18:40 2011 +0100 +++ b/cmdline/org/tmatesoft/hg/console/Bundle.java Wed Mar 23 14:13:11 2011 +0100 @@ -18,8 +18,8 @@ import java.io.File; -import org.tmatesoft.hg.internal.DataAccessProvider; import org.tmatesoft.hg.repo.HgBundle; +import org.tmatesoft.hg.repo.HgLookup; import org.tmatesoft.hg.repo.HgRepository; @@ -30,7 +30,6 @@ * @author TMate Software Ltd. */ public class Bundle { - public static void main(String[] args) throws Exception { Options cmdLineOpts = Options.parse(args); HgRepository hgRepo = cmdLineOpts.findRepository(); @@ -38,10 +37,43 @@ System.err.printf("Can't find repository in: %s\n", hgRepo.getLocation()); return; } - File bundleFile = new File("/temp/hg/hg-bundle-a78c980749e3.tmp"); - DataAccessProvider dap = new DataAccessProvider(); - HgBundle hgBundle = new HgBundle(dap, bundleFile); + File bundleFile = new File("/temp/hg/hg-bundle-000000000000-gz.tmp"); + HgBundle hgBundle = new HgLookup().loadBundle(bundleFile); // hgBundle.dump(); + /* pass -R <path-to-repo-with-less-revisions-than-bundle>, e.g. for bundle with tip=168 and -R \temp\hg4j-50 with tip:159 + +Changeset {User: ..., Comment: Integer ....} + +Changeset {User: ..., Comment: Approach with ...} + -Changeset {User: ..., Comment: Correct project name...} + -Changeset {User: ..., Comment: Record possible...} + */ hgBundle.changes(hgRepo); } + +/* + * TODO EXPLAIN why DataAccess.java on merge from branch has P2 set, and P1 is NULL + * + * excerpt from dump('hg-bundle-00') output (node, p1, p2, cs): + src/org/tmatesoft/hg/internal/DataAccess.java + 186af94a2a7ddb34190e63ce556d0fa4dd24add2 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 6f1b88693d48422e98c3eaaa8428ffd4d4d98ca7; patches:1 + be8d0fdc4ff268bf5eb0a9120282ce6e63de1606 186af94a2a7ddb34190e63ce556d0fa4dd24add2 0000000000000000000000000000000000000000 a3a2e5deb320d7412ccbb59bdc44668d445bc4c4; patches:2 + 333d7bbd4a80a5d6fb4b44e54e39e290f50dc7f8 be8d0fdc4ff268bf5eb0a9120282ce6e63de1606 0000000000000000000000000000000000000000 e93101b97e4ab0a3f3402ec0e80b6e559237c7c8; patches:1 + 56e4523cb8b42630daf70511d73d29e0b375dfa5 0000000000000000000000000000000000000000 333d7bbd4a80a5d6fb4b44e54e39e290f50dc7f8 d5268ca7715b8d96204fc62abc632e8f55761547; patches:6 + f85b6d7ed3cc4b7c6f99444eb0a41b58793cc900 56e4523cb8b42630daf70511d73d29e0b375dfa5 0000000000000000000000000000000000000000 b413b16d10a50cc027f4c38e4df5a9fedd618a79; patches:4 + + RevlogDump for the file says: + Index Offset Flags Packed Actual Base Rev Link Rev Parent1 Parent2 nodeid + 0: 4295032832 0 1109 2465 0 74 -1 -1 186af94a2a7ddb34190e63ce556d0fa4dd24add2 + 1: 1109 0 70 2364 0 102 0 -1 be8d0fdc4ff268bf5eb0a9120282ce6e63de1606 + 2: 1179 0 63 2365 0 122 1 -1 333d7bbd4a80a5d6fb4b44e54e39e290f50dc7f8 + 3: 1242 0 801 3765 0 157 -1 2 56e4523cb8b42630daf70511d73d29e0b375dfa5 + 4: 2043 0 130 3658 0 158 3 -1 f85b6d7ed3cc4b7c6f99444eb0a41b58793cc900 + + Excerpt from changelog dump: + 155: 30541 0 155 195 155 155 154 -1 a4ec5e08701771b96057522188b16ed289e9e8fe + 156: 30696 0 154 186 155 156 155 -1 643ddec3be36246fc052cf22ece503fa60cafe22 + 157: 30850 0 478 1422 155 157 156 53 d5268ca7715b8d96204fc62abc632e8f55761547 + 158: 31328 0 247 665 155 158 157 -1 b413b16d10a50cc027f4c38e4df5a9fedd618a79 + + + */ }