Merge branch 'tr/merge-recursive-flush'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:52:19 +0000 (11:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2012 18:52:19 +0000 (11:52 -0700)
Remove unnecessary code.

* tr/merge-recursive-flush:
merge-recursive: eliminate flush_buffer() in favor of write_in_full()

1  2 
merge-recursive.c
diff --combined merge-recursive.c
index 39b2e165e05472daf38cd6f458541b6db4abc9a8,eed936ebec2a83fa87d67e9c25093546fe77bb57..3b24d930e2cd9e282e18b552b8b0be3f404c2e99
@@@ -187,7 -187,7 +187,7 @@@ static void output_commit_title(struct 
        else {
                printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
                if (parse_commit(commit) != 0)
 -                      printf("(bad commit)\n");
 +                      printf(_("(bad commit)\n"));
                else {
                        const char *title;
                        int len = find_commit_subject(commit->buffer, &title);
@@@ -203,7 -203,7 +203,7 @@@ static int add_cacheinfo(unsigned int m
        struct cache_entry *ce;
        ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
        if (!ce)
 -              return error("addinfo_cache failed for path '%s'", path);
 +              return error(_("addinfo_cache failed for path '%s'"), path);
        return add_cache_entry(ce, options);
  }
  
@@@ -264,8 -264,8 +264,8 @@@ struct tree *write_tree_from_memory(str
  
        if (!cache_tree_fully_valid(active_cache_tree) &&
            cache_tree_update(active_cache_tree,
 -                            active_cache, active_nr, 0, 0, 0) < 0)
 -              die("error building trees");
 +                            active_cache, active_nr, 0) < 0)
 +              die(_("error building trees"));
  
        result = lookup_tree(active_cache_tree->sha1);
  
@@@ -485,7 -485,6 +485,7 @@@ static struct string_list *get_renames(
        renames = xcalloc(1, sizeof(struct string_list));
        diff_setup(&opts);
        DIFF_OPT_SET(&opts, RECURSIVE);
 +      DIFF_OPT_CLR(&opts, RENAME_EMPTY);
        opts.detect_rename = DIFF_DETECT_RENAME;
        opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
                            o->diff_rename_limit >= 0 ? o->diff_rename_limit :
        opts.show_rename_progress = o->show_rename_progress;
        opts.output_format = DIFF_FORMAT_NO_OUTPUT;
        if (diff_setup_done(&opts) < 0)
 -              die("diff setup failed");
 +              die(_("diff setup failed"));
        diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
        diffcore_std(&opts);
        if (opts.needed_rename_limit > o->needed_rename_limit)
@@@ -614,23 -613,6 +614,6 @@@ static char *unique_path(struct merge_o
        return newpath;
  }
  
- static void flush_buffer(int fd, const char *buf, unsigned long size)
- {
-       while (size > 0) {
-               long ret = write_in_full(fd, buf, size);
-               if (ret < 0) {
-                       /* Ignore epipe */
-                       if (errno == EPIPE)
-                               break;
-                       die_errno("merge-recursive");
-               } else if (!ret) {
-                       die(_("merge-recursive: disk full?"));
-               }
-               size -= ret;
-               buf += ret;
-       }
- }
  static int dir_in_way(const char *path, int check_working_copy)
  {
        int pos, pathlen = strlen(path);
@@@ -687,7 -669,7 +670,7 @@@ static int would_lose_untracked(const c
  static int make_room_for_path(struct merge_options *o, const char *path)
  {
        int status, i;
 -      const char *msg = "failed to create path '%s'%s";
 +      const char *msg = _("failed to create path '%s'%s");
  
        /* Unlink any D/F conflict files that are in the way */
        for (i = 0; i < o->df_conflict_file_set.nr; i++) {
                    path[df_pathlen] == '/' &&
                    strncmp(path, df_path, df_pathlen) == 0) {
                        output(o, 3,
 -                             "Removing %s to make room for subdirectory\n",
 +                             _("Removing %s to make room for subdirectory\n"),
                               df_path);
                        unlink(df_path);
                        unsorted_string_list_delete_item(&o->df_conflict_file_set,
        if (status) {
                if (status == -3) {
                        /* something else exists */
 -                      error(msg, path, ": perhaps a D/F conflict?");
 +                      error(msg, path, _(": perhaps a D/F conflict?"));
                        return -1;
                }
                die(msg, path, "");
         * tracking it.
         */
        if (would_lose_untracked(path))
 -              return error("refusing to lose untracked file at '%s'",
 +              return error(_("refusing to lose untracked file at '%s'"),
                             path);
  
        /* Successful unlink is good.. */
        if (errno == ENOENT)
                return 0;
        /* .. but not some other error (who really cares what?) */
 -      return error(msg, path, ": perhaps a D/F conflict?");
 +      return error(msg, path, _(": perhaps a D/F conflict?"));
  }
  
  static void update_file_flags(struct merge_options *o,
  
                buf = read_sha1_file(sha, &type, &size);
                if (!buf)
 -                      die("cannot read object %s '%s'", sha1_to_hex(sha), path);
 +                      die(_("cannot read object %s '%s'"), sha1_to_hex(sha), path);
                if (type != OBJ_BLOB)
 -                      die("blob expected for %s '%s'", sha1_to_hex(sha), path);
 +                      die(_("blob expected for %s '%s'"), sha1_to_hex(sha), path);
                if (S_ISREG(mode)) {
                        struct strbuf strbuf = STRBUF_INIT;
                        if (convert_to_working_tree(path, buf, size, &strbuf)) {
                                mode = 0666;
                        fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
                        if (fd < 0)
 -                              die_errno("failed to open '%s'", path);
 +                              die_errno(_("failed to open '%s'"), path);
-                       flush_buffer(fd, buf, size);
+                       write_in_full(fd, buf, size);
                        close(fd);
                } else if (S_ISLNK(mode)) {
                        char *lnk = xmemdupz(buf, size);
                        safe_create_leading_directories_const(path);
                        unlink(path);
                        if (symlink(lnk, path))
 -                              die_errno("failed to symlink '%s'", path);
 +                              die_errno(_("failed to symlink '%s'"), path);
                        free(lnk);
                } else
 -                      die("do not know what to do with %06o %s '%s'",
 +                      die(_("do not know what to do with %06o %s '%s'"),
                            mode, sha1_to_hex(sha), path);
                free(buf);
        }
@@@ -936,11 -918,11 +919,11 @@@ static struct merge_file_info merge_fil
                                                  branch1, branch2);
  
                        if ((merge_status < 0) || !result_buf.ptr)
 -                              die("Failed to execute internal merge");
 +                              die(_("Failed to execute internal merge"));
  
                        if (write_sha1_file(result_buf.ptr, result_buf.size,
                                            blob_type, result.sha))
 -                              die("Unable to add %s to database",
 +                              die(_("Unable to add %s to database"),
                                    a->path);
  
                        free(result_buf.ptr);
                        if (!sha_eq(a->sha1, b->sha1))
                                result.clean = 0;
                } else {
 -                      die("unsupported object type in the tree");
 +                      die(_("unsupported object type in the tree"));
                }
        }
  
@@@ -1034,32 -1016,22 +1017,32 @@@ static void handle_change_delete(struc
                remove_file_from_cache(path);
                update_file(o, 0, o_sha, o_mode, renamed ? renamed : path);
        } else if (!a_sha) {
 -              output(o, 1, "CONFLICT (%s/delete): %s deleted in %s "
 -                     "and %s in %s. Version %s of %s left in tree%s%s.",
 -                     change, path, o->branch1,
 -                     change_past, o->branch2, o->branch2, path,
 -                     NULL == renamed ? "" : " at ",
 -                     NULL == renamed ? "" : renamed);
 -              update_file(o, 0, b_sha, b_mode, renamed ? renamed : path);
 +              if (!renamed) {
 +                      output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
 +                             "and %s in %s. Version %s of %s left in tree."),
 +                             change, path, o->branch1, change_past,
 +                             o->branch2, o->branch2, path);
 +                      update_file(o, 0, b_sha, b_mode, path);
 +              } else {
 +                      output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
 +                             "and %s in %s. Version %s of %s left in tree at %s."),
 +                             change, path, o->branch1, change_past,
 +                             o->branch2, o->branch2, path, renamed);
 +                      update_file(o, 0, b_sha, b_mode, renamed);
 +              }
        } else {
 -              output(o, 1, "CONFLICT (%s/delete): %s deleted in %s "
 -                     "and %s in %s. Version %s of %s left in tree%s%s.",
 -                     change, path, o->branch2,
 -                     change_past, o->branch1, o->branch1, path,
 -                     NULL == renamed ? "" : " at ",
 -                     NULL == renamed ? "" : renamed);
 -              if (renamed)
 +              if (!renamed) {
 +                      output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
 +                             "and %s in %s. Version %s of %s left in tree."),
 +                             change, path, o->branch2, change_past,
 +                             o->branch1, o->branch1, path);
 +              } else {
 +                      output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
 +                             "and %s in %s. Version %s of %s left in tree at %s."),
 +                             change, path, o->branch2, change_past,
 +                             o->branch1, o->branch1, path, renamed);
                        update_file(o, 0, a_sha, a_mode, renamed);
 +              }
                /*
                 * No need to call update_file() on path when !renamed, since
                 * that would needlessly touch path.  We could call
@@@ -1095,7 -1067,7 +1078,7 @@@ static void conflict_rename_delete(stru
                             orig->sha1, orig->mode,
                             a_sha, a_mode,
                             b_sha, b_mode,
 -                           "rename", "renamed");
 +                           _("rename"), _("renamed"));
  
        if (o->call_depth) {
                remove_file_from_cache(dest->path);
@@@ -1151,7 -1123,7 +1134,7 @@@ static void handle_file(struct merge_op
        } else {
                if (dir_in_way(rename->path, !o->call_depth)) {
                        dst_name = unique_path(o, rename->path, cur_branch);
 -                      output(o, 1, "%s is a directory in %s adding as %s instead",
 +                      output(o, 1, _("%s is a directory in %s adding as %s instead"),
                               rename->path, other_branch, dst_name);
                }
        }
@@@ -1173,12 -1145,12 +1156,12 @@@ static void conflict_rename_rename_1to2
        struct diff_filespec *a = ci->pair1->two;
        struct diff_filespec *b = ci->pair2->two;
  
 -      output(o, 1, "CONFLICT (rename/rename): "
 +      output(o, 1, _("CONFLICT (rename/rename): "
               "Rename \"%s\"->\"%s\" in branch \"%s\" "
 -             "rename \"%s\"->\"%s\" in \"%s\"%s",
 +             "rename \"%s\"->\"%s\" in \"%s\"%s"),
               one->path, a->path, ci->branch1,
               one->path, b->path, ci->branch2,
 -             o->call_depth ? " (left unresolved)" : "");
 +             o->call_depth ? _(" (left unresolved)") : "");
        if (o->call_depth) {
                struct merge_file_info mfi;
                struct diff_filespec other;
@@@ -1232,9 -1204,9 +1215,9 @@@ static void conflict_rename_rename_2to1
        struct merge_file_info mfi_c1;
        struct merge_file_info mfi_c2;
  
 -      output(o, 1, "CONFLICT (rename/rename): "
 +      output(o, 1, _("CONFLICT (rename/rename): "
               "Rename %s->%s in %s. "
 -             "Rename %s->%s in %s",
 +             "Rename %s->%s in %s"),
               a->path, c1->path, ci->branch1,
               b->path, c2->path, ci->branch2);
  
        } else {
                char *new_path1 = unique_path(o, path, ci->branch1);
                char *new_path2 = unique_path(o, path, ci->branch2);
 -              output(o, 1, "Renaming %s to %s and %s to %s instead",
 +              output(o, 1, _("Renaming %s to %s and %s to %s instead"),
                       a->path, new_path1, b->path, new_path2);
                remove_file(o, 0, path, 0);
                update_file(o, 0, mfi_c1.sha, mfi_c1.mode, new_path1);
@@@ -1461,8 -1433,8 +1444,8 @@@ static int process_renames(struct merge
                        } else if (!sha_eq(dst_other.sha1, null_sha1)) {
                                clean_merge = 0;
                                try_merge = 1;
 -                              output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
 -                                     "%s added in %s",
 +                              output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
 +                                     "%s added in %s"),
                                       ren1_src, ren1_dst, branch1,
                                       ren1_dst, branch2);
                                if (o->call_depth) {
                                                         ren1->pair->two->sha1, ren1->pair->two->mode,
                                                         dst_other.sha1, dst_other.mode,
                                                         branch1, branch2);
 -                                      output(o, 1, "Adding merged %s", ren1_dst);
 +                                      output(o, 1, _("Adding merged %s"), ren1_dst);
                                        update_file(o, 0, mfi.sha, mfi.mode, ren1_dst);
                                        try_merge = 0;
                                } else {
                                        char *new_path = unique_path(o, ren1_dst, branch2);
 -                                      output(o, 1, "Adding as %s instead", new_path);
 +                                      output(o, 1, _("Adding as %s instead"), new_path);
                                        update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
                                        free(new_path);
                                }
@@@ -1527,10 -1499,10 +1510,10 @@@ static int read_sha1_strbuf(const unsig
        unsigned long size;
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf)
 -              return error("cannot read object %s", sha1_to_hex(sha1));
 +              return error(_("cannot read object %s"), sha1_to_hex(sha1));
        if (type != OBJ_BLOB) {
                free(buf);
 -              return error("object %s is not a blob", sha1_to_hex(sha1));
 +              return error(_("object %s is not a blob"), sha1_to_hex(sha1));
        }
        strbuf_attach(dst, buf, size, size + 1);
        return 0;
@@@ -1578,7 -1550,7 +1561,7 @@@ static void handle_modify_delete(struc
                             o_sha, o_mode,
                             a_sha, a_mode,
                             b_sha, b_mode,
 -                           "modify", "modified");
 +                           _("modify"), _("modified"));
  }
  
  static int merge_content(struct merge_options *o,
                         unsigned char *b_sha, int b_mode,
                         struct rename_conflict_info *rename_conflict_info)
  {
 -      const char *reason = "content";
 +      const char *reason = _("content");
        const char *path1 = NULL, *path2 = NULL;
        struct merge_file_info mfi;
        struct diff_filespec one, a, b;
        unsigned df_conflict_remains = 0;
  
        if (!o_sha) {
 -              reason = "add/add";
 +              reason = _("add/add");
                o_sha = (unsigned char *)null_sha1;
        }
        one.path = a.path = b.path = (char *)path;
        if (mfi.clean && !df_conflict_remains &&
            sha_eq(mfi.sha, a_sha) && mfi.mode == a_mode) {
                int path_renamed_outside_HEAD;
 -              output(o, 3, "Skipped %s (merged same as existing)", path);
 +              output(o, 3, _("Skipped %s (merged same as existing)"), path);
                /*
                 * The content merge resulted in the same file contents we
                 * already had.  We can return early if those file contents
                        return mfi.clean;
                }
        } else
 -              output(o, 2, "Auto-merging %s", path);
 +              output(o, 2, _("Auto-merging %s"), path);
  
        if (!mfi.clean) {
                if (S_ISGITLINK(mfi.mode))
 -                      reason = "submodule";
 -              output(o, 1, "CONFLICT (%s): Merge conflict in %s",
 +                      reason = _("submodule");
 +              output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
                                reason, path);
                if (rename_conflict_info && !df_conflict_remains)
                        update_stages(path, &one, &a, &b);
  
                }
                new_path = unique_path(o, path, rename_conflict_info->branch1);
 -              output(o, 1, "Adding as %s instead", new_path);
 +              output(o, 1, _("Adding as %s instead"), new_path);
                update_file(o, 0, mfi.sha, mfi.mode, new_path);
                free(new_path);
                mfi.clean = 0;
@@@ -1738,7 -1710,7 +1721,7 @@@ static int process_entry(struct merge_o
                        /* Deleted in both or deleted in one and
                         * unchanged in the other */
                        if (a_sha)
 -                              output(o, 2, "Removing %s", path);
 +                              output(o, 2, _("Removing %s"), path);
                        /* do not touch working file if it did not exist */
                        remove_file(o, 1, path, !a_sha);
                } else {
                        other_branch = o->branch2;
                        mode = a_mode;
                        sha = a_sha;
 -                      conf = "file/directory";
 +                      conf = _("file/directory");
                } else {
                        add_branch = o->branch2;
                        other_branch = o->branch1;
                        mode = b_mode;
                        sha = b_sha;
 -                      conf = "directory/file";
 +                      conf = _("directory/file");
                }
                if (dir_in_way(path, !o->call_depth)) {
                        char *new_path = unique_path(o, path, add_branch);
                        clean_merge = 0;
 -                      output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
 -                             "Adding %s as %s",
 +                      output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
 +                             "Adding %s as %s"),
                               conf, path, other_branch, path, new_path);
                        if (o->call_depth)
                                remove_file_from_cache(path);
                                remove_file_from_cache(path);
                        free(new_path);
                } else {
 -                      output(o, 2, "Adding %s", path);
 +                      output(o, 2, _("Adding %s"), path);
                        /* do not overwrite file if already present */
                        update_file_flags(o, sha, mode, path, 1, !a_sha);
                }
                 */
                remove_file(o, 1, path, !a_mode);
        } else
 -              die("Fatal merge failure, shouldn't happen.");
 +              die(_("Fatal merge failure, shouldn't happen."));
  
        return clean_merge;
  }
@@@ -1820,7 -1792,7 +1803,7 @@@ int merge_trees(struct merge_options *o
        }
  
        if (sha_eq(common->object.sha1, merge->object.sha1)) {
 -              output(o, 0, "Already up-to-date!");
 +              output(o, 0, _("Already up-to-date!"));
                *result = head;
                return 1;
        }
  
        if (code != 0) {
                if (show(o, 4) || o->call_depth)
 -                      die("merging of trees %s and %s failed",
 +                      die(_("merging of trees %s and %s failed"),
                            sha1_to_hex(head->object.sha1),
                            sha1_to_hex(merge->object.sha1));
                else
                for (i = 0; i < entries->nr; i++) {
                        struct stage_data *e = entries->items[i].util;
                        if (!e->processed)
 -                              die("Unprocessed path??? %s",
 +                              die(_("Unprocessed path??? %s"),
                                    entries->items[i].string);
                }
  
@@@ -1904,7 -1876,7 +1887,7 @@@ int merge_recursive(struct merge_option
        int clean;
  
        if (show(o, 4)) {
 -              output(o, 4, "Merging:");
 +              output(o, 4, _("Merging:"));
                output_commit_title(o, h1);
                output_commit_title(o, h2);
        }
        }
  
        if (show(o, 5)) {
 -              output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
 +              unsigned cnt = commit_list_count(ca);
 +
 +              output(o, 5, Q_("found %u common ancestor:",
 +                              "found %u common ancestors:", cnt), cnt);
                for (iter = ca; iter; iter = iter->next)
                        output_commit_title(o, iter->item);
        }
                /* if there is no common ancestor, use an empty tree */
                struct tree *tree;
  
 -              tree = lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN);
 +              tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
                merged_common_ancestors = make_virtual_commit(tree, "ancestor");
        }
  
                o->call_depth--;
  
                if (!merged_common_ancestors)
 -                      die("merge returned no commit");
 +                      die(_("merge returned no commit"));
        }
  
        discard_cache();
@@@ -2011,7 -1980,7 +1994,7 @@@ int merge_recursive_generic(struct merg
                for (i = 0; i < num_base_list; ++i) {
                        struct commit *base;
                        if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
 -                              return error("Could not parse object '%s'",
 +                              return error(_("Could not parse object '%s'"),
                                        sha1_to_hex(base_list[i]));
                        commit_list_insert(base, &ca);
                }
        if (active_cache_changed &&
                        (write_cache(index_fd, active_cache, active_nr) ||
                         commit_locked_index(lock)))
 -              return error("Unable to write index.");
 +              return error(_("Unable to write index."));
  
        return clean ? 0 : 1;
  }
@@@ -2082,9 -2051,9 +2065,9 @@@ int parse_merge_opt(struct merge_option
        else if (!prefixcmp(s, "subtree="))
                o->subtree_shift = s + strlen("subtree=");
        else if (!strcmp(s, "patience"))
 -              o->xdl_opts |= XDF_PATIENCE_DIFF;
 +              o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
        else if (!strcmp(s, "histogram"))
 -              o->xdl_opts |= XDF_HISTOGRAM_DIFF;
 +              o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
        else if (!strcmp(s, "ignore-space-change"))
                o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
        else if (!strcmp(s, "ignore-all-space"))