# HG changeset patch # User Artem Tikhomirov # Date 1293064300 -3600 # Node ID a78c980749e3ccebb47138b547e9b644a22797a9 # Parent 286d221f6c28cbfce25ea314e1f46a23b7f979d3 Filename mangling according to requires options of the store (fncache incomplete for long names) diff -r 286d221f6c28 -r a78c980749e3 src/com/tmate/hgkit/console/Log.java --- a/src/com/tmate/hgkit/console/Log.java Wed Dec 22 04:00:44 2010 +0100 +++ b/src/com/tmate/hgkit/console/Log.java Thu Dec 23 01:31:40 2010 +0100 @@ -35,7 +35,7 @@ } else { for (String fname : cmdLineOpts.files) { HgDataFile f1 = hgRepo.getFileNode(fname); - System.out.println("History of the file: " + fname); + System.out.println("History of the file: " + f1.getPath()); f1.history(callback); } } diff -r 286d221f6c28 -r a78c980749e3 src/com/tmate/hgkit/ll/LocalHgRepo.java --- a/src/com/tmate/hgkit/ll/LocalHgRepo.java Wed Dec 22 04:00:44 2010 +0100 +++ b/src/com/tmate/hgkit/ll/LocalHgRepo.java Thu Dec 23 01:31:40 2010 +0100 @@ -3,17 +3,22 @@ */ package com.tmate.hgkit.ll; +import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStreamReader; import java.lang.ref.SoftReference; +import java.util.Arrays; import java.util.HashMap; +import java.util.TreeSet; /** * @author artem */ public class LocalHgRepo extends HgRepository { - private File repoDir; + private File repoDir; // .hg folder private final String repoLocation; public LocalHgRepo(String repositoryPath) { @@ -26,6 +31,7 @@ setInvalid(false); repoDir = repositoryRoot; repoLocation = repositoryRoot.getParentFile().getCanonicalPath(); + parseRequires(); } @Override @@ -57,19 +63,136 @@ @Override public HgDataFile getFileNode(String path) { String nPath = normalize(path); - String storagePath = toStoragePath(nPath); + String storagePath = toStoragePath(nPath, true); RevlogStream content = resolve(storagePath); // XXX no content when no file? or HgDataFile.exists() to detect that? How about files that were removed in previous releases? return new HgDataFile(this, nPath, content); } + + private boolean revlogv1; + private boolean store; + private boolean fncache; + private boolean dotencode; + + private void parseRequires() { + File requiresFile = new File(repoDir, "requires"); + if (!requiresFile.exists()) { + return; + } + try { + BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(requiresFile))); + String line; + while ((line = br.readLine()) != null) { + revlogv1 |= "revlogv1".equals(line); + store |= "store".equals(line); + fncache |= "fncache".equals(line); + dotencode |= "dotencode".equals(line); + } + } catch (IOException ex) { + ex.printStackTrace(); // FIXME log + } + } + // FIXME much more to be done, see store.py:_hybridencode - private static String toStoragePath(String path) { - // XXX works for lowercase names only - return "store/data/" + path.replace('\\', '/') + ".i"; + // @see http://mercurial.selenic.com/wiki/CaseFoldingPlan + protected String toStoragePath(String path, boolean data) { + path = normalize(path); + final String STR_STORE = "store/"; + final String STR_DATA = "data/"; + final String STR_DH = "dh/"; + if (!data) { + return this.store ? STR_STORE + path : path; + } + path = path.replace(".hg/", ".hg.hg/").replace(".i/", ".i.hg/").replace(".d/", ".d.hg/"); + StringBuilder sb = new StringBuilder(path.length() << 1); + if (store || fncache) { + // encodefilename + final String reservedChars = "\\:*?\"<>|"; + // in fact, \\ is unlikely to match, ever - we've replaced all of them already, above. Just regards to store.py + int x; + char[] hexByte = new char[2]; + for (int i = 0; i < path.length(); i++) { + final char ch = path.charAt(i); + if (ch >= 'a' && ch <= 'z') { + sb.append(ch); // POIRAE + } else if (ch >= 'A' && ch <= 'Z') { + sb.append('_'); + sb.append(Character.toLowerCase(ch)); // Perhaps, (char) (((int) ch) + 32)? Even better, |= 0x20? + } else if ( (x = reservedChars.indexOf(ch)) != -1) { + sb.append('~'); + sb.append(toHexByte(reservedChars.charAt(x), hexByte)); + } else if ((ch >= '~' /*126*/ && ch <= 255) || ch < ' ' /*32*/) { + sb.append('~'); + sb.append(toHexByte(ch, hexByte)); + } else if (ch == '_') { + // note, encoding from store.py:_buildencodefun and :_build_lower_encodefun + // differ in the way they process '_' (latter doesn't escape it) + sb.append('_'); + sb.append('_'); + } else { + sb.append(ch); + } + } + // auxencode + if (fncache) { + x = 0; // last segment start + final TreeSet windowsReservedFilenames = new TreeSet(); + windowsReservedFilenames.addAll(Arrays.asList("con prn aux nul com1 com2 com3 com4 com5 com6 com7 com8 com9 lpt1 lpt2 lpt3 lpt4 lpt5 lpt6 lpt7 lpt8 lpt9".split(" "))); + do { + int i = sb.indexOf("/", x); + if (i == -1) { + i = sb.length(); + } + // windows reserved filenames are at least of length 3 + if (i - x >= 3) { + boolean found = false; + if (i-x == 3) { + found = windowsReservedFilenames.contains(sb.subSequence(x, i)); + } else if (sb.charAt(x+3) == '.') { // implicit i-x > 3 + found = windowsReservedFilenames.contains(sb.subSequence(x, x+3)); + } else if (i-x > 4 && sb.charAt(x+4) == '.') { + found = windowsReservedFilenames.contains(sb.subSequence(x, x+4)); + } + if (found) { + sb.setCharAt(x, '~'); + sb.insert(x+1, toHexByte(sb.charAt(x+2), hexByte)); + i += 2; + } + } + if (dotencode && (sb.charAt(x) == '.' || sb.charAt(x) == ' ')) { + sb.insert(x+1, toHexByte(sb.charAt(x), hexByte)); + sb.setCharAt(x, '~'); // setChar *after* charAt/insert to get ~2e, not ~7e for '.' + i += 2; + } + x = i+1; + } while (x < sb.length()); + } + } + final int MAX_PATH_LEN_IN_HGSTORE = 120; + if (fncache && (sb.length() + STR_DATA.length() > MAX_PATH_LEN_IN_HGSTORE)) { + throw HgRepository.notImplemented(); // FIXME digest and fncache use + } + if (this.store) { + sb.insert(0, STR_STORE + STR_DATA); + } + sb.append(".i"); + return sb.toString(); + } + + private static char[] toHexByte(int ch, char[] buf) { + assert buf.length > 1; + final String hexDigits = "0123456789abcdef"; + buf[0] = hexDigits.charAt((ch & 0x00F0) >> 4); + buf[1] = hexDigits.charAt(ch & 0x0F); + return buf; } private static String normalize(String path) { - return path.replace('\\', '/'); + path = path.replace('\\', '/').replace("//", "/"); + if (path.startsWith("/")) { + path = path.substring(1); + } + return path; } }