+/*
+ * rcsmerge operation
+ */
+#ifndef lint
+static char rcsid[]=
+"$Header: /usr/src/local/bin/rcs/src/RCS/rcsmerge.c,v 4.5 89/05/01 15:13:16 narten Exp $ Purdue CS";
+#endif
+/*****************************************************************************
+ * join 2 revisions with respect to a third
+ *****************************************************************************
+ */
+
+/* Copyright (C) 1982, 1988, 1989 Walter Tichy
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by Walter Tichy.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Report all problems and direct all questions to:
+ * rcs-bugs@cs.purdue.edu
+ *
+
+
+
+
+
+
+
+*/
+
+
+
+/* $Log: rcsmerge.c,v $
+ * Revision 4.5 89/05/01 15:13:16 narten
+ * changed copyright header to reflect current distribution rules
+ *
+ * Revision 4.4 88/11/08 12:00:47 narten
+ * changes from eggert@sm.unisys.com (Paul Eggert)
+ *
+ * Revision 4.4 88/08/09 19:13:13 eggert
+ * Beware merging into a readonly file.
+ * Beware merging a revision to itself (no change).
+ * Use execv(), not system(); yield exit status like diff(1)'s.
+ *
+ * Revision 4.3 87/10/18 10:38:02 narten
+ * Updating version numbers. Changes relative to version 1.1
+ * actually relative to 4.1
+ *
+ * Revision 1.3 87/09/24 14:00:31 narten
+ * Sources now pass through lint (if you ignore printf/sprintf/fprintf
+ * warnings)
+ *
+ * Revision 1.2 87/03/27 14:22:36 jenkins
+ * Port to suns
+ *
+ * Revision 1.1 84/01/23 14:50:36 kcs
+ * Initial revision
+ *
+ * Revision 4.1 83/03/28 11:14:57 wft
+ * Added handling of default branch.
+ *
+ * Revision 3.3 82/12/24 15:29:00 wft
+ * Added call to catchsig().
+ *
+ * Revision 3.2 82/12/10 21:32:02 wft
+ * Replaced getdelta() with gettree(); improved error messages.
+ *
+ * Revision 3.1 82/11/28 19:27:44 wft
+ * Initial revision.
+ *
+ */
+#include "rcsbase.h"
+#ifndef lint
+static char rcsbaseid[] = RCSBASE;
+#endif
+static char co[] = CO;
+static char merge[] = MERGE;
+
+extern int cleanup(); /* cleanup after signals */
+extern char * mktempfile(); /*temporary file name generator */
+extern struct hshentry * genrevs(); /*generate delta numbers */
+extern int nerror; /*counter for errors */
+
+char *RCSfilename;
+char *workfilename;
+char * temp1file, * temp2file;
+
+main (argc, argv)
+int argc; char **argv;
+{
+ char * cmdusage;
+ int revnums; /* counter for revision numbers given */
+ int tostdout;
+ int nochange;
+ char * rev1, * rev2; /*revision numbers*/
+ char commarg[revlength+3];
+ char numericrev[revlength]; /* holds expanded revision number */
+ struct hshentry * gendeltas[hshsize];/*stores deltas to be generated*/
+ struct hshentry * target;
+
+ catchints();
+ cmdid = "rcsmerge";
+ cmdusage = "command format:\n rcsmerge -p -rrev1 -rrev2 file\n rcsmerge -p -rrev1 file";
+ revnums=0;tostdout=false;nochange=false;
+
+ while (--argc,++argv, argc>=1 && ((*argv)[0] == '-')) {
+ switch ((*argv)[1]) {
+ case 'p':
+ tostdout=true;
+ /* falls into -r */
+ case 'r':
+ if ((*argv)[2]!='\0') {
+ if (revnums==0) {
+ rev1= *argv+2; revnums=1;
+ } elif (revnums==1) {
+ rev2= *argv+2; revnums=2;
+ } else {
+ faterror("too many revision numbers");
+ }
+ } /* do nothing for empty -r or -p */
+ break;
+
+ default:
+ faterror("unknown option: %s\n%s", *argv,cmdusage);
+ };
+ } /* end of option processing */
+
+ if (argc<1) faterror("No input file\n%s",cmdusage);
+ if (revnums<1) faterror("no base revision number given");
+
+ /* now handle all filenames */
+
+ if (pairfilenames(argc,argv,true,false)==1) {
+
+ if (argc>2 || (argc==2&&argv[1]!=nil))
+ warn("too many arguments");
+ diagnose("RCS file: %s",RCSfilename);
+ if (!(access(workfilename,tostdout?4:6)==0))
+ nowork();
+
+ if (!trysema(RCSfilename,false)) goto end; /* give up */
+
+ gettree(); /* reads in the delta tree */
+
+ if (Head==nil) faterror("no revisions present");
+
+
+ if (!expandsym(rev1,numericrev)) goto end;
+ if (!(target=genrevs(numericrev, (char *)nil, (char *)nil, (char *)nil,gendeltas))) goto end;
+ rev1=target->num;
+ if (revnums==1) /*get default for rev2 */
+ rev2=Dbranch!=nil?Dbranch->num:Head->num;
+ if (!expandsym(rev2,numericrev)) goto end;
+ if (!(target=genrevs(numericrev, (char *)nil, (char *)nil, (char *)nil,gendeltas))) goto end;
+ rev2=target->num;
+
+ if (strcmp(rev1,rev2) == 0) {
+ diagnose("Merging revision %s to itself (no change)",
+ rev1
+ );
+ nochange = true;
+ if (tostdout) {
+ FILE *w = fopen(workfilename,"r");
+ if (w==NULL)
+ nowork();
+ fastcopy(w,stdout);
+ }
+ goto end;
+ }
+
+ temp1file=mktempfile("/tmp/",TMPFILE1);
+ temp2file=mktempfile("/tmp/",TMPFILE2);
+
+ diagnose("retrieving revision %s",rev1);
+ VOID sprintf(commarg,"-p%s",rev1);
+ if (run((char*)nil,temp1file, co,"-q",commarg,RCSfilename,(char*)nil)){
+ faterror("co failed");
+ }
+ diagnose("retrieving revision %s",rev2);
+ VOID sprintf(commarg,"-p%s",rev2);
+ if (run((char*)nil,temp2file, co,"-q",commarg,RCSfilename,(char*)nil)){
+ faterror("co failed");
+ }
+ diagnose("Merging differences between %s and %s into %s%s",
+ rev1, rev2, workfilename,
+ tostdout?"; result to stdout":"");
+
+ if (
+ tostdout
+ ? run((char*)nil,(char*)nil,merge,"-p",workfilename,temp1file,temp2file,workfilename,rev2,(char*)nil)
+ : run((char*)nil,(char*)nil,merge, workfilename,temp1file,temp2file,workfilename,rev2,(char*)nil)) {
+ faterror("merge failed");
+ }
+ }
+
+end:
+ VOID cleanup();
+ exit(2*(nerror!=0) + nochange);
+
+}
+
+
+nowork()
+{
+ faterror("Can't open %s",workfilename);
+}
projects / unix-history / commitdiff