git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #79078 from masaeedu/git-interactive-rebase-tool

gitAndTools.git-interactive-rebase-tool: init

commit5de5d753bab7bac3e07003443e26766fde39b197 authorMaximilian Bosch <maximilian@mbosch.me> dateSun 2 Feb 2020, 10:23 (7 years ago) parent3afa9214d67e30
4 files changed+204
maintainers/maintainer-list.nix+6 pkgs/applications/version-management/git-and-tools/default.nix+2 pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patch+169 pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix+27
maintainers/maintainer-list.nix+6
@@ -8004,4 +8004,10 @@
80048004 githubId = 56247270;
80058005 name = "Foxit";
80068006 };
8007+ masaeedu = {
8008+ email = "masaeedu@gmail.com";
8009+ github = "masaeedu";
8010+ githubId = 3674056;
8011+ name = "Asad Saeeduddin";
8012+ };
80078013}
pkgs/applications/version-management/git-and-tools/default.nix+2
@@ -103,6 +103,8 @@ let
103103
104104 git-imerge = callPackage ./git-imerge { };
105105
106+ git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool {};
107+
106108 git-machete = python3Packages.callPackage ./git-machete { };
107109
108110 git-octopus = callPackage ./git-octopus { };
pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/01-terminaltests.patchnew file+169
@@ -0,0 +1,169 @@
1+--- a/src/display/utils.rs
2++++ b/src/display/utils.rs
3+@@ -53,166 +53,3 @@
4+ _ => ColorMode::TwoTone,
5+ }
6+ }
7+-
8+-#[cfg(all(windows, test))]
9+-mod tests {
10+- use crate::display::color_mode::ColorMode;
11+- use crate::display::utils::detect_color_mode;
12+-
13+- #[test]
14+- fn detect_color_mode_windows() {
15+- assert_eq!(detect_color_mode(2), ColorMode::ThreeBit);
16+- }
17+-}
18+-
19+-#[cfg(all(unix, test))]
20+-mod tests {
21+- use crate::display::color_mode::ColorMode;
22+- use crate::display::utils::detect_color_mode;
23+- use std::env::{remove_var, set_var};
24+-
25+- fn clear_env() {
26+- remove_var("COLORTERM");
27+- remove_var("VTE_VERSION");
28+- remove_var("TERM_PROGRAM");
29+- remove_var("TERM");
30+- }
31+-
32+- #[test]
33+- fn detect_color_mode_no_env_2_colors() {
34+- clear_env();
35+- assert_eq!(detect_color_mode(2), ColorMode::TwoTone);
36+- }
37+-
38+- #[test]
39+- fn detect_color_mode_no_env_8_colors() {
40+- clear_env();
41+- assert_eq!(detect_color_mode(8), ColorMode::ThreeBit);
42+- }
43+-
44+- #[test]
45+- fn detect_color_mode_no_env_less_8_colors() {
46+- clear_env();
47+- assert_eq!(detect_color_mode(7), ColorMode::TwoTone);
48+- }
49+-
50+- #[test]
51+- fn detect_color_mode_no_env_16_colors() {
52+- clear_env();
53+- assert_eq!(detect_color_mode(16), ColorMode::FourBit);
54+- }
55+-
56+- #[test]
57+- fn detect_color_mode_no_env_less_16_colors() {
58+- clear_env();
59+- assert_eq!(detect_color_mode(15), ColorMode::ThreeBit);
60+- }
61+-
62+- #[test]
63+- fn detect_color_mode_no_env_256_colors() {
64+- clear_env();
65+- assert_eq!(detect_color_mode(256), ColorMode::EightBit);
66+- }
67+-
68+- #[test]
69+- fn detect_color_mode_no_env_less_256_colors() {
70+- clear_env();
71+- assert_eq!(detect_color_mode(255), ColorMode::FourBit);
72+- }
73+-
74+- #[test]
75+- fn detect_color_mode_no_env_more_256_colors() {
76+- clear_env();
77+- assert_eq!(detect_color_mode(257), ColorMode::EightBit);
78+- }
79+-
80+- #[test]
81+- fn detect_color_mode_term_env_no_256() {
82+- clear_env();
83+- set_var("TERM", "XTERM");
84+- assert_eq!(detect_color_mode(0), ColorMode::TwoTone);
85+- }
86+-
87+- #[test]
88+- fn detect_color_mode_term_env_with_256() {
89+- clear_env();
90+- set_var("TERM", "XTERM-256");
91+- assert_eq!(detect_color_mode(0), ColorMode::EightBit);
92+- }
93+-
94+- #[test]
95+- fn detect_color_mode_term_program_env_apple_terminal() {
96+- clear_env();
97+- set_var("TERM_PROGRAM", "Apple_Terminal");
98+- assert_eq!(detect_color_mode(0), ColorMode::EightBit);
99+- }
100+-
101+- #[test]
102+- fn detect_color_mode_term_program_env_iterm() {
103+- clear_env();
104+- set_var("TERM_PROGRAM", "iTerm.app");
105+- assert_eq!(detect_color_mode(0), ColorMode::EightBit);
106+- }
107+-
108+- #[test]
109+- fn detect_color_mode_term_program_env_other() {
110+- clear_env();
111+- set_var("TERM_PROGRAM", "other");
112+- assert_eq!(detect_color_mode(0), ColorMode::TwoTone);
113+- }
114+-
115+- #[test]
116+- fn detect_color_mode_vte_version_0_36_00() {
117+- clear_env();
118+- set_var("VTE_VERSION", "3600");
119+- assert_eq!(detect_color_mode(0), ColorMode::TrueColor);
120+- }
121+-
122+- #[test]
123+- fn detect_color_mode_vte_version_greater_0_36_00() {
124+- clear_env();
125+- set_var("VTE_VERSION", "3601");
126+- assert_eq!(detect_color_mode(0), ColorMode::TrueColor);
127+- }
128+-
129+- #[test]
130+- fn detect_color_mode_vte_version_less_0_36_00() {
131+- clear_env();
132+- set_var("VTE_VERSION", "1");
133+- assert_eq!(detect_color_mode(0), ColorMode::EightBit);
134+- }
135+-
136+- #[test]
137+- fn detect_color_mode_vte_version_0() {
138+- clear_env();
139+- set_var("VTE_VERSION", "0");
140+- assert_eq!(detect_color_mode(0), ColorMode::TwoTone);
141+- }
142+- #[test]
143+- fn detect_color_mode_vte_version_invalid() {
144+- clear_env();
145+- set_var("VTE_VERSION", "invalid");
146+- assert_eq!(detect_color_mode(0), ColorMode::TwoTone);
147+- }
148+-
149+- #[test]
150+- fn detect_color_mode_colorterm_env_is_truecolor() {
151+- clear_env();
152+- set_var("COLORTERM", "truecolor");
153+- assert_eq!(detect_color_mode(0), ColorMode::TrueColor);
154+- }
155+-
156+- #[test]
157+- fn detect_color_mode_colorterm_env_is_24bit() {
158+- clear_env();
159+- set_var("COLORTERM", "24bit");
160+- assert_eq!(detect_color_mode(0), ColorMode::TrueColor);
161+- }
162+-
163+- #[test]
164+- fn detect_color_mode_colorterm_env_is_other() {
165+- clear_env();
166+- set_var("COLORTERM", "other");
167+- assert_eq!(detect_color_mode(0), ColorMode::TwoTone);
168+- }
169+-}
pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nixnew file+27
@@ -0,0 +1,27 @@
1+{ lib, ncurses5, fetchFromGitHub, rustPlatform }:
2+
3+rustPlatform.buildRustPackage rec {
4+ pname = "git-interactive-rebase-tool";
5+ version = "1.2.1";
6+
7+ src = fetchFromGitHub {
8+ owner = "MitMaro";
9+ repo = pname;
10+ rev = version;
11+ sha256 = "10z3di2qypgsmg2z7xfs9nlrf9vng5i7l8dvqadv1l4lb9zz7i8q";
12+ };
13+
14+ patches = [ ./01-terminaltests.patch ];
15+
16+ cargoSha256 = "002kr52vlpv1rhnxki29xflpmgk6bszrw0dsxcc34kyal0593ajk";
17+
18+ buildInputs = [ ncurses5 ];
19+
20+ meta = with lib; {
21+ homepage = "https://github.com/MitMaro/git-interactive-rebase-tool";
22+ description = "Native cross platform full feature terminal based sequence editor for git interactive rebase";
23+ changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}";
24+ license = licenses.mit;
25+ maintainers = with maintainers; [ masaeedu ];
26+ };
27+}