Merge branch 'cvsserver' of http://locke.catalyst.net.nz/git/git-martinlanghoff; branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:33:23 +0000 (01:33 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:33:23 +0000 (01:33 -0800)
Conflicts:

Documentation/git-cvsserver.txt
git-cvsserver.perl

Originally Martin's tree was based on "next", which meant that all
the other things that I am not ready to push out to "master" were
contained in it. His changes looked good, and I wanted to have them
in "master".

So, here is what I did:

- fetch Martin's tree into a temporary topic branch.
$ git fetch $URL $remote:ml/cvsserver
$ git checkout ml/cvsserver

- rebase it on top of "master".
$ git rebase --onto master next

- pull that master into "next", recording Martin's head as well.
$ git pull --append . master

Since I have apply.whitespace=strip in my configuration file, the
rebased cvsserver changes have trailing whitespaces introduced by
Martin's tree cleansed out. Hence the above conflicts.

The reason I made this octopus is to make sure that next time Martin
pulls from my "next" branch, it results in a fast forward. There is
no reason to force him do the same conflict resolution I did with this
merge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-cvsserver.txt
Makefile
contrib/gitview/gitview
diffcore-break.c
git-cvsserver.perl
index fcc49b29c96fba0e8a51fe3b0a52d0084616f2c2..19c9c51cffec272d675cdaf1b223e2a6dff5dd3b 100644 (file)
@@ -59,15 +59,15 @@ Eclipse CVS Client Notes
 
 To get a checkout with the Eclipse CVS client:
 
-1. Create a new project from CVS checkout, giving it repository and module 
+1. Create a new project from CVS checkout, giving it repository and module
 2. Context Menu->Team->Share Project...
 3. Enter the repository and module information again and click Finish
-4. The Synchronize view appears. Untick  "launch commit wizard" to avoid 
-committing the .project file, and select HEAD as the tag to synchronize to. 
+4. The Synchronize view appears. Untick  "launch commit wizard" to avoid
+committing the .project file, and select HEAD as the tag to synchronize to.
 Update all incoming changes.
 
-Note that most versions of Eclipse ignore CVS_SERVER (which you can set in 
-the Preferences->Team->CVS->ExtConnection pane), so you may have to 
+Note that most versions of Eclipse ignore CVS_SERVER (which you can set in
+the Preferences->Team->CVS->ExtConnection pane), so you may have to
 rename, alias or symlink git-cvsserver to 'cvs' on the server.
 
 Clients known to work
index 5e93f278fc8c8e438d9613e18e52386febaf276b..26ef1f81044caccaab2cee96d7facdf3b9e2df83 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -223,11 +223,15 @@ ifeq ($(uname_S),Darwin)
        NEEDS_SSL_WITH_CRYPTO = YesPlease
        NEEDS_LIBICONV = YesPlease
        ## fink
-       ALL_CFLAGS += -I/sw/include
-       ALL_LDFLAGS += -L/sw/lib
+       ifeq ($(shell test -d /sw/lib && echo y),y)
+               ALL_CFLAGS += -I/sw/include
+               ALL_LDFLAGS += -L/sw/lib
+       endif
        ## darwinports
-       ALL_CFLAGS += -I/opt/local/include
-       ALL_LDFLAGS += -L/opt/local/lib
+       ifeq ($(shell test -d /opt/local/lib && echo y),y)
+               ALL_CFLAGS += -I/opt/local/include
+               ALL_LDFLAGS += -L/opt/local/lib
+       endif
 endif
 ifeq ($(uname_S),SunOS)
        NEEDS_SOCKET = YesPlease
index 048caf6f86b555ee0cbf598f91a50408f594f82b..ea05cd42401a92777daba721a6f78c55f2e10848 100755 (executable)
@@ -239,20 +239,23 @@ class CellRendererGraph(gtk.GenericCellRenderer):
                                box_size / 4, 0, 2 * math.pi)
 
 
+               self.set_colour(ctx, colour, 0.0, 0.5)
+               ctx.stroke_preserve()
+
+               self.set_colour(ctx, colour, 0.5, 1.0)
+               ctx.fill_preserve()
+
                if (len(names) != 0):
                        name = " "
                        for item in names:
                                name = name + item + " "
 
-                       ctx.select_font_face("Monospace")
                        ctx.set_font_size(13)
-                       ctx.text_path(name)
-
-               self.set_colour(ctx, colour, 0.0, 0.5)
-               ctx.stroke_preserve()
-
-               self.set_colour(ctx, colour, 0.5, 1.0)
-               ctx.fill()
+                       if (flags & 1):
+                               self.set_colour(ctx, colour, 0.5, 1.0)
+                       else:
+                               self.set_colour(ctx, colour, 0.0, 0.5)
+                       ctx.show_text(name)
 
 class Commit:
        """ This represent a commit object obtained after parsing the git-rev-list
@@ -365,7 +368,7 @@ class DiffWindow:
                save_menu.connect("activate", self.save_menu_response, "save")
                save_menu.show()
                menu_bar.append(save_menu)
-               vbox.pack_start(menu_bar, False, False, 2)
+               vbox.pack_start(menu_bar, expand=False, fill=True)
                menu_bar.show()
 
                scrollwin = gtk.ScrolledWindow()
@@ -479,19 +482,10 @@ class GitView:
 
        def construct(self):
                """Construct the window contents."""
+               vbox = gtk.VBox()
                paned = gtk.VPaned()
                paned.pack1(self.construct_top(), resize=False, shrink=True)
                paned.pack2(self.construct_bottom(), resize=False, shrink=True)
-               self.window.add(paned)
-               paned.show()
-
-
-       def construct_top(self):
-               """Construct the top-half of the window."""
-               vbox = gtk.VBox(spacing=6)
-               vbox.set_border_width(12)
-               vbox.show()
-
                menu_bar = gtk.MenuBar()
                menu_bar.set_pack_direction(gtk.PACK_DIRECTION_RTL)
                help_menu = gtk.MenuItem("Help")
@@ -503,8 +497,20 @@ class GitView:
                help_menu.set_submenu(menu)
                help_menu.show()
                menu_bar.append(help_menu)
-               vbox.pack_start(menu_bar, False, False, 2)
                menu_bar.show()
+               vbox.pack_start(menu_bar, expand=False, fill=True)
+               vbox.pack_start(paned, expand=True, fill=True)
+               self.window.add(vbox)
+               paned.show()
+               vbox.show()
+
+
+       def construct_top(self):
+               """Construct the top-half of the window."""
+               vbox = gtk.VBox(spacing=6)
+               vbox.set_border_width(12)
+               vbox.show()
+
 
                scrollwin = gtk.ScrolledWindow()
                scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
@@ -520,6 +526,9 @@ class GitView:
                self.treeview.show()
 
                cell = CellRendererGraph()
+               #  Set the default width to 265
+               #  This make sure that we have nice display with large tag names
+               cell.set_property("width", 265)
                column = gtk.TreeViewColumn()
                column.set_resizable(True)
                column.pack_start(cell, expand=True)
index c57513a4fa83c58c5040ead38c52765051cd13f5..95b5eb492e3aa1a282347b875df04da31f276399 100644 (file)
@@ -58,6 +58,10 @@ static int should_break(struct diff_filespec *src,
        if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
                return 0; /* leave symlink rename alone */
 
+       if (src->sha1_valid && dst->sha1_valid &&
+           !memcmp(src->sha1, dst->sha1, 20))
+               return 0; /* they are the same */
+
        if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
                return 0; /* error but caught downstream */
 
index 20a9baeb7169e4649ecf55f462afaf01ef5f1c4e..3c588c9d6439f35035f10cefd72b71933261d2a4 100755 (executable)
@@ -462,7 +462,7 @@ sub req_Unchanged
 }
 
 # Questionable filename \n
-#     Response expected: no. Additional data: no. 
+#     Response expected: no. Additional data: no.
 #     Tell the server to check whether filename should be ignored,
 #     and if not, next time the server sends responses, send (in
 #     a M response) `?' followed by the directory and filename.