Mercurial > hg4j
annotate src/org/tmatesoft/hg/internal/DirstateBuilder.java @ 552:45751456b471
Annotate file changes through few revisions, walking either direction (old to new and vice versa)
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Wed, 20 Feb 2013 22:23:50 +0100 | 
| parents | 95bdcf75e71e | 
| children | bd5926e24aa3 | 
| rev | line source | 
|---|---|
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
1 /* | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
2 * Copyright (c) 2012-2013 TMate Software Ltd | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
3 * | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
4 * This program is free software; you can redistribute it and/or modify | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
5 * it under the terms of the GNU General Public License as published by | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
6 * the Free Software Foundation; version 2 of the License. | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
7 * | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
8 * This program is distributed in the hope that it will be useful, | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
11 * GNU General Public License for more details. | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
12 * | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
13 * For information on how to redistribute this software under | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
14 * the terms of a license other than GNU General Public License | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
15 * contact TMate Software at support@hg4j.com | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
16 */ | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
17 package org.tmatesoft.hg.internal; | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
18 | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
19 import java.io.File; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
20 import java.io.FileOutputStream; | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
21 import java.io.IOException; | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
22 import java.nio.ByteBuffer; | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
23 import java.nio.channels.FileChannel; | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
24 import java.nio.channels.WritableByteChannel; | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
25 import java.util.Map; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
26 import java.util.TreeMap; | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
27 | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
28 import org.tmatesoft.hg.core.HgIOException; | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
29 import org.tmatesoft.hg.core.Nodeid; | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
30 import org.tmatesoft.hg.repo.HgDirstate; | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
31 import org.tmatesoft.hg.repo.HgDirstate.EntryKind; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
32 import org.tmatesoft.hg.repo.HgDirstate.Record; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
33 import org.tmatesoft.hg.repo.HgInvalidStateException; | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
34 import org.tmatesoft.hg.repo.HgManifest.Flags; | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
35 import org.tmatesoft.hg.repo.HgRepositoryFiles; | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
36 import org.tmatesoft.hg.util.Path; | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
37 | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
38 /** | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
39 * Facility to build a dirstate file as described in {@linkplain http://mercurial.selenic.com/wiki/DirState} | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
40 * | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
41 * @see http://mercurial.selenic.com/wiki/DirState | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
42 * @see HgDirstate | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
43 * @author Artem Tikhomirov | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
44 * @author TMate Software Ltd. | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
45 */ | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
46 public class DirstateBuilder { | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
47 private Map<Path, HgDirstate.Record> normal = new TreeMap<Path, HgDirstate.Record>(); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
48 private Map<Path, HgDirstate.Record> added = new TreeMap<Path, HgDirstate.Record>(); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
49 private Map<Path, HgDirstate.Record> removed = new TreeMap<Path, HgDirstate.Record>(); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
50 private Map<Path, HgDirstate.Record> merged = new TreeMap<Path, HgDirstate.Record>(); | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
51 private Nodeid parent1, parent2; | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
52 private final Internals hgRepo; | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
53 private final EncodingHelper encodingHelper; | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
54 | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
55 public DirstateBuilder(Internals internalRepo) { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
56 hgRepo = internalRepo; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
57 encodingHelper = internalRepo.buildFileNameEncodingHelper(); | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
58 } | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
59 | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
60 public void parents(Nodeid p1, Nodeid p2) { | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
61 parent1 = p1 == null ? Nodeid.NULL : p1; | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
62 parent2 = p2 == null ? Nodeid.NULL : p2; | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
63 } | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
64 | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
65 public void recordNormal(Path fname, Flags flags, int bytesWritten) { | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
66 // Mercurial seems to write "n 0 -1 unset fname" on `hg --clean co -rev <earlier rev>` | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
67 // and the reason for 'force lookup' I suspect is a slight chance of simultaneous modification | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
68 // of the file by user that doesn't alter its size the very second dirstate is being written | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
69 // (or the file is being updated and the update brought in changes that didn't alter the file size - | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
70 // with size and timestamp set, later `hg status` won't notice these changes) | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
71 | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
72 // However, as long as we use this class to write clean copies of the files, we can put all the fields | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
73 // right away. | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
74 int fmode = flags == Flags.RegularFile ? 0666 : 0777; // FIXME actual unix flags | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
75 int mtime = (int) (System.currentTimeMillis() / 1000); | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
76 forget(fname); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
77 normal.put(fname, new HgDirstate.Record(fmode, bytesWritten, mtime, fname, null)); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
78 } | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
79 | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
80 public void recordUncertain(Path fname) { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
81 // `hg revert` puts "n 0 -1 unset" for the reverted file, so shall we | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
82 forget(fname); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
83 normal.put(fname, new HgDirstate.Record(0, -1, -1, fname, null)); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
84 } | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
85 | 
| 
529
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
86 public void recordAdded(Path fname, Flags flags, int size) { | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
87 forget(fname); | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
88 added.put(fname, new HgDirstate.Record(0, -1, -1, fname, null)); | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
89 } | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
90 | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
91 public void recordRemoved(Path fname) { | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
92 HgDirstate.Record r = forget(fname); | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
93 HgDirstate.Record n; | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
94 if (r == null) { | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
95 n = new HgDirstate.Record(0, -1, -1, fname, null); | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
96 } else { | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
97 n = new HgDirstate.Record(r.mode(), r.size(), r.modificationTime(), fname, r.copySource()); | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
98 } | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
99 removed.put(fname, n); | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
100 } | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
101 | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
102 private HgDirstate.Record forget(Path fname) { | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
103 HgDirstate.Record r; | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
104 if ((r = normal.remove(fname)) != null) { | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
105 return r; | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
106 } | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
107 if ((r = added.remove(fname)) != null) { | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
108 return r; | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
109 } | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
110 if ((r = removed.remove(fname)) != null) { | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
111 return r; | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
112 } | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
113 return merged.remove(fname); | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
114 } | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
115 | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
116 public void serialize(WritableByteChannel dest) throws IOException { | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
117 assert parent1 != null : "Parent(s) of the working directory shall be set first"; | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
118 ByteBuffer bb = ByteBuffer.allocate(256); | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
119 bb.put(parent1.toByteArray()); | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
120 bb.put(parent2.toByteArray()); | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
121 bb.flip(); | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
122 // header | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
123 int written = dest.write(bb); | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
124 if (written != bb.limit()) { | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
125 throw new IOException("Incomplete write"); | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
126 } | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
127 bb.clear(); | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
128 // entries | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
129 @SuppressWarnings("unchecked") | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
130 Map<Path, HgDirstate.Record>[] all = new Map[] {normal, added, removed, merged}; | 
| 
529
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
131 ByteBuffer recordTypes = ByteBuffer.allocate(4); | 
| 
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
132 recordTypes.put((byte) 'n').put((byte) 'a').put((byte) 'r').put((byte) 'm').flip(); | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
133 for (Map<Path, HgDirstate.Record> m : all) { | 
| 
529
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
134 final byte recordType = recordTypes.get(); | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
135 for (HgDirstate.Record r : m.values()) { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
136 // regular entry is 1+4+4+4+4+fname.length bytes | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
137 // it might get extended with copy origin, prepended with 0 byte | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
138 byte[] fname = encodingHelper.toDirstate(r.name()); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
139 byte[] copyOrigin = r.copySource() == null ? null : encodingHelper.toDirstate(r.copySource()); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
140 int length = fname.length + (copyOrigin == null ? 0 : (1 + copyOrigin.length)); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
141 bb = ensureCapacity(bb, 17 + length); | 
| 
529
 
95bdcf75e71e
Command to schedule addition/removal of repository files
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
526 
diff
changeset
 | 
142 bb.put(recordType); | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
143 bb.putInt(r.mode()); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
144 bb.putInt(r.size()); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
145 bb.putInt(r.modificationTime()); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
146 bb.putInt(length); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
147 bb.put(fname); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
148 if (copyOrigin != null) { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
149 bb.put((byte) 0); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
150 bb.put(copyOrigin); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
151 } | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
152 bb.flip(); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
153 written = dest.write(bb); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
154 if (written != bb.limit()) { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
155 throw new IOException("Incomplete write"); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
156 } | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
157 bb.clear(); | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
158 } | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
159 } | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
160 } | 
| 
526
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
161 | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
162 public void serialize() throws HgIOException { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
163 File dirstateFile = hgRepo.getRepositoryFile(HgRepositoryFiles.Dirstate); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
164 try { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
165 FileChannel dirstate = new FileOutputStream(dirstateFile).getChannel(); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
166 serialize(dirstate); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
167 dirstate.close(); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
168 } catch (IOException ex) { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
169 throw new HgIOException("Can't write down new directory state", ex, dirstateFile); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
170 } | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
171 } | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
172 | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
173 public void fillFrom(DirstateReader dirstate) { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
174 // TODO preserve order, if reasonable and possible | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
175 dirstate.readInto(new HgDirstate.Inspector() { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
176 | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
177 public boolean next(EntryKind kind, Record entry) { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
178 switch (kind) { | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
179 case Normal: normal.put(entry.name(), entry); break; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
180 case Added : added.put(entry.name(), entry); break; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
181 case Removed : removed.put(entry.name(), entry); break; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
182 case Merged : merged.put(entry.name(), entry); break; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
183 default: throw new HgInvalidStateException(String.format("Unexpected entry in the dirstate: %s", kind)); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
184 } | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
185 return true; | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
186 } | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
187 }); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
188 parents(dirstate.parents().first(), dirstate.parents().second()); | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
189 } | 
| 
 
2f9ed6bcefa2
Initial support for Revert command with accompanying minor refactoring
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents: 
525 
diff
changeset
 | 
190 | 
| 
525
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
191 | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
192 private static ByteBuffer ensureCapacity(ByteBuffer buf, int cap) { | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
193 if (buf.capacity() >= cap) { | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
194 return buf; | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
195 } | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
196 return ByteBuffer.allocate(cap); | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
197 } | 
| 
 
0be5be8d57e9
Repository checkout support, first iteration
 
Artem Tikhomirov <tikhomirov.artem@gmail.com> 
parents:  
diff
changeset
 | 
198 } | 
