forked from trogdoro/xiki
-
Notifications
You must be signed in to change notification settings - Fork 0
/
svn.rb
684 lines (558 loc) · 19.2 KB
/
svn.rb
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
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
require 'net/http'
# Note:
# This file (svn.rb) currently doesn't work. This is because
# repository.rb used to be behave as a common interface to git.rb
# and svn.rb, but was recently merged into git.rb, and made svn.rb
# no longer used.
#
# To get svn.rb to work again, merge the original
# version of repository.rb (pasted and commented at the end of
# this file) into this file. Then map the keys to use Svn
# instead of Git
#
class Svn
extend ElMixin
def self.menu action=nil, *path
if action == "list"
orig = View.window
View.to_after_bar
out = $el.shell_command_to_string("svn list")
View.to_window orig
puts out.gsub(/^/, '- ')
return
end
puts "
+ list/
+ .diff/
"
end
def self.commit comment=""
puts Tree.siblings
end
def self.jump_to_diff
find = Line.without_indent
View.handle_bar
View.to_buffer "*console: svn diff*"
View.to_top
$el.re_search_forward "^Index: #{find}"
Line.to_left
$el.recenter(0)
end
def self.diff *args
if args.empty?
Ol << "empty"
res = Console.run("svn diff -x -w", :dir=>"$tr", :sync=>true)
res.gsub!(/\r/, '')
res.gsub!(/^/, ' ||')
res.gsub!(/^ \|\|-/, ' -|')
res.gsub!(/^ \|\|\+/, ' +|')
res.gsub!(/^ \|\|Index: /, '- ')
puts res
return
end
Ol << "args: #{args}"
end
end
# class Repository
# extend ElMixin
# CODE_SAMPLES = %q<
# # Show options for the repository
# - Show options: Repository.menu
# >
# @@git_diff_options = ' -U2 '
# #@@git_diff_options = ' -U2 -w ' # -w caused a git segfault :/
# def self.svn?
# File.exists?("#{View.dir}.svn")
# end
# def self.tag to, from=nil
# unless Repository.url
# puts "Error: Repository.url isn't set!"
# return
# end
# from ||= "trunk"
# command = "svn -m \"Tag: Create #{from} tag\" cp #{Repository.url}/#{from} #{Repository.url}/#{to}"
# Console.run(command)
# end
# def self.url= url
# @@url = url
# end
# def self.url
# @@url
# end
# def self.menu project=nil
# # If no project, show all projects
# if project.nil?
# result = []
# result += (Projects.listing.map{|k, v| "#{k} - #{v}/"}.sort)
# # If current dir is in a repos, add it
# current_dir_repos = self.git_path
# result << FileTree.add_slash_maybe("current dir - #{current_dir_repos ? current_dir_repos : View.dir}")
# # If current dir isn't one, try after bar
# if ! current_dir_repos and View.bar?
# after_bar = View.dir_of_after_bar
# current_dir_repos = self.git_path(after_bar)
# result << FileTree.add_slash_maybe(
# "upper - #{current_dir_repos ? current_dir_repos : after_bar}")
# end
# result << "tmp dir - /tmp/t1/"
# return result
# end
# # If project, show options
# puts %Q[
# + .create/
# + .diff_unadded/
# + .diff_unadded :expand/
# + .diff/
# + .diff :expand/
# + .push
# + .pull
# + .log ""/
# + .log_by_file/
# + .status/
# + .status_tree/
# + .branches/
# + .stash/
# - .files/
# ].strip.gsub(/^ /, '')
# end
# # Shows revs for one file
# def self.log_by_file search, limit, project, file=nil, rev=nil, line=nil
# dir = self.extract_dir project
# if file.nil? # If no file, tell them they have to paste it
# return "- Replace this line with a path - I'm normally called via Keys.show_log_one_file"
# end
# if rev.nil? # If no rev, list all revs
# search = "-S'#{search}'" unless search.empty?
# txt = Console.run "git log -#{limit} --pretty=oneline #{search} #{file}", :sync=>true, :dir=>dir
# txt.gsub! ':', '-'
# txt.gsub! /(.+?) (.+)/, "\\2: \\1"
# txt.gsub! /^- /, ''
# return txt.gsub!(/^/, '+ ')
# #return "- TODO: show all revs"
# end
# if line.nil? # If no diff, show diff
# # File passed, show diff
# txt = Git.diff "git show #{@@git_diff_options} --pretty=oneline #{rev} #{file}", dir
# txt.sub!(/.+?@@/m, '@@')
# return txt.gsub /^/, '|'
# end
# # Line passed, so jump to it
# project.sub! /^project - /, ''
# self.jump_to_file_in_tree project
# nil
# end
# def self.log search, project, rev=nil, file=nil, line=nil
# dir = self.extract_dir project
# if rev.nil? # If no rev, list all revs
# search = "-S'#{search}'" unless search.empty?
# txt = Console.run "git log -100 --pretty=oneline #{search}", :sync=>true, :dir=>dir
# txt.gsub! ':', '-'
# txt.gsub! /(.+?) (.+)/, "\\2: \\1"
# txt.gsub! /^- /, ''
# return txt.gsub!(/^/, '+ ')
# end
# if file.nil? # If no file, show files for rev
# # Rev passed, so show all diffs
# txt = Git.diff "git show --pretty=oneline --name-status #{rev}", dir
# txt.sub! /^.+\n/, ''
# txt.gsub! /^([A-Z])\t/, "\\1: "
# txt.gsub! /^M: /, ''
# return txt.split("\n").sort.map{|l| "+ #{l}\n"}.join('')
# end
# if line.nil? # If no line but file passed, show diff
# txt = Git.diff "git show #{@@git_diff_options} --pretty=oneline #{rev} #{file}", dir
# txt.sub!(/.+?@@/m, '@@')
# txt.gsub! /^/, '|'
# puts txt
# return
# end
# # Line passed, so jump to file
# project.sub! /^project - /, ''
# self.jump_to_file_in_tree project
# nil
# end
# def self.diff_one_file
# self.git_diff_one_file
# end
# def self.git_diff_one_file
# repos = self.git_path # Get root of repos
# relative = View.file.sub(/^#{repos}/, '') # Split off root from relative path
# relative.sub! /^\//, ''
# if Keys.prefix_u :clear=>true
# return
# end
# # Insert codetree
# Launcher.open(
# "- Repository.menu/\n - project - #{repos}\n - .diff/\n - #{relative}",
# :no_search=>true
# )
# end
# def self.show_log
# dir = Keys.bookmark_as_path :prompt=>"Enter a bookmark to show the log for: "
# Launcher.open("- Repository.menu/\n - project - #{dir}\n - .log ''/")
# end
# def self.show_log_one_file
# repos = self.git_path # Get root of repos
# relative = View.file.sub(/^#{repos}/, '') # Split off root from relative path
# relative.sub! /^\//, '' # Insert codetree
# Launcher.open(
# "- Repository.menu/\n - project - #{repos}\n - .log_by_file \"\", 10/\n - #{relative}"
# )
# end
# def self.jump_to_file_in_tree dir
# orig = View.cursor
# Search.backward "^ +\|@@" unless Line.matches(/^ +\|@@/)
# inbetween = View.txt(orig, View.cursor)
# inbetween.gsub!(/^ +\|-.*\n/, '')
# inbetween = inbetween.count("\n")
# line = Line.value[/\+(\d+)/, 1]
# Search.backward "^ +[+-] "
# file = Line.without_label
# goto_char orig
# View.open("#{dir}/#{file}")
# View.to_line(line.to_i + (inbetween - 1))
# Color.colorize :l
# end
# def self.styles_define
# Styles.define :face_difflog_path_outline_rest,
# :fg => "000077",
# :bg => "7070bb",
# :font => "arial"
# # - foo (r): <here>
# Styles.define :diff_subhead,
# :bg => "333366", :fg => "88b", :size => "-3"
# end
# def self.styles
# cm_universal_diff_format
# difflog_highlight
# Styles.apply "^diff.+\n", :diff_subhead
# Styles.apply "^Index:? .+\n", :diff_subhead
# Styles.apply "^===+\n", :diff_subhead
# Styles.apply "^--- .+\n", :diff_subhead
# Styles.apply "^\\+\\+\\+ .+\n", :notes_h1
# Styles.apply "^\\\\.+", :cm_lighter_bold
# #Styles.apply "^\\*.+\n", :treels_f_blank
# Styles.apply "^@@.+\n", :diff_subhead
# end
# def self.git? dir
# git_status = Git.diff "git status", dir
# git_status !~ /^fatal: Not a git repository/
# end
# def self.git_path dir=nil
# dir ||= View.dir
# return nil unless self.git?(dir)
# dir = Console.run("git rev-parse --git-dir", :sync=>true,
# :dir=>dir
# ).sub(".git\n", '')
# dir = View.dir if dir == "" # Empty actually means it found it
# dir
# end
# def self.determine_dir dir
# self.git_path(dir)# || Bookmarks['$tr']
# end
# def self.open_list_repository
# # Figure out which dir
# dir = Keys.prefix_u? ? Bookmarks['$tr'] : self.determine_dir(View.dir)
# View.to_buffer "*repository status"
# View.clear
# View.dir = dir
# FileTree.apply_styles
# use_local_map elvar.notes_mode_map
# tree = self.status_tree_internal dir
# View.insert "- Repository.status_tree/\n#{tree.gsub(/^/, ' ')}"
# View.to_top
# Move.to_junior
# FileTree.search :recursive => true
# end
# # Called by code tree directly
# def self.status_tree project
# dir = self.extract_dir project
# dir = Bookmarks.expand(dir)
# puts CodeTree.tree_search_option + self.status_tree_internal(dir)
# end
# def self.status_tree_internal dir
# if self.svn?
# status = Console.run "svn st", :dir => dir, :sync => true
# # Remove question files
# status = status.split("\n")#.select{|l| l !~ /^\?/}
# status = status.each{|l| l.sub!(/^. +/, dir)}
# FileTree.paths_to_tree(status)
# else # git
# status = Console.run "git status", :dir => dir, :sync => true
# # Grab out modified:...
# found = status.scan(/^#\s+modified: +(.+)/)
# result = []
# found.each do |m|
# result << "#{dir}#{m[0]}"
# end
# FileTree.paths_to_tree(result)
# end
# end
# def self.clean! txt
# txt.gsub!(/^ ?index .+\n/, '')
# txt.gsub!(/^ ?--- .+\n/, '')
# txt.gsub!(/^ ?\+\+\+ .+\n/, '')
# end
# def self.extract_dir project
# project.sub(/.+? - /, '').sub(/\/$/, '')
# end
# def self.status project, file=nil
# dir = self.extract_dir project
# #dir ||= self.determine_dir
# if file.nil?
# return Git.status dir
# end
# View.open("#{dir}/#{file}") # If file, open it
# end
# def self.diff_unadded *args
# expand = args.shift if args.first.is_a? Symbol # Pull out :expand if 1st arg
# project, file, line = args
# dir = self.extract_dir project
# if self.git?(dir)
# self.git_diff_unadded(expand, dir, file, line)
# else
# self.svn_diff_unadded(dir, file)
# end
# end
# def self.git_diff_unadded expand, dir, file, line
# self.git_diff_or_diff_unadded true, expand, dir, file, line
# end
# def self.diff *args
# # Parse args
# expand = args.shift if args.first.is_a? Symbol # Pull out :expand if 2nd arg
# project, file, line = args
# dir = self.extract_dir project
# if self.git?(dir)
# self.git_diff expand, dir, file, line
# else
# self.svn_diff expand, dir, file, line
# end
# end
# def self.git_diff expand, dir, file, line
# self.git_diff_or_diff_unadded false, expand, dir, file, line
# end
# def self.git_diff_or_diff_unadded is_unadded, expand, dir, file, line
# if file.nil? # If launching .diff/.diff_unadded directly (not a file)
# txt = Console.run "git status", :dir=>dir, :sync=>true
# hash = Git.status_to_hash(Git.status_internal(txt))
# untracked = hash[:untracked].map{|i| i[1]}
# untracked.map!{|i| "+ untracked#{is_unadded ? '' : ' (ignore)'}: #{i}\n"}
# option = is_unadded ? "- action: .add\n" : "- action: .commit \"message\"\n"
# if expand # If showing diffs right away
# txt = Git.diff "git diff --patience --relative #{self.git_diff_options}#{is_unadded ? '' : ' HEAD'}", dir
# if txt =~ /^fatal: ambiguous argument 'HEAD': unknown revision/
# txt = "- Warning: Couldn't diff because no revisions exist yet in repository\n" +
# " - Try using: .diff/ (without :expand)\n"
# else
# unless txt.empty?
# self.clean! txt
# txt.gsub!(/^/, ' |')
# txt.gsub!(/^ \| ?diff --git .+ b\//, '- ')
# end
# end
# else # If just showing list of files
# if is_unadded # If unadded, simply use unadded
# txt = hash[:unadded].map{|i| "+ #{i[1]}\n"}.join('')
# else # If added, use added + unadded - dups
# txt = (hash[:unadded].map{|i| "+ #{i[1]}\n"} +
# hash[:added].map{|i| "+ #{i[1]}\n"}).sort.uniq.join('')
# end
# end
# # Add labels back
# if is_unadded # If unadded, add labels from added (if they exist there)
# hash[:added].each {|i| txt.sub! /^([+-]) #{i[1]}$/, "\\1 #{i[0]}: #{i[1]}"}
# else # If added, add your label also unadded (or special)
# unadded = hash[:unadded].map{|i| i[1]}
# hash[:added].each do |i|
# # Only add label if file is also unadded, or if label isn't 'modified'
# next unless unadded.member?(i[1]) or i[0] != 'modified'
# txt.sub! /^([+-]) #{i[1]}$/, "\\1 #{i[0]}: #{i[1]}"
# end
# end
# txt << untracked.join("")
# txt = "- Warning: nothing to show" if ! txt.any?
# return CodeTree.no_search_option + option + txt
# end
# if line.nil? # If no line passed, re-do diff for 1 file
# # If untracked, show whole file
# if Line.label =~ /^untracked/
# return "|@@ +1\n" + IO.read(Bookmarks.expand("#{dir}/#{file}")).gsub(/^/, '|+').gsub("\c@", '.')
# end
# txt = is_unadded ?
# Git.diff("git diff --patience --relative #{self.git_diff_options} #{file}", dir) :
# Git.diff("git diff --patience --relative #{self.git_diff_options} HEAD #{file}", dir)
# self.clean! txt
# txt.gsub!(/^ ?diff .+\n/, '')
# txt.gsub!(/^/, '|')
# return puts(txt)
# end
# # If line passed, jump to it
# self.jump_to_file_in_tree dir
# nil
# end
# def self.push project
# dir = self.extract_dir project
# Console.run "git push origin master", :dir=>dir
# nil
# end
# def self.pull project
# dir = self.extract_dir project
# Console.run "git pull origin master", :dir=>dir
# nil
# end
# def self.code_tree_diff options={}
# dir = Keys.bookmark_as_path :prompt=>"Enter a bookmark to push: "
# prefix = Keys.prefix
# expand = prefix == :uu ? "" : ", :expand"
# menu = "- Repository.menu/\n - project - #{dir}\n - .diff#{expand}/"
# if options[:enter]
# View.insert(menu)
# Launcher.launch
# else
# View.bar if prefix == 9
# Launcher.open(menu)
# end
# end
# def self.code_tree_diff_unadded options={}
# dir = Keys.bookmark_as_path
# menu = "- Repository.menu/\n - project - #{dir}\n - .diff_unadded :expand/"
# if options[:enter]
# View.insert(menu)
# Launcher.launch
# else
# Launcher.open(menu)
# end
# end
# def self.svn_diff_unadded dir, file
# children = CodeTree.children || []
# if file # If file passed, just open it
# View.open("#{dir}/#{file}")
# return
# end
# if children.nonempty? # If children, add them
# children = children.map{|c| c.sub(/^ +[+-] /, '')}.join(" ")
# txt = Console.run("svn add #{children}", :dir => dir)
# return
# end
# # If no children, show ones to be added
# txt = Console.run("svn status", :dir => dir, :sync => true)
# return txt.scan(/^\? +(.+)/)
# end
# def self.svn_diff expand, dir, file, line, children
# if file.nil? # If launching .commit directly (no file)
# if expand
# txt = Console.run("svn diff #{file}", :sync => true, :dir => dir)
# txt.gsub!(/^===+\n/, '')
# txt.gsub!(/^--- .+\n/, '')
# txt.gsub!(/^\+\+\+ .+\n/, '')
# txt.gsub!(/^/, ' |')
# txt.gsub!(/^ \|Index: /, '- ')
# return txt
# else
# txt = Console.run "svn status", :dir=>dir, :sync=>true
# modified = txt.scan(/^M +(.+)/).map{|i| i.first}
# new_files = txt.scan(/^A +(.+)/).map{|i| "new: " + i.first}
# return new_files + modified
# end
# end
# if line.nil? # If no line passed, re-do diff for 1 file
# txt = Console.run("svn diff #{file}", :sync => true, :dir => dir)
# txt.gsub!(/^Index: .+\n/, '')
# txt.gsub!(/^===+\n/, '')
# txt.gsub!(/^--- .+\n/, '')
# txt.gsub!(/^\+\+\+ .+\n/, '')
# txt.gsub!(/^/, '|')
# return txt
# end
# self.jump_to_file_in_tree dir # If line passed, jump to it
# nil # Be sure to have no return value
# end
# def self.add project
# dir = self.extract_dir project
# siblings = Tree.siblings
# # Error if no siblings
# unless siblings.any?
# return "- No files to add (they should be siblings of .add)!"
# end
# if self.git?(dir)
# Console.run("git add #{siblings.join(' ')}", :dir=>dir)
# else
# Console.run("svn add #{siblings.join(' ')}", :dir=>dir)
# end
# end
# def self.commit message, project
# dir = self.extract_dir project
# siblings = Tree.siblings :include_label=>true
# left1, right1, left2, right2 = Tree.sibling_bounds
# # Remove "untracked (ignore)"
# siblings = siblings.select{|i| i !~ /^. untracked \(ignore\)/}.map{|i| Line.without_label(:line=>i)}
# if message == 'message' # Error if no siblings
# return "- Error: You must change 'message' to be your commit message." if message == "message"
# end
# unless siblings.any?
# return "- Error: No files to commit\n" +
# " - They should be siblings of .commit, and already be added."
# end
# if self.git?(dir)
# Console.run "git commit -m \"#{message}\" #{siblings.join(' ')}", :dir=>dir#, :no_enter=>true
# else
# Console.run "svn ci -m \"#{message}\" #{siblings.join(' ')}", :dir=>dir
# end
# end
# def self.create project
# "
# - #{self.extract_dir(project)}/
# - create: ! git init
# - make test files: ! echo 'a\\na\\na' > a.txt; echo 'b\\nb\\nb' > b.txt
# - add files: ! git add .
# - commit: ! git commit -m \"First commit.\"
# "
# end
# # def self.initialize project
# # dir = self.extract_dir project
# # # Create dir if not there
# # Dir.mkdir(dir) if not File.directory?(dir)
# # Console.run("git init", :dir => dir)
# # nil
# # end
# def self.files project
# "- #{self.extract_dir(project)}/"
# end
# def self.branches project
# "
# - #{self.extract_dir(project)}/
# - list branches:
# ! git branch
# ! git branch -r
# - create branch:
# ! git branch foo
# - switch to:
# ! git checkout foo
# - delete:
# ! git branch -d foo
# - switch to main branch:
# ! git checkout master
# - delete remote branch:
# ! git push origin :my_branch
# "
# end
# def self.stash project
# "
# - #{self.extract_dir(project)}/
# - Temporarily put away uncommitted changes:
# ! git stash
# - Restore uncommitted changes:
# ! git stash apply
# ! git stash pop
# - list: ! git stash list
# - files: ! git stash show
# - diff: ! git stash show --patience
# "
# end
# def self.git_diff_options
# @@git_diff_options + (Keys.prefix_u ? ' --color-words ' : '')
# # Doesn't work:
# # + (Keys.prefix_uu ? ' --name-only ' : '')
# end
# end
# Repository.styles_define