Obnam diff fix and manpage update for diff

3 files changed, 12 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index f99fb4e3..5d88d62a 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Version X.Y, released UNRELEASED
   the `O_EXCL` flag to create the target file. This should allow things
   to work with both NFS and VFAT.
 * More detailed progress reporting during the backup setup phase.
+* Manual page now covers the diff subcommand. Patch by Peter Valdemar Mørch.
 
 Bug fixes:
 
@@ -41,6 +42,8 @@ Bug fixes:
   via its checksum is ignored, and the backup continues.
 * Bugs in how Python OSError exceptions were being raises have been fixed.
   Error messages should now be somewhat clearer.
+* Unset or wrongly set variable "full" fixed in "obnam diff". Reported
+  by ROGERIO DE CARVALHO BASTOS and patched by Peter Valdemar Mørch.
 
 Version 1.2, released 2012-10-06
 --------------------------------
diff --git a/obnam.1.in b/obnam.1.in
index 65fdd8a4..09d4d9ea 100644
--- a/obnam.1.in
+++ b/obnam.1.in
@@ -140,6 +140,14 @@ can be given the
 and
 .B \-\-critical-age
 options.
+.IP \(bu
+.B diff
+compares two generations and lists files differing between them. Every output
+line will be prefixed either by a plus sign (+) for files that were added, a
+minus sign (-) for files that have been removed or an asterisk (*) for files
+that have changed.  If only one generation ID is specified on the command line
+that generation will be compared with its direct predecessor. If two IDs have
+been specified, all changes between those two generations will be listed.
 .SS "Making backups"
 When you run a backup,
 .B obnam
diff --git a/obnamlib/plugins/show_plugin.py b/obnamlib/plugins/show_plugin.py
index 36742ab9..60bb5bc1 100644
--- a/obnamlib/plugins/show_plugin.py
+++ b/obnamlib/plugins/show_plugin.py
@@ -234,6 +234,7 @@ class ShowPlugin(obnamlib.ObnamPlugin):
                 self.show_diff_for_file(gen2, full, '+')
         for basename in sorted(set1):
             # This was only in gen1 - it got removed
+            full = os.path.join(dirname, basename)
             self.show_diff_for_file(gen1, full, '-')
 
         for subdir in subdirs: