Revert "Make left-right automatic."

This reverts commit 5761231975ceffa531d86d9bab0f9a9a370674f6.

Feeding symmetric difference to gitk is so useful, and it is the
same for other graphical Porcelains.  Rather than forcing them
to pass --no-left-right, making it optional.

Noticed and reported by Jeff King.

diff --git a/revision.c b/revision.c
index 56819f8220b379575fd0e68d970acbffd9ed0249..d84f46e5a663a61c05354abbffaf05feee991cb6 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -853,8 +853,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                revs->boundary = 1;
                                continue;
                        }
                                revs->boundary = 1;
                                continue;
                        }

-                       if (!strcmp(arg, "--no-left-right")) {
-                               revs->no_left_right = 1;
+                       if (!strcmp(arg, "--left-right")) {
+                               revs->left_right = 1;

                                continue;
                        }
                        if (!strcmp(arg, "--objects")) {
                                continue;
                        }
                        if (!strcmp(arg, "--objects")) {


@@ -1055,18 +1055,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 void prepare_revision_walk(struct rev_info *revs)
 {
        int nr = revs->pending.nr;
 void prepare_revision_walk(struct rev_info *revs)
 {
        int nr = revs->pending.nr;

-       int has_symmetric = 0;

        struct object_array_entry *list = revs->pending.objects;
 
        revs->pending.nr = 0;
        revs->pending.alloc = 0;
        revs->pending.objects = NULL;
        while (--nr >= 0) {
        struct object_array_entry *list = revs->pending.objects;
 
        revs->pending.nr = 0;
        revs->pending.alloc = 0;
        revs->pending.objects = NULL;
        while (--nr >= 0) {

-               struct commit *commit;
-
-               if (list->item->flags & SYMMETRIC_LEFT)
-                       has_symmetric = 1;
-               commit = handle_commit(revs, list->item, list->name);
+               struct commit *commit = handle_commit(revs, list->item, list->name);

                if (commit) {
                        if (!(commit->object.flags & SEEN)) {
                                commit->object.flags |= SEEN;
                if (commit) {
                        if (!(commit->object.flags & SEEN)) {
                                commit->object.flags |= SEEN;


@@ -1078,8 +1073,6 @@ void prepare_revision_walk(struct rev_info *revs)
 
        if (revs->no_walk)
                return;
 
        if (revs->no_walk)
                return;

-       if (!revs->no_left_right && has_symmetric)
-               revs->left_right = 1;

        if (revs->limited)
                limit_list(revs);
        if (revs->topo_order)
        if (revs->limited)
                limit_list(revs);
        if (revs->topo_order)

diff --git a/revision.h b/revision.h
index b2ab81488c61d320eb9017fac7ef22b52122f872..4585463a44c9faecdcdf4454b735b1e4ba1335aa 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -41,7 +41,6 @@ struct rev_info {
                        limited:1,
                        unpacked:1, /* see also ignore_packed below */
                        boundary:1,
                        limited:1,
                        unpacked:1, /* see also ignore_packed below */
                        boundary:1,

-                       no_left_right:1,

                        left_right:1,
                        parents:1;
 
                        left_right:1,
                        parents:1;