1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
require "test_helper"
class PatchTest < Rugged::TestCase
def test_to_s
repo = FixtureRepo.from_libgit2("diff")
repo.config['core.abbrev'] = 7
a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
diff = a.tree.diff(b.tree, :context_lines => 0)
assert_equal <<-EOS, diff.patches[0].to_s
diff --git a/another.txt b/another.txt
index 3e5bcba..546c735 100644
--- a/another.txt
+++ b/another.txt
@@ -2 +2 @@ Git is fast. With Git, nearly all operations are performed locally, giving
-it a huge speed advantage on centralized systems that constantly have to
+it an huge speed advantage on centralized systems that constantly have to
@@ -11,4 +10,0 @@ from the start.
-Let's see how common operations stack up against Subversion, a common
-centralized version control system that is similar to CVS or
-Perforce. Smaller is faster.
-
@@ -34,0 +31,4 @@ SVN.
+Let's see how common operations stack up against Subversion, a common
+centralized version control system that is similar to CVS or
+Perforce. Smaller is faster.
+
EOS
assert_equal <<-EOS, diff.patches[1].to_s
diff --git a/readme.txt b/readme.txt
index 7b808f7..29ab705 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1 +1 @@
-The Git feature that really makes it stand apart from nearly every other SCM
+The Git feature that r3ally mak3s it stand apart from n3arly 3v3ry other SCM
@@ -10,4 +9,0 @@ This means that you can do things like:
-Frictionless Context Switching. Create a branch to try out an idea, commit a
-few times, switch back to where you branched from, apply a patch, switch
-back to where you are experimenting, and merge it in.
-
@@ -27,3 +22,0 @@ Notably, when you push to a remote repository, you do not have to push all
-of your branches. You can choose to share just one of your branches, a few
-of them, or all of them. This tends to free people to try new ideas without
-worrying about having to plan how and when they are going to merge it in or
@@ -35 +28 @@ incredibly easy and it changes the way most developers work when they learn
-it.
+it.!
\\ No newline at end of file
EOS
end
def test_lines
repo = FixtureRepo.from_libgit2("diff")
repo.config['core.abbrev'] = 7
a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
diff = a.tree.diff(b.tree, :context_lines => 0)
patch = diff.patches[1]
assert_equal 12, patch.lines
assert_equal 12, patch.lines(exclude_context: true)
assert_equal 10, patch.lines(exclude_additions: true)
assert_equal 3, patch.lines(exclude_deletions: true)
assert_equal 11, patch.lines(exclude_eofnl: true)
assert_equal 1, patch.lines(exclude_additions: true, exclude_deletions: true)
assert_equal 0, patch.lines(exclude_eofnl: true, exclude_additions: true, exclude_deletions: true, exclude_context: true)
end
def test_header
repo = FixtureRepo.from_libgit2("diff")
repo.config['core.abbrev'] = 7
a = repo.lookup("d70d245ed97ed2aa596dd1af6536e4bfdb047b69")
b = repo.lookup("7a9e0b02e63179929fed24f0a3e0f19168114d10")
diff = a.tree.diff(b.tree, :context_lines => 0)
assert_equal <<-DIFF, diff.patches[1].header
diff --git a/readme.txt b/readme.txt
index 7b808f7..29ab705 100644
--- a/readme.txt
+++ b/readme.txt
DIFF
end
end
|
