undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* 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
This commit is contained in:
Junio C Hamano 2006-02-24 19:01:02 -08:00
commit d55e0fff1f
4 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

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

4
Makefile
View File

@ -153,8 +153,8 @@ PROGRAMS = \
git-convert-objects$X git-diff-files$X \ git-convert-objects$X git-diff-files$X \
git-diff-index$X git-diff-stages$X \ git-diff-index$X git-diff-stages$X \
git-diff-tree$X git-fetch-pack$X git-fsck-objects$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-hash-object$X git-index-pack$X git-init-db$X git-local-fetch$X \
git-local-fetch$X git-ls-files$X git-ls-tree$X git-merge-base$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-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-peek-remote$X git-prune-packed$X git-read-tree$X \
git-receive-pack$X git-rev-list$X git-rev-parse$X \ git-receive-pack$X git-rev-list$X git-rev-parse$X \

52
contrib/gitview/gitview
View File

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

7
ls-files.c
View File

@ -279,8 +279,11 @@ static void read_directory(const char *path, const char *base, int baselen)
continue; continue;
len = strlen(de->d_name); len = strlen(de->d_name);
memcpy(fullname + baselen, de->d_name, len+1); memcpy(fullname + baselen, de->d_name, len+1);
if (excluded(fullname) != show_ignored) if (excluded(fullname) != show_ignored) {
continue; if (!show_ignored || DTYPE(de) != DT_DIR) {
continue;
}
}
switch (DTYPE(de)) { switch (DTYPE(de)) {
struct stat st; struct stat st;