OpenBSD CVS

CVS log for src/usr.bin/cvs/diff3.c


[BACK] Up to [local] / src / usr.bin / cvs

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.65 / (download) - annotate - [select for diffs], Tue Apr 13 14:20:23 2021 UTC (3 years, 1 month ago) by stsp
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1, OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, HEAD
Changes since 1.64: +3 -1 lines
Diff to previous 1.64 (colored)

Fix merging of files that lack a final \n at EOF after a block of common lines.

Problem reported by Josh Rickmar.
ok millert@

Revision 1.64 / (download) - annotate - [select for diffs], Fri Jun 26 07:28:47 2020 UTC (3 years, 10 months ago) by stsp
Branch: MAIN
CVS Tags: OPENBSD_6_8_BASE, OPENBSD_6_8
Changes since 1.63: +9 -2 lines
Diff to previous 1.63 (colored)

Fix merging of files that lack newlines for diff(3), OpenRCS, and OpenCVS.

Merges with a file that lacks newlines (\n) were triggering a fatal error.
This could be easily reproduced with merge(1) and diff3(1):
$ echo foo > foo
$ echo bar > bar
$ echo -n baz > baz
$ merge -p foo bar baz
merge: failed to merge
$ diff3 -E foo bar baz
1a
=======
diff3prog: logic error
$

Fix this by properly handling short reads from the third file argument.
Only the third file argument triggered the problem. The other input
files were already handled correctly.

ok millert@

Revision 1.63 / (download) - annotate - [select for diffs], Fri Jun 28 13:35:00 2019 UTC (4 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.62: +4 -4 lines
Diff to previous 1.62 (colored)

When system calls indicate an error they return -1, not some arbitrary
value < 0.  errno is only updated in this case.  Change all (most?)
callers of syscalls to follow this better, and let's see if this strictness
helps us in the future.

Revision 1.62 / (download) - annotate - [select for diffs], Tue Oct 18 21:06:52 2016 UTC (7 years, 7 months ago) by millert
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.61: +7 -2 lines
Diff to previous 1.61 (colored)

Using bitwise OR along with two assignments in the conditional of
a while() loop is a trap for the unwary programmer (albeit a clever
trap).  Break this up into two separate assignments and using boolean
OR for clarity.  OK otto@

Revision 1.61 / (download) - annotate - [select for diffs], Sun Oct 16 13:03:40 2016 UTC (7 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.60: +2 -2 lines
Diff to previous 1.60 (colored)

Remove useless n=n assignment in the first parse of a for().
It was already removed from the rcs version by nicm@.

Revision 1.60 / (download) - annotate - [select for diffs], Sat Oct 15 22:20:17 2016 UTC (7 years, 7 months ago) by millert
Branch: MAIN
Changes since 1.59: +4 -3 lines
Diff to previous 1.59 (colored)

Quiet compiler warnings.  OK tomc@ tb@

Revision 1.59 / (download) - annotate - [select for diffs], Thu Nov 5 09:48:21 2015 UTC (8 years, 6 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.58: +13 -19 lines
Diff to previous 1.58 (colored)

Remove xfree(), like already done for RCS. From Michael W Bombardieri,
ok mmcc

Revision 1.58 / (download) - annotate - [select for diffs], Sat Sep 5 09:47:08 2015 UTC (8 years, 8 months ago) by jsg
Branch: MAIN
Changes since 1.57: +2 -2 lines
Diff to previous 1.57 (colored)

Add brackets to clarify assignments that are the result of a test operator.

ok deraadt@ looks correct millert@ jung@

Revision 1.57 / (download) - annotate - [select for diffs], Fri Jan 16 06:40:07 2015 UTC (9 years, 4 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.56: +2 -2 lines
Diff to previous 1.56 (colored)

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible.  Annotate <sys/param.h> lines with their current reasons.  Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc.  Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution.  These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Revision 1.56 / (download) - annotate - [select for diffs], Mon Dec 1 21:58:46 2014 UTC (9 years, 5 months ago) by deraadt
Branch: MAIN
Changes since 1.55: +6 -6 lines
Diff to previous 1.55 (colored)

An internal function called xrealloc() is actually a fail-hard
reallocarray()... so rename it.

Revision 1.55 / (download) - annotate - [select for diffs], Sun Mar 4 04:05:15 2012 UTC (12 years, 2 months ago) by fgsch
Branch: MAIN
CVS Tags: OPENBSD_5_6_BASE, OPENBSD_5_6, OPENBSD_5_5_BASE, OPENBSD_5_5, OPENBSD_5_4_BASE, OPENBSD_5_4, OPENBSD_5_3_BASE, OPENBSD_5_3, OPENBSD_5_2_BASE, OPENBSD_5_2
Changes since 1.54: +5 -5 lines
Diff to previous 1.54 (colored)

In preparation for getline and getdelim additions to libc, rename getline()
occurrences to get_line().
Based on a diff from Jan Klemkow <j-dot-klemkow-at-wemelug-dot-de> to tech.

Revision 1.54 / (download) - annotate - [select for diffs], Fri Oct 29 17:49:37 2010 UTC (13 years, 6 months ago) by nicm
Branch: MAIN
CVS Tags: OPENBSD_5_1_BASE, OPENBSD_5_1, OPENBSD_5_0_BASE, OPENBSD_5_0, OPENBSD_4_9_BASE, OPENBSD_4_9
Changes since 1.53: +3 -3 lines
Diff to previous 1.53 (colored)

Nuke some unused variables and remove an unnecessary call to dirname().

From Michael W Bombardieri via ray@.

Revision 1.53 / (download) - annotate - [select for diffs], Fri Jul 23 21:46:05 2010 UTC (13 years, 9 months ago) by ray
Branch: MAIN
CVS Tags: OPENBSD_4_8_BASE, OPENBSD_4_8
Changes since 1.52: +23 -24 lines
Diff to previous 1.52 (colored)

Reduce variable/function name and whitespace differences between
cvs/rcs.

OK xsa zinovik

Revision 1.52 / (download) - annotate - [select for diffs], Fri Jul 23 08:31:19 2010 UTC (13 years, 9 months ago) by ray
Branch: MAIN
Changes since 1.51: +4 -4 lines
Diff to previous 1.51 (colored)

Rename a bunch of variables and functions, removing the cvs_/rcs_
prefixes to reduce differences between cvs and rcs files.

"yes!" nicm

Revision 1.51 / (download) - annotate - [select for diffs], Tue Oct 27 23:59:37 2009 UTC (14 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_4_7_BASE, OPENBSD_4_7
Changes since 1.50: +1 -12 lines
Diff to previous 1.50 (colored)

rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable).  these days, people use source.  these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

Revision 1.50 / (download) - annotate - [select for diffs], Sun Jun 7 08:39:13 2009 UTC (14 years, 11 months ago) by ray
Branch: MAIN
CVS Tags: OPENBSD_4_6_BASE, OPENBSD_4_6
Changes since 1.49: +4 -4 lines
Diff to previous 1.49 (colored)

More cvs/diff/rcs convergence:
1. Mostly variable/function renaming, SIZE_T_MAX->SIZE_MAX, and
spacing.
2. One strchr -> strncspn.
3. diff had a weird thing where it set file[12] = ofile[12] but
never updated file or ofile, then if file and ofile were different
it freed it. I removed it.

OK millert

Revision 1.49 / (download) - annotate - [select for diffs], Sat Jun 6 14:17:27 2009 UTC (14 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.48: +4 -4 lines
Diff to previous 1.48 (colored)

Sync some rcsdiff changes to cvsdiff.  As a side effect,
cvs diff -t now works.  There should be no functional change
otherwise.

OK millert

Revision 1.48 / (download) - annotate - [select for diffs], Sun Mar 9 01:52:55 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
CVS Tags: OPENBSD_4_5_BASE, OPENBSD_4_5, OPENBSD_4_4_BASE, OPENBSD_4_4
Changes since 1.47: +3 -3 lines
Diff to previous 1.47 (colored)

unused var

Revision 1.47 / (download) - annotate - [select for diffs], Sat Mar 8 20:26:34 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
Changes since 1.46: +44 -23 lines
Diff to previous 1.46 (colored)

add checkout/update -j support.
still has some rough edges.

Revision 1.46 / (download) - annotate - [select for diffs], Sat Mar 8 11:53:36 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
Changes since 1.45: +5 -5 lines
Diff to previous 1.45 (colored)

correct usage of lseek(2);

Revision 1.45 / (download) - annotate - [select for diffs], Sat Mar 1 14:40:23 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
CVS Tags: OPENBSD_4_3_BASE, OPENBSD_4_3
Changes since 1.44: +3 -3 lines
Diff to previous 1.44 (colored)

when reopening the file pass the proper mode and reopen it using
O_RDWR instead of O_WRONLY so that when we are in server mode
we do not screw up in cvs_remote_send_file().

Revision 1.44 / (download) - annotate - [select for diffs], Fri Feb 29 21:43:57 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
Changes since 1.43: +3 -3 lines
Diff to previous 1.43 (colored)

handle file permissions and owners properly.
matches what gnu cvs does.

fixes the fact that we couldnt update group writable files.

problem report & diff testing by David Crawshaw.

Revision 1.43 / (download) - annotate - [select for diffs], Thu Feb 28 20:35:27 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
Changes since 1.42: +2 -5 lines
Diff to previous 1.42 (colored)

nobody needs weird debug messages

Revision 1.42 / (download) - annotate - [select for diffs], Wed Feb 27 22:34:04 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
Changes since 1.41: +45 -23 lines
Diff to previous 1.41 (colored)

prevent file races

ok tobias@

Revision 1.41 / (download) - annotate - [select for diffs], Sat Feb 23 23:42:23 2008 UTC (16 years, 2 months ago) by joris
Branch: MAIN
Changes since 1.40: +3 -2 lines
Diff to previous 1.40 (colored)

reset overlapcnt at each cvs_merge_file() call so that files that
are being merged that have no conflicts will not report the previous
conflicts that might have been found.

Revision 1.40 / (download) - annotate - [select for diffs], Mon Feb 11 20:33:11 2008 UTC (16 years, 3 months ago) by tobias
Branch: MAIN
Changes since 1.39: +6 -6 lines
Diff to previous 1.39 (colored)

Cleanup buf implementation:

* Don't check for NULL on buffer creation, because it calls fatal() when
  something's wrong.
* All buffers are supposed to expand if there is no space left in them,
  so zap flags as well.
* Remove code that is now dead.

OK joris@

> Inspired by a diff from Igor Zinovik about unchecked return value.

Revision 1.39 / (download) - annotate - [select for diffs], Mon Sep 17 10:07:21 2007 UTC (16 years, 8 months ago) by tobias
Branch: MAIN
Changes since 1.38: +5 -3 lines
Diff to previous 1.38 (colored)

Imported atomicio interface.

Requested by ray@, OK joris@

Revision 1.38 / (download) - annotate - [select for diffs], Mon Sep 10 14:29:53 2007 UTC (16 years, 8 months ago) by tobias
Branch: MAIN
Changes since 1.37: +5 -4 lines
Diff to previous 1.37 (colored)

Proper use of fseek/fseeko macros.

OK joris@, otto@

Revision 1.37 / (download) - annotate - [select for diffs], Thu Jun 28 21:38:09 2007 UTC (16 years, 10 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_4_2_BASE, OPENBSD_4_2
Changes since 1.36: +3 -3 lines
Diff to previous 1.36 (colored)

Sync revisions and time buffers size to be consistent with each others.
Simplifies further size tweaks if needed.
OK niallo@ ray@.

Revision 1.36 / (download) - annotate - [select for diffs], Tue May 29 00:19:10 2007 UTC (16 years, 11 months ago) by ray
Branch: MAIN
Changes since 1.35: +11 -19 lines
Diff to previous 1.35 (colored)

Since xrealloc dies on failure it is safe to directly assign to the
original pointer.  Theo agrees, and so does the rest of the tree
(ssh, etc. all do this already).

Saves a bunch of variables and assignments.

OK niallo@

Revision 1.35 / (download) - annotate - [select for diffs], Thu Feb 22 06:42:09 2007 UTC (17 years, 2 months ago) by otto
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1
Changes since 1.34: +8 -4 lines
Diff to previous 1.34 (colored)

general includes cleanup sweep. ok joris@ niallo@

Revision 1.34 / (download) - annotate - [select for diffs], Wed Jan 31 21:07:35 2007 UTC (17 years, 3 months ago) by xsa
Branch: MAIN
Changes since 1.33: +4 -9 lines
Diff to previous 1.33 (colored)

snprintf() -> xsnprintf()

Revision 1.33 / (download) - annotate - [select for diffs], Sun Jan 28 02:04:45 2007 UTC (17 years, 3 months ago) by joris
Branch: MAIN
Changes since 1.32: +46 -48 lines
Diff to previous 1.32 (colored)

add merging support in both local and remote sides.
tested by many, thanks.

Revision 1.32 / (download) - annotate - [select for diffs], Fri Jan 12 23:32:01 2007 UTC (17 years, 4 months ago) by niallo
Branch: MAIN
Changes since 1.31: +8 -21 lines
Diff to previous 1.31 (colored)

major re-work of the RCS api.  this results in 100x performance improvements in some places and much
reduced memory usage.  note that only checkout has been fully converted to use the new high-performance
functions.  other codepaths (e.g. update) still use the old method which is provided for backwards
compatibility.  we can convert the remaining slow bits over to the new api piece-by-piece.

"commit this, now" joris@
brad@ tested, too.

Revision 1.31 / (download) - annotate - [select for diffs], Fri Jan 12 17:25:33 2007 UTC (17 years, 4 months ago) by joris
Branch: MAIN
Changes since 1.30: +2 -5 lines
Diff to previous 1.30 (colored)

complete binary support for opencvs,
adding/importing binary files now works too

partially taken from openrcs

Revision 1.30 / (download) - annotate - [select for diffs], Thu Jan 11 17:44:18 2007 UTC (17 years, 4 months ago) by niallo
Branch: MAIN
Changes since 1.29: +17 -6 lines
Diff to previous 1.29 (colored)

rework opencvs so that we can deal with binary files.  previously we assumed all files were ascii,
which broke things in real-world usage.  now a checkout of src should work, albeit using lots of
memory and cpu.  fixing this is the next step.

testing by many.
ok & some input joris@

Revision 1.29 / (download) - annotate - [select for diffs], Fri Nov 10 08:32:37 2006 UTC (17 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.28: +12 -9 lines
Diff to previous 1.28 (colored)

sync with usr.bin/rcs/diff3.c

Revision 1.28 / (download) - annotate - [select for diffs], Thu Nov 9 11:14:56 2006 UTC (17 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.27: +20 -11 lines
Diff to previous 1.27 (colored)

respect TMPDIR here too, changes pulled in from usr.bin/rcs.

Revision 1.27 / (download) - annotate - [select for diffs], Tue Oct 24 06:22:53 2006 UTC (17 years, 6 months ago) by ray
Branch: MAIN
Changes since 1.26: +4 -2 lines
Diff to previous 1.26 (colored)

Check that string length != 0 before setting buf[strlen(buf) - 1].

OK xsa@.

Revision 1.26 / (download) - annotate - [select for diffs], Sat Jul 8 09:25:44 2006 UTC (17 years, 10 months ago) by ray
Branch: MAIN
CVS Tags: OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.25: +7 -7 lines
Diff to previous 1.25 (colored)

Remove file mode argument from {cvs|rcs}_buf_write_stmp().  We
always set the temporary file to mode 600, which is already done
by mkstemp().

OK joris@ and xsa@ over a month ago.

Revision 1.25 / (download) - annotate - [select for diffs], Wed Jun 14 14:10:50 2006 UTC (17 years, 11 months ago) by joris
Branch: MAIN
Changes since 1.24: +5 -4 lines
Diff to previous 1.24 (colored)

add cvs_buf_load_fd() which does the same as cvs_buf_load()
except it takes a decriptor as argument instead of a path.

modified cvs_buf_load() to open the descriptor then pass
it to cvs_buf_load_fd().

change all the calls to cvs_buf_load() that have a descriptor
open for the path to cvs_buf_load_fd() to prevent races.

Revision 1.24 / (download) - annotate - [select for diffs], Sat May 27 03:30:30 2006 UTC (17 years, 11 months ago) by joris
Branch: MAIN
Changes since 1.23: +9 -9 lines
Diff to previous 1.23 (colored)

commit the new opencvs code, i have been hacking on
this for the past 2 weeks now and it should go in at
the start of the hackathon so others can help out.

this code is a lot safer, smarter, faster and best of
all it is actually doing what it is suppose to do!

basic checkout, update, status, diff and commit are
working in local mode only.
there is no support for any remote setups now.

Revision 1.23 / (download) - annotate - [select for diffs], Fri Apr 14 02:49:41 2006 UTC (18 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.22: +8 -8 lines
Diff to previous 1.22 (colored)

more nasty spaces go bye bye

Revision 1.22 / (download) - annotate - [select for diffs], Wed Apr 5 01:38:55 2006 UTC (18 years, 1 month ago) by ray
Branch: MAIN
Changes since 1.21: +13 -11 lines
Diff to previous 1.21 (colored)

Use variable names for sizeof, remove casts in front of xmalloc,
use xcalloc and xstrdup where appropriate, and other stuff.

OK joris@

Revision 1.21 / (download) - annotate - [select for diffs], Tue Mar 28 02:13:44 2006 UTC (18 years, 1 month ago) by ray
Branch: MAIN
Changes since 1.20: +7 -7 lines
Diff to previous 1.20 (colored)

Today is Integer Overflow Prevention Day:
 - Sync xmalloc.? with ssh versions.
 - Change all xrealloc() calls to new API.

``I really like this.'' niallo@

Revision 1.20 / (download) - annotate - [select for diffs], Sat Mar 25 21:29:59 2006 UTC (18 years, 1 month ago) by ray
Branch: MAIN
Changes since 1.19: +12 -11 lines
Diff to previous 1.19 (colored)

Correct integer types, remove unused arguments, non-portable bitshifts
changed to division, KNF, replace unreachable code with goto fail,
et cetera.  Found by lint.

The free() -> xfree() as well.

OK niallo@

Revision 1.19 / (download) - annotate - [select for diffs], Thu Mar 16 08:32:34 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.18: +5 -6 lines
Diff to previous 1.18 (colored)

kill two unused variables.

Revision 1.18 / (download) - annotate - [select for diffs], Tue Mar 14 15:59:06 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.17: +8 -6 lines
Diff to previous 1.17 (colored)

add an argument to cvs_diff3() to be able to handle verbosity of
commands; fixes rcsmerge -q  behaviour. OK niallo@ ray@.

Revision 1.17 / (download) - annotate - [select for diffs], Mon Mar 6 13:22:59 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.16: +2 -5 lines
Diff to previous 1.16 (colored)

adapt informative message if we are sending output to stdout.

Revision 1.16 / (download) - annotate - [select for diffs], Mon Mar 6 08:46:55 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
Changes since 1.15: +4 -4 lines
Diff to previous 1.15 (colored)

if the submitted rev(s) is/are the same as the head rev, skip the process
for the specified file. Fix some error messages while there. OK joris@

Revision 1.15 / (download) - annotate - [select for diffs], Sun Mar 5 16:34:31 2006 UTC (18 years, 2 months ago) by niallo
Branch: MAIN
Changes since 1.14: +7 -7 lines
Diff to previous 1.14 (colored)

oops, forgot the diff3.c portion of this diff:

fatal() instead of returning -1 on failure in patch functions
ed_patch_lines() and rcs_patch_lines().  this can avoid segfault in certain
circumstances.

From: Ray Lai <ray@cyth.net>

discussed with xsa@ and joris@

Revision 1.14 / (download) - annotate - [select for diffs], Sun Feb 26 10:07:50 2006 UTC (18 years, 2 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9
Changes since 1.13: +8 -6 lines
Diff to previous 1.13 (colored)

out-of-bounds access and correct some printf while here;

Revision 1.13 / (download) - annotate - [select for diffs], Mon Jan 23 16:49:48 2006 UTC (18 years, 3 months ago) by xsa
Branch: MAIN
Changes since 1.12: +7 -4 lines
Diff to previous 1.12 (colored)

snprintf() -> strlcpy()/strlcat(); OK niallo@.

Revision 1.12 / (download) - annotate - [select for diffs], Mon Jan 2 08:11:56 2006 UTC (18 years, 4 months ago) by xsa
Branch: MAIN
Changes since 1.11: +3 -10 lines
Diff to previous 1.11 (colored)

#include's cleanup; ok joris@ niallo@.

Revision 1.11 / (download) - annotate - [select for diffs], Fri Dec 30 17:51:01 2005 UTC (18 years, 4 months ago) by reyk
Branch: MAIN
Changes since 1.10: +8 -5 lines
Diff to previous 1.10 (colored)

knf

Revision 1.10 / (download) - annotate - [select for diffs], Sat Dec 24 04:10:51 2005 UTC (18 years, 4 months ago) by joris
Branch: MAIN
Changes since 1.9: +5 -10 lines
Diff to previous 1.9 (colored)

remove useless cvs_buf_alloc() failure checks;

Revision 1.9 / (download) - annotate - [select for diffs], Tue Dec 20 18:17:01 2005 UTC (18 years, 5 months ago) by xsa
Branch: MAIN
Changes since 1.8: +9 -23 lines
Diff to previous 1.8 (colored)

cvs_buf_putc() and cvs_buf_write_*() functions cannot fail anymore;

Revision 1.8 / (download) - annotate - [select for diffs], Sat Dec 10 20:27:45 2005 UTC (18 years, 5 months ago) by joris
Branch: MAIN
Changes since 1.7: +9 -18 lines
Diff to previous 1.7 (colored)

switch to xmalloc stuff, me and xsa@ agreed on this a long
time ago, but we were being held back by jfb. too bad for him.

next step is to use fatal() through out the code for unrecoverable
errors instead of trying to be all nice and fluffy and reach main() again.

ok niallo@ and xsa@

Revision 1.7 / (download) - annotate - [select for diffs], Sat Dec 3 01:02:08 2005 UTC (18 years, 5 months ago) by joris
Branch: MAIN
Changes since 1.6: +15 -3 lines
Diff to previous 1.6 (colored)

add very basic support for the following stuff:

- checkout in local mode (example: /cvs)
- update in local and server mode (example: /cvs and user@host:/cvs)
- import in local and server mode (example: /cvs and user@host:/cvs)

what remains to be done:

- not all options are supported yet, and update cannot pick up newly
  added files yet. these things are pending and will be commited
  real soon.

- checkout only works locally right now.

- fix rcs parsing code so that we don't fucking hog 100% cpu
  on really BIG BIG BIG ass trees.

mainly tested by pedro@ and myself, thanks a lot pedro!

"go for it" niallo@

Revision 1.6 / (download) - annotate - [select for diffs], Tue Nov 8 16:06:03 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.5: +6 -6 lines
Diff to previous 1.5 (colored)

missing casts;

Revision 1.5 / (download) - annotate - [select for diffs], Wed Oct 26 18:13:58 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.4: +3 -3 lines
Diff to previous 1.4 (colored)

diff3_conflicts cleanup; joris ok

Revision 1.4 / (download) - annotate - [select for diffs], Sun Oct 23 04:24:59 2005 UTC (18 years, 7 months ago) by joris
Branch: MAIN
Changes since 1.3: +10 -6 lines
Diff to previous 1.3 (colored)

better output;

Revision 1.3 / (download) - annotate - [select for diffs], Sun Oct 23 04:03:58 2005 UTC (18 years, 7 months ago) by joris
Branch: MAIN
Changes since 1.2: +3 -3 lines
Diff to previous 1.2 (colored)

shut up gcc;

Revision 1.2 / (download) - annotate - [select for diffs], Sun Oct 23 03:47:12 2005 UTC (18 years, 7 months ago) by joris
Branch: MAIN
Changes since 1.1: +18 -10 lines
Diff to previous 1.1 (colored)

- correctly terminate buffer in edscript(), noted by pedro@
- fix patching for large files;

Revision 1.1 / (download) - annotate - [select for diffs], Sat Oct 22 17:32:57 2005 UTC (18 years, 7 months ago) by joris
Branch: MAIN

diff3 support, needed for merging files together;

"go for it" niallo@

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.