Merge branch 'master' into next

* master:
Merge branches 'jc/rev-list' and 'jc/pack-thin'
gitview: Code cleanup
Add missing programs to ignore list
git ls files recursively show ignored files
Build and install git-mailinfo.
gitview: Bump the rev
gitview: Fix DeprecationWarning

diff --git a/.gitignore b/.gitignore
index 94f66d5a1ef9d1e2bec2c14b392565ee5bf98dd6..5be239a4aa95f78cb09e4921459e1678b9f3c36e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ GIT-VERSION-FILE
 git
 git-add
 git-am
+git-annotate
 git-apply
 git-applymbox
 git-applypatch
@@ -22,6 +23,7 @@ git-convert-objects
 git-count-objects
 git-cvsexportcommit
 git-cvsimport
+git-cvsserver
 git-daemon
 git-diff
 git-diff-files
@@ -53,6 +55,7 @@ git-mailsplit
 git-merge
 git-merge-base
 git-merge-index
+git-merge-tree
 git-merge-octopus
 git-merge-one-file
 git-merge-ours
@@ -60,6 +63,7 @@ git-merge-recursive
 git-merge-resolve
 git-merge-stupid
 git-mktag
+git-mktree
 git-name-rev
 git-mv
 git-pack-redundant

diff --git a/Makefile b/Makefile
index 8e6bbcecbf87e24d2e38c53307afe55be039def9..26fd9dc132b98cc1e361b6519ee5bc6ada047f70 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -153,8 +153,8 @@ PROGRAMS = \
        git-convert-objects$X git-diff-files$X \
        git-diff-index$X git-diff-stages$X \
        git-diff-tree$X git-fetch-pack$X git-fsck-objects$X \
-       git-hash-object$X git-index-pack$X git-init-db$X \
-       git-local-fetch$X git-ls-files$X git-ls-tree$X git-merge-base$X \
+       git-hash-object$X git-index-pack$X git-init-db$X git-local-fetch$X \
+       git-ls-files$X git-ls-tree$X git-mailinfo$X git-merge-base$X \
        git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
        git-peek-remote$X git-prune-packed$X git-read-tree$X \
        git-receive-pack$X git-rev-list$X git-rev-parse$X \

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
index b04df74162b7d56f181612c2d25c16fe31497291..2cde71e30d080d7e827697d7464e00024e6144bd 100755 (executable)
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
@@ -154,7 +154,7 @@ class CellRendererGraph(gtk.GenericCellRenderer):
 
                cols = self.node[0]
                for start, end, colour in self.in_lines + self.out_lines:
-                       cols = max(cols, start, end)
+                       cols = int(max(cols, start, end))
 
                (column, colour, names) = self.node
                names_len = 0
@@ -422,7 +422,7 @@ class DiffWindow:
 class GitView:
        """ This is the main class
        """
-       version = "0.6"
+       version = "0.7"
 
        def __init__(self, with_diff=0):
                self.with_diff = with_diff
@@ -870,21 +870,22 @@ class GitView:
 
                # Reset nodepostion
                if (last_nodepos > 5):
-                       last_nodepos = 0
+                       last_nodepos = -1 
 
                # Add the incomplete lines of the last cell in this
                try:
                        colour = self.colours[commit.commit_sha1]
                except KeyError:
-                       last_colour +=1
-                       self.colours[commit.commit_sha1] = last_colour
-                       colour =  last_colour
+                       self.colours[commit.commit_sha1] = last_colour+1
+                       last_colour = self.colours[commit.commit_sha1] 
+                       colour =   self.colours[commit.commit_sha1] 
+
                try:
                        node_pos = self.nodepos[commit.commit_sha1]
                except KeyError:
-                       last_nodepos +=1
-                       self.nodepos[commit.commit_sha1] = last_nodepos
-                       node_pos = last_nodepos
+                       self.nodepos[commit.commit_sha1] = last_nodepos+1
+                       last_nodepos = self.nodepos[commit.commit_sha1]
+                       node_pos =  self.nodepos[commit.commit_sha1]
 
                #The first parent always continue on the same line
                try:
@@ -895,32 +896,25 @@ class GitView:
                        self.nodepos[commit.parent_sha1[0]] = node_pos
 
                for sha1 in self.incomplete_line.keys():
-                       if ( sha1 != commit.commit_sha1):
+                       if (sha1 != commit.commit_sha1):
                                self.draw_incomplete_line(sha1, node_pos,
                                                out_line, in_line, index)
                        else:
                                del self.incomplete_line[sha1]
 
 
-               in_line.append((node_pos, self.nodepos[commit.parent_sha1[0]],
-                                       self.colours[commit.parent_sha1[0]]))
-
-               self.add_incomplete_line(commit.parent_sha1[0], index+1)
-
-               if (len(commit.parent_sha1) > 1):
-                       for parent_id in commit.parent_sha1[1:]:
-                               try:
-                                       tmp_node_pos = self.nodepos[parent_id]
-                               except KeyError:
-                                       last_colour += 1;
-                                       self.colours[parent_id] = last_colour
-                                       last_nodepos +=1
-                                       self.nodepos[parent_id] = last_nodepos
-
-                               in_line.append((node_pos, self.nodepos[parent_id],
-                                                       self.colours[parent_id]))
-                               self.add_incomplete_line(parent_id, index+1)
+               for parent_id in commit.parent_sha1:
+                       try:
+                               tmp_node_pos = self.nodepos[parent_id]
+                       except KeyError:
+                               self.colours[parent_id] = last_colour+1
+                               last_colour = self.colours[parent_id]
+                               self.nodepos[parent_id] = last_nodepos+1
+                               last_nodepos = self.nodepos[parent_id] 
 
+                       in_line.append((node_pos, self.nodepos[parent_id],
+                                               self.colours[parent_id]))
+                       self.add_incomplete_line(parent_id)
 
                try:
                        branch_tag = self.bt_sha1[commit.commit_sha1]
@@ -935,7 +929,7 @@ class GitView:
 
                return (in_line, last_colour, last_nodepos)
 
-       def add_incomplete_line(self, sha1, index):
+       def add_incomplete_line(self, sha1):
                try:
                        self.incomplete_line[sha1].append(self.nodepos[sha1])
                except KeyError:

diff --git a/ls-files.c b/ls-files.c
index 90b289f03d987c6c90214fc12d00c30b4e28bb27..df25c8c012a96a8277413ca3a81490b81b7dc067 100644 (file)
--- a/ls-files.c
+++ b/ls-files.c
@@ -279,8 +279,11 @@ static void read_directory(const char *path, const char *base, int baselen)
                                continue;
                        len = strlen(de->d_name);
                        memcpy(fullname + baselen, de->d_name, len+1);
-                       if (excluded(fullname) != show_ignored)
-                               continue;
+                       if (excluded(fullname) != show_ignored) {
+                               if (!show_ignored || DTYPE(de) != DT_DIR) {
+                                       continue;
+                               }
+                       }
 
                        switch (DTYPE(de)) {
                        struct stat st;