forked from facelessuser/EasyDiff
-
Notifications
You must be signed in to change notification settings - Fork 0
/
easy_diff_version_control.py
323 lines (276 loc) · 9.84 KB
/
easy_diff_version_control.py
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
"""
Easy Diff Version Control
Copyright (c) 2013 Isaac Muse <isaacmuse@gmail.com>
License: MIT
"""
import sublime
import sublime_plugin
from os.path import basename, splitext, join
from os import sep
import EasyDiff.lib.svn as svn
import EasyDiff.lib.git as git
import EasyDiff.lib.hg as hg
from EasyDiff.lib.multiconf import get as multiget
from EasyDiff.easy_diff_global import load_settings, log, debug, get_encoding, get_external_diff
import traceback
import subprocess
import tempfile
SVN_ENABLED = False
GIT_ENABLED = False
HG_ENABLED = False
class _VersionControlDiff(sublime_plugin.TextCommand):
control_type = ""
control_enabled = False
temp_folder = None
def get_diff(self, name, **kwargs):
return None
def is_versioned(self, name):
return False
def is_enabled(self):
enabled = False
name = self.view.file_name() if self.view is not None else None
if name is not None:
try:
enabled = (
self.control_enabled and
(
multiget(load_settings(), "skip_version_check_on_is_enabled", False) or
self.is_versioned(name)
)
)
except:
pass
return enabled
def decode(self, result):
try:
debug("decoding with %s" % self.encoding)
return result.decode(self.encoding)
except:
debug("fallback to utf-8 decode")
return result.decode('utf-8')
def get_encoding(self):
return get_encoding(self.view)
def create_temp(self):
if self.temp_folder is None:
self.temp_folder = tempfile.mkdtemp(prefix="easydiff")
def get_files(name, **kwargs):
return None, None
def revert_file(self, name):
pass
def revert(self, name):
result = self.get_diff(name)
if result == "":
sublime.status_message("Nothing to Revert")
result = None
if result is not None and sublime.ok_cancel_dialog("Are you sure you want to revert \"%s\"?" % basename(name)):
try:
self.revert_file(name)
except Exception as e:
debug(e)
sublime.error_message("Could not revert \"%s\"!" % basename(name))
def internal_diff(self, name, **kwargs):
result = self.get_diff(name, **kwargs)
if result == "":
sublime.status_message("No Difference")
result = None
if result is not None:
use_buffer = bool(load_settings().get("use_buffer", False))
win = sublime.active_window()
if use_buffer:
v = win.new_file()
v.set_name("EasyDiff: %s (%s)" % (self.control_type, basename(name)))
v.set_scratch(True)
v.assign_syntax('Packages/Diff/Diff.tmLanguage')
v.run_command('append', {'characters': result})
else:
v = win.create_output_panel('easy_diff')
v.assign_syntax('Packages/Diff/Diff.tmLanguage')
v.run_command('append', {'characters': result})
win.run_command("show_panel", {"panel": "output.easy_diff"})
def external_diff(self, name, **kwargs):
self.create_temp()
f1, f2 = self.get_files(name, **kwargs)
ext_diff = get_external_diff()
debug(f1)
debug(f2)
if f1 is not None and f2 is not None:
subprocess.Popen(
[
ext_diff,
f1,
f2
]
)
def run(self, edit, **kwargs):
name = self.view.file_name() if self.view is not None else None
self.encoding = self.get_encoding()
if name is not None:
if kwargs.get("revert"):
self.revert(name)
else:
external = kwargs.get("external", False)
if not external:
self.internal_diff(name, **kwargs)
else:
self.external_diff(name, **kwargs)
class EasyDiffSvnCommand(_VersionControlDiff):
def __init__(self, edit):
super().__init__(edit)
self.control_type = "SVN"
self.control_enabled = SVN_ENABLED
def revert_file(self, name):
svn.revert(name)
def get_files(self, name, **kwargs):
f1 = None
f2 = None
if self.is_versioned(name):
f2 = name
root, ext = splitext(basename(name))
rev = None
if kwargs.get("last", False):
rev = "PREV"
f1 = join(self.temp_folder, "%s-r%s-LEFT%s" % (root, rev, ext))
else:
rev = "BASE"
f1 = join(self.temp_folder, "%s-r%s-LEFT%s" % (root, rev, ext))
svn.export(f2, f1, rev=rev)
else:
log("View not versioned under SVN!", status=True)
return f1, f2
def is_versioned(self, name):
disabled = multiget(load_settings(), "svn_disabled", False)
return not disabled and svn.is_versioned(name)
def get_diff(self, name, **kwargs):
result = None
if self.is_versioned(name):
result = self.decode(svn.diff(name, last=kwargs.get("last", False))).replace('\r', '')
else:
log("View not versioned under SVN!", status=True)
return result
class EasyDiffGitCommand(_VersionControlDiff):
def __init__(self, edit):
super().__init__(edit)
self.control_type = "GIT"
self.control_enabled = GIT_ENABLED
def revert_file(self, name):
git.checkout(name)
def get_files(self, name, **kwargs):
f1 = None
f2 = None
if self.is_versioned(name):
f2 = name
root, ext = splitext(basename(name))
rev = None
if kwargs.get("last", False):
revs = git.getrevision(f2, 2)
if revs is not None and len(revs) == 2:
rev = revs[1]
if rev is not None:
f1 = join(self.temp_folder, "%s-r%s-LEFT%s" % (root, rev, ext))
else:
rev = "HEAD"
f1 = join(self.temp_folder, "%s-r%s-LEFT%s" % (root, rev, ext))
if f1 is not None:
with open(f1, "wb") as f:
bfr = git.show(f2, rev)
if bfr != None:
f.write(bfr)
else:
f1 = None
else:
log("View not versioned under Git!", status=True)
return f1, f2
def is_versioned(self, name):
disabled = multiget(load_settings(), "git_disabled", False)
return not disabled and git.is_versioned(name)
def get_diff(self, name, **kwargs):
result = None
if git.is_versioned(name):
result = self.decode(
git.diff(
name,
last=kwargs.get("last", False)
)
).replace('\r', '')
else:
log("View not versioned under Git!", Status=True)
return result
class EasyDiffHgCommand(_VersionControlDiff):
def __init__(self, edit):
super().__init__(edit)
self.control_type = "HG"
self.control_enabled = HG_ENABLED
def revert_file(self, name):
hg.revert(name)
def get_files(self, name, **kwargs):
f1 = None
f2 = None
if self.is_versioned(name):
f2 = name
root, ext = splitext(basename(name))
rev = None
if kwargs.get("last", False):
revs = hg.getrevision(f2, 2)
if revs is not None and len(revs) == 2:
rev = revs[1]
if rev is not None:
f1 = join(self.temp_folder, "%s-r%s-LEFT%s" % (root, rev, ext))
else:
# Leave rev as None
f1 = join(self.temp_folder, "%s-r%s-LEFT%s" % (root, "BASE", ext))
if f1 is not None:
with open(f1, "wb") as f:
bfr = hg.cat(f2, rev)
if bfr != None:
f.write(bfr)
else:
f1 = None
else:
log("View not versioned under Mercurial!", status=True)
return f1, f2
def is_versioned(self, name):
disabled = multiget(load_settings(), "hg_disabled", False)
return not disabled and hg.is_versioned(name)
def get_diff(self, name, **kwargs):
result = None
if self.is_versioned(name):
result = self.decode(hg.diff(name, last=kwargs.get("last", False))).replace('\r', '')
else:
log("View not versioned under Mercurial!", status=True)
return result
def setup_vc_binaries():
global SVN_ENABLED
global GIT_ENABLED
global HG_ENABLED
settings = load_settings()
svn_path = multiget(settings, "svn", None)
git_path = multiget(settings, "git", None)
hg_path = multiget(settings, "hg", None)
if svn_path is not None and svn_path != "":
svn.set_svn_path(svn_path)
if git_path is not None and git_path != "":
git.set_git_path(git_path)
if hg_path is not None and hg_path != "":
hg.set_hg_path(hg_path)
try:
log("svn %s" % svn.version())
SVN_ENABLED = True
except:
log("svn not found or is not working!")
pass
try:
log("git %s" % git.version())
GIT_ENABLED = True
except:
log("git not found or is not working!")
pass
try:
log("hg %s" % hg.version())
HG_ENABLED = True
except:
log("hg not found or is not working!")
pass
settings.clear_on_change('reload_vc')
settings.add_on_change('reload_vc', setup_vc_binaries)
def plugin_loaded():
setup_vc_binaries()