CVS diff with new files: fakeadd

Blog post published on October 30, 2007

Ever been disgruntled by the fact that you can't do a cvs diff with new files, because you haven't got write access on a Drupal contrib module's CVS repository and thus can't cvs add those new files? There's a solution though: edit CVS's Entries file. But who likes manually modifying files over and over again?

The solution: fakeadd! (I've attached the file to this post in case this site ever goes down.) This nice shellscript allows you to update the Entries file using a simple syntax: fakeadd newfile.php.

A quick install how-to:

Save the file to a location of your choice, I've saved it in ~/scripts.
Open your ~/.bash_profile file (if you're using the bash shell, this is the default shell on OS X) and add the following:
```
# Add custom scripts, such as the CVS fakeadd script.
export PATH=$PATH:~/scripts
```
Make the script executable: chmod +x ~/scripts/fakeadd.
When you create patches (also see this blog post of mine), use the -N flag. So your eventual command will look like this: cvs diff -N -up > foo.patch.

Updated on November 30, 2008. The above blog post was improved based on the feedback I got in the comments:

Robert Douglass mentioned in the comments that you have to pass the -N parameter for cvs diff to pick up new files.
drewish was kind enough to post an improved version in the comments, which allows you to use the script for files in subdirectories.

Attachment	Size
fakeadd	770 bytes

Comments

July 3, 2008 - 09:00 — Robert Douglass (not verified)

It works. A couple extra pointers...

First, run the fakeadd script from the directory where the new file lives. If you're adding some new unit tests to D7, for example, they might be in ./includes/tests. fakeadd changes the CVS/Entries file in the current directory, so to add ./includes/tests/foo.test, you need to cd to includes/tests first.

Second, when making the patch, you need the -N flag:
cvs diff -N -up > foo.patch

September 13, 2008 - 06:38 — Dave (not verified)

Very handy!

Thanks very much for this script! Had troubles patching with a new file and this worked perfectly!

November 24, 2008 - 11:19 — drewish (not verified)

humm....

i was trying to use this as "fakeadd modules/*/*.api.php" and it failed miserably. i'm trying to decide if it'd be worth hacking it to get this to work correctly or if i should just add them by hand...

November 24, 2008 - 11:45 — drewish (not verified)

there fixed that for you ;)

#!/bin/sh

if [ $# -eq 0 ]; then
	echo "usage: $0 file ..." 1>&2
	exit 1
fi

rv=0
for file in "$@"; do
	dir=`dirname $file`
	base=`basename $file`
	if [ -f "$file" ]; then :; else
		echo "$0: error: \"$file\" does not exist or is not a plain file"
		rv=1
		continue
	fi
	if [ -d "$dir/CVS" ]; then :; else
		echo "$0: fatal error: no CVS directory!
		rv=1
		continue
	fi
	if [ -f "$dir/CVS/Entries" ] && [ -w "$dir/CVS/Entries" ]; then :; else
		echo "$0: fatal error: CVS/Entries file not writable!
		rv=1
		continue
	fi

	if grep "^/$file/" "$dir/CVS/Entries" > /dev/null 2>&1; then
		echo "$0: error: \"$file\" is already listed in CVS/Entries"
		rv=1
		continue
	fi

	echo "/$base/0/dummy timestamp//" >> "$dir/CVS/Entries"
	echo "$0: added \"$file\""
done
exit $rv

December 1, 2008 - 08:59 — Wim Leers

Thanks, I updated the blog

Thanks, I updated the blog post!

December 6, 2008 - 05:39 — spiderman (not verified)

Alternative approach: cvsdo

Just thought I'd throw out there that I stumbled across this post (and it didn't /quite/ work for me, though I appreciated that other Drupalers were attempting to solve this) slightly before this one.

Down in the section titled "Including new files in a patch", it mentions a nice utility called cvsdo (source is here, but see below if you're a Debianite), which accomplished this task quite nicely, and comes with other useful cvs utilities such as cvschroot which lets you change the Root entry (recursively!) for a working copy (ie. from an anonymous checkout to a logged-in one, for instance).

Even better was the fact that, on my debian-based system, all I had to do was apt-get install cvsutils and kapow! I had 'cvsdo' at my service :)

December 6, 2008 - 16:37 — Wim Leers

Thanks, great tip!

April 3, 2009 - 21:43 — Frank Carey (not verified)

Added to drupal.org

Added to drupal.org documentation page. both this script and cvsdo, cvsutils.
http://drupal.org/node/323

Cheers
Frank Carey

April 28, 2009 - 09:04 — Adding new files to CVS without write access | jensen (not verified)

Pingback

[...] command fails without write access to the repository. Luckely there is a handy little tool called fakeadd which you can use to edit the CVS entries file and let it look like the new files have been [...]

June 8, 2009 - 11:18 — Jacob Singh (not verified)

This is awesome!

You should get this into the official patch docs. The current setup is really a pain for a big patches with multiple dirs.

January 8, 2010 - 17:53 — Quentin (not verified)

Syntax errors

I notice there are some missing trailing quotes (") on two of the echo statements.
That will make echo print "what you want ... plus every thing up to next echo with leading"

Here's a patch that fixes it (plus I added a line with a URL back here :).

--- /tmp/1/fakeadd      2010-01-08 10:49:37.051730790 -0600
+++ /tmp/2/fakeadd      2010-01-08 10:49:13.531058172 -0600
@@ -1,4 +1,5 @@
 #!/bin/sh
+# from http:/wimleers.com/blog/cvs-diff-new-files-fakeadd

if [ $# -eq 0 ]; then echo "usage: $0 file ..." 1>&2 @@ -15,12 +16,12 @@ for file in "$@"; do continue fi if [ -d "$dir/CVS" ]; then :; else - echo "$0: fatal error: no CVS directory! + echo "$0: fatal error: no CVS directory!" rv=1 continue fi if [ -f "$dir/CVS/Entries" ] && [ -w "$dir/CVS/Entries" ]; then :; else - echo "$0: fatal error: CVS/Entries file not writable! + echo "$0: fatal error: CVS/Entries file not writable!" rv=1 continue fi

February 18, 2010 - 07:55 — edwin (not verified)

Wim Leers Freelance Drupal Developer

Content

Recent comments