svn_command_helper 0.9.1 → 0.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/svn_command_helper.rb +6 -3
- data/lib/svn_command_helper/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2a26bdb93ca25d73f166efbdab7bb537138cfa7d
|
4
|
+
data.tar.gz: a155eb28315c094d96623fc1b03081e93b399d25
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0abb87870bdb2169eb1c6885a071b9914904d0b28f87380e58bc7ca15dd2b09fa71c2fd7c59dabd91551dc955c1a9e8e69430431b3fdca76e602061e38257449
|
7
|
+
data.tar.gz: e05bd7035308a8b3a95f69148dcba2d8a5426ab3e29b8a6910a1a62627ad3dbdb2de8f4e5b6a82a56149ff5225d5502a9849f8e0d57208b3bdb46aea9d8f12ff
|
data/lib/svn_command_helper.rb
CHANGED
@@ -253,10 +253,9 @@ module SvnCommandHelper
|
|
253
253
|
options << "-x --ignore-eol-style" if ignore_eol_style
|
254
254
|
options << "-x --ignore-space-change" if ignore_space_change
|
255
255
|
options << "-x --ignore-all-space" if ignore_all_space
|
256
|
-
options << "| grep -v '^ '" if ignore_properties
|
257
256
|
|
258
|
-
|
259
|
-
REXML::Document.new(
|
257
|
+
diff_str = cap("svn diff --xml --summarize #{from_uri} #{to_uri} #{options.join(' ')}")
|
258
|
+
diff_list = REXML::Document.new(diff_str).elements.collect("/diff/paths/path") do |path|
|
260
259
|
OpenStruct.new({
|
261
260
|
kind: path.attribute("kind").value,
|
262
261
|
item: path.attribute("item").value,
|
@@ -264,6 +263,10 @@ module SvnCommandHelper
|
|
264
263
|
path: path.text,
|
265
264
|
})
|
266
265
|
end
|
266
|
+
if ignore_properties
|
267
|
+
diff_list.reject! {|diff| diff.item == "none"}
|
268
|
+
end
|
269
|
+
diff_list
|
267
270
|
end
|
268
271
|
|
269
272
|
# copy single transaction
|