Helix SwarmHelix Swarm
Loading...

describe-du

  • //
  • guest/
  • john_kristian/
  • p4d2p/
  • test/
  • in/
  • describe-du #1
  • View
  • Commits
  • Open Download .zip Download (11 KB) 
  1. Change 117522 by jkristian@jkristian-home on 2003/11/11 00:46:57
  2.  
  3. 	Renamed UnixStyleFilter to UnixCommand.
  4. 	Improved.
  5.  
  6. Affected files ...
  7.  
  8. ... //users/jkristian/lib/UnixCommandResources.properties#1 branch
  9. ... //users/jkristian/lib/UnixStyleFilterResources.properties#2 delete
  10. ... //users/jkristian/lib/p4d2pResources.properties#3 edit
  11. ... //users/jkristian/src/UnixCommand.java#1 add
  12. ... //users/jkristian/src/UnixStyleFilter.java#3 delete
  13. ... //users/jkristian/src/p4d2p.java#3 edit
  14.  
  15. Differences ...
  16.  
  17. ==== //users/jkristian/lib/p4d2pResources.properties#3 (text) ====
  18.  
  19. @@ -46,3 +46,4 @@
  20.  \    John Kristian <jkristian@docent.com>. Thanks to Gurusamy Sarathy for\n\
  21.  \    inspiration; but I accept all blame.\n\
  22.  
  23. +diff.default: converting default diff (not recommended for `patch`)\n
  24.  
  25. ==== //users/jkristian/src/p4d2p.java#3 (text) ====
  26.  
  27. @@ -1,8 +1,5 @@
  28.  import java.io.File;
  29. -import java.io.BufferedReader;
  30. -import java.io.InputStreamReader;
  31.  import java.io.IOException;
  32. -import java.io.PushbackReader;
  33.  import java.io.Writer;
  34.  import java.text.DateFormat;
  35.  import java.text.SimpleDateFormat;
  36. @@ -17,51 +14,65 @@
  37.  public class p4d2p implements LineWriter {
  38.  
  39.      public static void main(String[] ARGV) throws IOException {
  40. -        UnixStyleFilter filter = new UnixStyleFilter(p4d2p.class, "hi::o:p:v", ARGV);
  41. +        UnixCommand command = new UnixCommand(p4d2p.class, "hi::o:p:v", ARGV);
  42.          try {
  43. -            Properties options = filter.getOptions();
  44. -            if (options.getProperty("h") != null) {
  45. -                filter.writeError(filter.getHelp());
  46. +            Properties options = command.getOptions();
  47. +            if (options.get("h") != null) {
  48. +                command.writeError(command.getHelp());
  49.              } else {
  50. -                filter.setEditInPlace(options.getProperty("i"));
  51. -                LineWriter self = new p4d2p(filter, filter.getOutputWriter());
  52. -                while (filter.getFile()) {
  53. -                    Copier.copyAll(filter.getInputLineReader(), self);
  54. +                command.setEditInPlace(options.getProperty("i"));
  55. +                LineWriter self = new p4d2p(command);
  56. +                while (command.getFile()) {
  57. +                    Copier.copyAll(command.getInputLineReader(), self);
  58.                      self.close();
  59.                  }
  60.              }
  61.          } finally {
  62. -            filter.flush();
  63. +            command.flush();
  64.          }
  65.      }
  66.  
  67. -    private String oldFile = null;
  68. -    private String oldNote;
  69. -    private String newFile;
  70. -    private String newNote;
  71. -    private List movedFiles = new ArrayList();
  72. +    protected p4d2p(UnixCommand command) throws IOException {
  73. +        this.command = command;
  74. +        this.options = command.getOptions();
  75. +        this.verbose = (options.get("v") != null);
  76. +        this.out = command.getOutputWriter();
  77. +    }
  78. +
  79. +    protected static DateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); // ISO 8601
  80. +    protected static String epoch = timeFormat.format(new Date(0));
  81. +
  82. +    protected String now = timeFormat.format(new Date());
  83. +    protected UnixCommand command;
  84. +    protected Properties options;
  85. +    protected boolean verbose;
  86. +    protected Writer out;
  87. +    protected Writer err;
  88.  
  89. -    private static final Pattern P4_DESCRIBE_MOVE   = Pattern.compile("^\\.\\.\\. (//.+?\\#\\d+ (add|branch|delete))$", Pattern.MULTILINE);
  90. -    private static final Pattern P4_MOVED_FILE      = Pattern.compile("//(.+?)(\\#\\d+) (\\w*)$", Pattern.MULTILINE);
  91. -    private static final Pattern P4_DESCRIBE_HEADER = Pattern.compile("^==== //(.+?)(\\#\\d+) .*?====( \\(.+\\))?$", Pattern.MULTILINE);
  92. -    private static final Pattern P4_DIFF_HEADER     = Pattern.compile("^==== //(.+?)(\\#\\d+) +- +(.+?) +====( \\(.+\\))?$", Pattern.MULTILINE);
  93. -    private static final Pattern P4_DIFF2_HEADER    = Pattern.compile("^==== //(.+?)(\\#\\d+) +\\(.+?\\) +- +(.+?)(\\#\\d+) +\\(.+?\\) +==== +\\w+$", Pattern.MULTILINE);
  94. +    protected String oldFile = null;
  95. +    protected String oldNote;
  96. +    protected String newFile;
  97. +    protected String newNote;
  98. +    protected List movedFiles = new ArrayList();
  99.  
  100. -    private static final Pattern VERSION = Pattern.compile("\\#(\\d+)");
  101. -    private static final Pattern UNIFIED_DIFF = Pattern.compile("^\\@\\@\\s.*\\s\\@\\@$", Pattern.MULTILINE);
  102. -    private static final Pattern CONTEXT_DIFF = Pattern.compile("^\\*+$", Pattern.MULTILINE);
  103. -    private static final Pattern DEFAULT_DIFF = Pattern.compile("^\\d+(,\\d+)?[acd]\\d+", Pattern.MULTILINE);
  104. +    protected static Pattern P4_DESCRIBE_MOVE   = Pattern.compile("^\\.\\.\\. (//.+?\\#\\d+ (add|branch|delete))$", Pattern.MULTILINE);
  105. +    protected static Pattern P4_MOVED_FILE      = Pattern.compile("//(.+?)(\\#\\d+) (\\w*)$", Pattern.MULTILINE);
  106. +    protected static Pattern P4_DESCRIBE_HEADER = Pattern.compile("^==== //(.+?)(\\#\\d+) .*?====( \\(.+\\))?$", Pattern.MULTILINE);
  107. +    protected static Pattern P4_DIFF_HEADER     = Pattern.compile("^==== //(.+?)(\\#\\d+) +- +(.+?) +====( \\(.+\\))?$", Pattern.MULTILINE);
  108. +    protected static Pattern P4_DIFF2_HEADER    = Pattern.compile("^==== //(.+?)(\\#\\d+) +\\(.+?\\) +- +(.+?)(\\#\\d+) +\\(.+?\\) +==== +\\w+$",
  109. +                                                                  Pattern.MULTILINE);
  110. +    protected static Pattern VERSION = Pattern.compile("\\#(\\d+)");
  111. +    protected static Pattern UNIFIED_DIFF = Pattern.compile("^\\@\\@\\s.*\\s\\@\\@$", Pattern.MULTILINE);
  112. +    protected static Pattern CONTEXT_DIFF = Pattern.compile("^\\*+$", Pattern.MULTILINE);
  113. +    protected static Pattern DEFAULT_DIFF = Pattern.compile("^\\d+(,\\d+)?[acd]\\d+", Pattern.MULTILINE);
  114.  
  115.      public void write(StringBuffer line) throws IOException {
  116. -        //if (verbose) out.write("// write(line)\n");
  117.          Matcher m;
  118.  
  119.          if ((m = P4_DESCRIBE_MOVE.matcher(line)).find()) { // add, branch or delete
  120. -            if (verbose) out.write("// p4 describe move\n");
  121.              movedFiles.add(m.group(1));
  122.  
  123.          } else if ((m = P4_DIFF_HEADER.matcher(line)).find()) {
  124. -            if (verbose) out.write("// p4 diff header\n");
  125.              oldFile = m.group(1);
  126.              newFile = m.group(3);
  127.              oldNote = " " + options.getProperty("o", m.group(2));
  128. @@ -69,14 +80,12 @@
  129.              newNote = " " + ((lastModified == 0) ? now : timeFormat.format(new Date(lastModified)));
  130.  
  131.          } else if ((m = P4_DIFF2_HEADER.matcher(line)).find()) {
  132. -            if (verbose) out.write("// p4 diff2 header\n");
  133.              oldFile = m.group(1);
  134.              newFile = m.group(3);
  135.              oldNote = " " + options.getProperty("o", m.group(2));
  136.              newNote = " " + m.group(4);
  137.  
  138.          } else if ((m = P4_DESCRIBE_HEADER.matcher(line)).find()) {
  139. -            if (verbose) out.write("// p4 describe header\n");
  140.              newFile = m.group(1);
  141.              newNote = " " + m.group(2);
  142.              oldFile = newFile;
  143. @@ -87,26 +96,25 @@
  144.          } else if (oldFile != null) {
  145.  
  146.              if ((m = UNIFIED_DIFF.matcher(line)).find()) { // the preferred format for `patch`
  147. -                if (verbose) System.err.println("emitting diff -u header");
  148.                  out.write("Index: //" + oldFile + "\n");
  149.                  out.write("--- " + oldFile + oldNote + "\n");
  150.                  out.write("+++ " + oldFile + newNote + "\n");
  151.                  oldFile = null;
  152.  
  153.              } else if ((m = CONTEXT_DIFF.matcher(line)).find()) {
  154. -                if (verbose) System.err.println("emitting diff -c header");
  155.                  out.write("Index: //" + oldFile + "\n");
  156.                  out.write("*** " + oldFile + oldNote + "\n");
  157.                  out.write("--- " + oldFile + newNote + "\n");
  158.                  oldFile = null;
  159.  
  160.              } else if ((m = DEFAULT_DIFF.matcher(line)).find()) {
  161. -                if (verbose) System.err.println("emitting diff header (not recommended for `patch`)");
  162. +                if (verbose) command.writeError(command.getResource("diff.default"));
  163.                  out.write("Index: " + oldFile + "\n");
  164.                  out.write("diff -r //" + oldFile + " " + newFile + "\n");
  165.                  oldFile = null;
  166.              }
  167.          }
  168. +
  169.          out.write(line.toString());
  170.      }
  171.  
  172. @@ -123,12 +131,10 @@
  173.                  newFile = m.group(1);
  174.                  newNote = m.group(2);
  175.                  verb = m.group(3);
  176. -                if (verbose) System.err.println(verb);
  177.                  oldFile = newFile;
  178. -                if (verb.equals("delete")) {
  179. -                    Matcher version = VERSION.matcher(newNote);
  180. -                    version.find();
  181. -                    oldNote = "#" + (Long.parseLong(version.group(1)) - 1);
  182. +                if ("delete".equals(verb)) {
  183. +                    (m = VERSION.matcher(newNote)).find();
  184. +                    oldNote = "#" + (Long.parseLong(m.group(1)) - 1);
  185.                      newNote = epoch;
  186.                      file = p4print("//" + oldFile + oldNote);
  187.                  } else { // add or branch
  188. @@ -144,7 +150,7 @@
  189.                      out.write("--- " + oldFile + oldNote + "\n");
  190.                      out.write("+++ " + newFile + newNote + "\n");
  191.                      String prefix;
  192. -                    if (verb.equals("delete")) {
  193. +                    if ("delete".equals(verb)) {
  194.                          out.write("@@ -1" + lines + " +0,0 @@\n");
  195.                          prefix = "-";
  196.                      } else { // add or branch
  197. @@ -165,7 +171,7 @@
  198.          oldFile = null;
  199.      }
  200.  
  201. -    private List p4print(String name) throws IOException {
  202. +    protected List p4print(String name) throws IOException {
  203.          CommandLine cmd = (new CommandLine(options.getProperty("p", "p4 print -q"))).append(name);
  204.          // Sadly, executing `p4 print` will consume some input.
  205.          // Which is one reason not to emit files immediately
  206. @@ -173,26 +179,9 @@
  207.          ProcessInputStream p = new ProcessInputStream(cmd.exec());
  208.          List file = (new LineReader(p)).readList();
  209.          if (p.exitValue() != 0) {
  210. -            System.err.println("exit " + p.exitValue() + " from " + cmd);
  211. +            command.writeError("exit " + p.exitValue() + " from " + cmd + "\n");
  212.          }
  213.          return file;
  214.      }
  215.  
  216. -    protected UnixStyleFilter filter;
  217. -    protected Properties options;
  218. -    protected boolean verbose;
  219. -    protected Writer out;
  220. -
  221. -    private p4d2p(UnixStyleFilter filter, Writer out) {
  222. -        this.filter = filter;
  223. -        this.options = filter.getOptions();
  224. -        this.verbose = (options.getProperty("v") != null);
  225. -        this.out = out;
  226. -    }
  227. -
  228. -    private static DateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); // ISO 8601
  229. -    private static final String epoch = timeFormat.format(new Date(0));
  230. -
  231. -    private String now = timeFormat.format(new Date());
  232. -
  233.  }
# Change User Description Committed
#1 5121 John Kristian corrected capitalization 20 years ago