Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

New formula for git-imerge #27042

Closed
wants to merge 3 commits into from

6 participants

@josmo

git-imerge performs a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution.

@josmo josmo New formula for git-imerge
git-imerge performs a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution.
a0dbcf6
@adamv adamv added the new formula label
@cdlm

It seems like adding the -h option in the test would make the build pass.

@cdlm yep you're right. Sorry about that. It's now updated in the next commit.

@josmo josmo New formula for git-imerge
git-imerge performs a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. (Update to add -h to the test for it to pass)
71fd612
Library/Formula/git-imerge.rb
@@ -0,0 +1,15 @@
+require "formula"
+
+class GitImerge < Formula
+ homepage "https://github.com/mhagger/git-imerge"
+ url "https://github.com/mhagger/git-imerge/archive/0.7.0.tar.gz"
+ sha1 "b3bab94743a79426ea79c1b5e503020ef7fbf2ec"
+
+ def install
+ bin.install 'git-imerge'
+ end
+
+ test do
+ system "git-imerge -h"
@mikemcquaid Owner

Can this test be modified to do something more substantial then e.g. --version or --help? See cmake.rb for an example of a formula with a good test. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Library/Formula/git-imerge.rb
@@ -0,0 +1,15 @@
+require "formula"
+
+class GitImerge < Formula
+ homepage "https://github.com/mhagger/git-imerge"
+ url "https://github.com/mhagger/git-imerge/archive/0.7.0.tar.gz"
+ sha1 "b3bab94743a79426ea79c1b5e503020ef7fbf2ec"
+
+ def install
+ bin.install 'git-imerge'
@mikemcquaid Owner

Use double quotes. Also, is this just a single shell script? Nothing else useful to install?

@mhagger
mhagger added a note

There is a file git-imerge.css that is needed to make sense out of the git imerge diagram --html <filename> output. Though to be honest I haven't thought at all about how such a thing should be deployed.

@mikemcquaid Owner

Where does it look for this file? Should probably be installed.

@mhagger
mhagger added a note

It is the HTML output file that refers to the CSS file, and it looks only in the current directory. I.e., the feature is not really fully-baked, and it is entirely upstream's (that means my) fault.

As far as packaging it, for now the best thing you can do is probably to stick it in a documentation directory somewhere. But if you have any suggestions for how to organize this better in the upstream project, I'm all :ear:s.

@mikemcquaid Owner

The ideal solution would be it looks for that in a customised e.g. share directory. Alternatively it looks at the "real" location of the script and we can symlink the script from e.g. libexec. Would like to try and find some sort of solution before including this.

@josmo
josmo added a note

@mikemcquaid I've got the double quotes in there (sorry it took a while for such a simple change, been out of town)
@mhagger What are you leaning on for the css? I can make sure to align the formula to that :)

@mhagger
mhagger added a note

I honestly haven't had time to work on CSS file-handling. Certainly, if you want to submit a PR to the upstream project suggesting a reasonable solution, I would try to review and merge it as quickly as possible. Or maybe @jherland, who contributed the CSS/HTML stuff, as a few spare cycles?

Otherwise, just plop it down in a doc directory or whatever. It is not a critical part of git-imerge, so IMHO the poor CSS file handling shouldn't be considered a showstopper bug.

@mikemcquaid Owner

Ok, cheers @mhagger.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@mikemcquaid mikemcquaid commented on the diff
Library/Formula/git-imerge.rb
@@ -0,0 +1,15 @@
+require "formula"
+
+class GitImerge < Formula
+ homepage "https://github.com/mhagger/git-imerge"
+ url "https://github.com/mhagger/git-imerge/archive/0.7.0.tar.gz"
+ sha1 "b3bab94743a79426ea79c1b5e503020ef7fbf2ec"
+
+ def install
+ bin.install "git-imerge"
+ end
+
+ test do
+ system "git-imerge -h"
@mikemcquaid Owner

Still waiting on a better test here. Also, this should be system "git-imerge", "-h"

@adamv Owner
adamv added a note

Mike, what kind of test are we expecting?

@mikemcquaid Owner

A similar example to that on the README which starts with e.g. git-imerge start

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@adamv adamv self-assigned this
@adamv adamv removed their assignment
@jacknagel
Collaborator

A more comprehensive test might be nice, but I don't think it's essential; this is simply installing a python script, and it's a tool that is meant to be used interactively.

@jacknagel jacknagel closed this pull request from a commit
@josmo josmo New formula for git-imerge
git-imerge performs a merge between two branches incrementally. If
conflicts are encountered, figure out exactly which pairs of commits
conflict, and present the user with one pairwise conflict at a time for
resolution.

Closes #27042.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
57c7033
@jacknagel jacknagel closed this in 57c7033
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 26, 2014
  1. @josmo

    New formula for git-imerge

    josmo authored
    git-imerge performs a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution.
  2. @josmo

    New formula for git-imerge

    josmo authored
    git-imerge performs a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. (Update to add -h to the test for it to pass)
Commits on Mar 11, 2014
  1. @josmo

    Updating to use double quotes

    josmo authored
This page is out of date. Refresh to see the latest.
Showing with 15 additions and 0 deletions.
  1. +15 −0 Library/Formula/git-imerge.rb
View
15 Library/Formula/git-imerge.rb
@@ -0,0 +1,15 @@
+require "formula"
+
+class GitImerge < Formula
+ homepage "https://github.com/mhagger/git-imerge"
+ url "https://github.com/mhagger/git-imerge/archive/0.7.0.tar.gz"
+ sha1 "b3bab94743a79426ea79c1b5e503020ef7fbf2ec"
+
+ def install
+ bin.install "git-imerge"
+ end
+
+ test do
+ system "git-imerge -h"
@mikemcquaid Owner

Still waiting on a better test here. Also, this should be system "git-imerge", "-h"

@adamv Owner
adamv added a note

Mike, what kind of test are we expecting?

@mikemcquaid Owner

A similar example to that on the README which starts with e.g. git-imerge start

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ end
+end
Something went wrong with that request. Please try again.