Mercurial > hg4j
comparison src/org/tmatesoft/hg/core/HgFileInformer.java @ 285:6dbbc53fc46d
Use Path instead of plain String for manifest file names
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Sat, 03 Sep 2011 21:46:13 +0200 |
parents | 9fb50c04f03c |
children | 981f9f50bb6c |
comparison
equal
deleted
inserted
replaced
284:7232b94f2ae3 | 285:6dbbc53fc46d |
---|---|
101 int csetRev = repo.getChangelog().getLocalRevision(cset); | 101 int csetRev = repo.getChangelog().getLocalRevision(cset); |
102 cachedManifest = new ManifestRevision(null, null); // XXX how about context and cached manifest revisions | 102 cachedManifest = new ManifestRevision(null, null); // XXX how about context and cached manifest revisions |
103 repo.getManifest().walk(csetRev, csetRev, cachedManifest); | 103 repo.getManifest().walk(csetRev, csetRev, cachedManifest); |
104 // cachedManifest shall be meaningful - changelog.getLocalRevision above ensures we've got version that exists. | 104 // cachedManifest shall be meaningful - changelog.getLocalRevision above ensures we've got version that exists. |
105 } | 105 } |
106 Nodeid toExtract = cachedManifest.nodeid(file.toString()); | 106 Nodeid toExtract = cachedManifest.nodeid(file); |
107 try { | 107 try { |
108 if (toExtract == null && followRenames) { | 108 if (toExtract == null && followRenames) { |
109 while (toExtract == null && dataFile.isCopy()) { | 109 while (toExtract == null && dataFile.isCopy()) { |
110 renamed = true; | 110 renamed = true; |
111 file = dataFile.getCopySourceName(); | 111 file = dataFile.getCopySourceName(); |
112 dataFile = repo.getFileNode(file); | 112 dataFile = repo.getFileNode(file); |
113 toExtract = cachedManifest.nodeid(file.toString()); | 113 toExtract = cachedManifest.nodeid(file); |
114 } | 114 } |
115 } | 115 } |
116 } catch (HgDataStreamException ex) { | 116 } catch (HgDataStreamException ex) { |
117 ex.printStackTrace(); // XXX log(INFO) | 117 ex.printStackTrace(); // XXX log(INFO) |
118 // ignore now, however if there's IStatus retval, might report error with reasonable explanation. | 118 // ignore now, however if there's IStatus retval, might report error with reasonable explanation. |