Mercurial > jhg
annotate cmdline/org/tmatesoft/hg/console/ChangesetDumpHandler.java @ 373:dd492acd2431
Constants for well-known repository file names
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> | 
|---|---|
| date | Fri, 06 Jan 2012 01:12:35 +0300 | 
| parents | 2fadf8695f8a | 
| children | 9c9c442b5f2e d0e5dc3cae6e | 
| rev | line source | 
|---|---|
| 206 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 1 /* | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 2 * Copyright (c) 2011 TMate Software Ltd | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 3 * | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 4 * This program is free software; you can redistribute it and/or modify | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 5 * it under the terms of the GNU General Public License as published by | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 6 * the Free Software Foundation; version 2 of the License. | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 7 * | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 8 * This program is distributed in the hope that it will be useful, | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 11 * GNU General Public License for more details. | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 12 * | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 13 * For information on how to redistribute this software under | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 14 * the terms of a license other than GNU General Public License | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 15 * contact TMate Software at support@hg4j.com | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 16 */ | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 17 package org.tmatesoft.hg.console; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 18 | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 19 import java.util.Formatter; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 20 import java.util.LinkedList; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 21 import java.util.List; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 22 | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 23 import org.tmatesoft.hg.core.HgChangeset; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 24 import org.tmatesoft.hg.core.HgChangesetHandler; | 
| 319 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 25 import org.tmatesoft.hg.core.HgException; | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
211diff
changeset | 26 import org.tmatesoft.hg.core.HgFileRevision; | 
| 206 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 27 import org.tmatesoft.hg.core.Nodeid; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 28 import org.tmatesoft.hg.repo.HgRepository; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 29 import org.tmatesoft.hg.util.Path; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 30 | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 31 /** | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 32 * | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 33 * @author Artem Tikhomirov | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 34 * @author TMate Software Ltd. | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 35 */ | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 36 public class ChangesetDumpHandler implements HgChangesetHandler { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 37 // params | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 38 private boolean complete = false; // roughly --debug | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 39 private boolean reverseOrder = false; | 
| 208 
ef8eba4aa215
Correct index of revisions to be added into a repository
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
206diff
changeset | 40 private boolean verbose = false; // roughly -v | 
| 206 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 41 // own | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 42 private LinkedList<String> l = new LinkedList<String>(); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 43 private final HgRepository repo; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 44 private final int tip; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 45 | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 46 public ChangesetDumpHandler(HgRepository hgRepo) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 47 repo = hgRepo; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 48 tip = hgRepo.getChangelog().getLastRevision(); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 49 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 50 | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 51 public ChangesetDumpHandler complete(boolean b) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 52 complete = b; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 53 return this; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 54 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 55 | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 56 public ChangesetDumpHandler reversed(boolean b) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 57 reverseOrder = b; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 58 return this; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 59 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 60 | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 61 public ChangesetDumpHandler verbose(boolean b) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 62 verbose = b; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 63 return this; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 64 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 65 | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 66 public void next(HgChangeset changeset) { | 
| 319 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 67 try { | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 68 final String s = print(changeset); | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 69 if (reverseOrder) { | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 70 // XXX in fact, need to insert s into l according to changeset.getRevision() | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 71 // because when file history is being followed, revisions of the original file (with smaller revNumber) | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 72 // are reported *after* revisions of present file and with addFirst appear above them | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 73 l.addFirst(s); | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 74 } else { | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 75 System.out.print(s); | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 76 } | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 77 } catch (HgException ex) { | 
| 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 78 ex.printStackTrace(); | 
| 206 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 79 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 80 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 81 | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 82 public void done() { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 83 if (!reverseOrder) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 84 return; | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 85 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 86 for (String s : l) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 87 System.out.print(s); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 88 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 89 l.clear(); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 90 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 91 | 
| 319 
fa4aea41746e
Dump exception to console
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
274diff
changeset | 92 private String print(HgChangeset cset) throws HgException { | 
| 206 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 93 StringBuilder sb = new StringBuilder(); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 94 Formatter f = new Formatter(sb); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 95 final Nodeid csetNodeid = cset.getNodeid(); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 96 f.format("changeset: %d:%s\n", cset.getRevision(), complete ? csetNodeid : csetNodeid.shortNotation()); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 97 if (cset.getRevision() == tip || repo.getTags().isTagged(csetNodeid)) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 98 sb.append("tag: "); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 99 for (String t : repo.getTags().tags(csetNodeid)) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 100 sb.append(t); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 101 sb.append(' '); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 102 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 103 if (cset.getRevision() == tip) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 104 sb.append("tip"); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 105 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 106 sb.append('\n'); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 107 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 108 if (complete) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 109 Nodeid p1 = cset.getFirstParentRevision(); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 110 Nodeid p2 = cset.getSecondParentRevision(); | 
| 367 
2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
319diff
changeset | 111 int p1x = p1.isNull() ? -1 : repo.getChangelog().getRevisionIndex(p1); | 
| 
2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
319diff
changeset | 112 int p2x = p2.isNull() ? -1 : repo.getChangelog().getRevisionIndex(p2); | 
| 
2fadf8695f8a
Use 'revision index' instead of the vague 'local revision number' concept in the API
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
319diff
changeset | 113 int mx = repo.getManifest().getRevisionIndex(cset.getManifestRevision()); | 
| 206 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 114 f.format("parent: %d:%s\nparent: %d:%s\nmanifest: %d:%s\n", p1x, p1, p2x, p2, mx, cset.getManifestRevision()); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 115 } | 
| 211 
644ee58c9f16
Compound HgDate object to provide flexible access to change date/time information
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
208diff
changeset | 116 f.format("user: %s\ndate: %s\n", cset.getUser(), cset.getDate().toString()); | 
| 206 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 117 if (!complete && verbose) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 118 final List<Path> files = cset.getAffectedFiles(); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 119 sb.append("files: "); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 120 for (Path s : files) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 121 sb.append(' '); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 122 sb.append(s); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 123 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 124 sb.append('\n'); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 125 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 126 if (complete) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 127 if (!cset.getModifiedFiles().isEmpty()) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 128 sb.append("files: "); | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
211diff
changeset | 129 for (HgFileRevision s : cset.getModifiedFiles()) { | 
| 206 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 130 sb.append(' '); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 131 sb.append(s.getPath()); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 132 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 133 sb.append('\n'); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 134 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 135 if (!cset.getAddedFiles().isEmpty()) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 136 sb.append("files+: "); | 
| 231 
1792b37650f2
Introduced access to conflict resolution information (merge state)
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: 
211diff
changeset | 137 for (HgFileRevision s : cset.getAddedFiles()) { | 
| 206 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 138 sb.append(' '); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 139 sb.append(s.getPath()); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 140 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 141 sb.append('\n'); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 142 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 143 if (!cset.getRemovedFiles().isEmpty()) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 144 sb.append("files-: "); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 145 for (Path s : cset.getRemovedFiles()) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 146 sb.append(' '); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 147 sb.append(s); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 148 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 149 sb.append('\n'); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 150 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 151 // if (cset.extras() != null) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 152 // sb.append("extra: "); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 153 // for (Map.Entry<String, String> e : cset.extras().entrySet()) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 154 // sb.append(' '); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 155 // sb.append(e.getKey()); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 156 // sb.append('='); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 157 // sb.append(e.getValue()); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 158 // } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 159 // sb.append('\n'); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 160 // } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 161 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 162 if (complete || verbose) { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 163 f.format("description:\n%s\n\n", cset.getComment()); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 164 } else { | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 165 f.format("summary: %s\n\n", cset.getComment()); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 166 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 167 return sb.toString(); | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 168 } | 
| 
63c9fed4369e
Sample command line tools for incoming/outgoing to use commands
 Artem Tikhomirov <tikhomirov.artem@gmail.com> parents: diff
changeset | 169 } | 
