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
|
import re
from .. import cmds
from .. import core
from .. import gitcmds
from .. import utils
from ..i18n import N_
from ..git import STDOUT
from ..interaction import Interaction
class StashModel:
def __init__(self, context):
self.context = context
self.git = context.git
self.model = model = context.model
if not model.initialized:
model.update_status()
def stash_list(self, *args):
return self.git.stash('list', *args)[STDOUT].splitlines()
def is_staged(self):
return bool(self.model.staged)
def is_changed(self):
model = self.model
return bool(model.modified or model.staged)
def stash_info(self, revids=False, names=False):
"""Parses "git stash list" and returns a list of stashes."""
stashes = self.stash_list(r'--format=%gd/%aD/%gs')
split_stashes = [s.split('/', 2) for s in stashes if s]
stashes = [f'{s[0]}: {s[2]}' for s in split_stashes]
revids = [s[0] for s in split_stashes]
author_dates = [s[1] for s in split_stashes]
names = [s[2] for s in split_stashes]
return stashes, revids, author_dates, names
def stash_diff(self, rev):
git = self.git
diffstat = git.stash('show', rev)[STDOUT]
diff = git.stash('show', '-p', '--no-ext-diff', rev)[STDOUT]
return diffstat + '\n\n' + diff
class ApplyStash(cmds.ContextCommand):
def __init__(self, context, stash_index, index, pop):
super().__init__(context)
self.stash_ref = 'refs/' + stash_index
self.index = index
self.pop = pop
def do(self):
ref = self.stash_ref
pop = self.pop
if pop:
action = 'pop'
else:
action = 'apply'
if self.index:
args = [action, '--index', ref]
else:
args = [action, ref]
status, out, err = self.git.stash(*args)
if status == 0:
Interaction.log_status(status, out, err)
else:
title = N_('Error')
cmdargs = core.list2cmdline(args)
Interaction.command_error(title, 'git stash ' + cmdargs, status, out, err)
self.model.update_status()
class DropStash(cmds.ContextCommand):
def __init__(self, context, stash_index):
super().__init__(context)
self.stash_ref = 'refs/' + stash_index
def do(self):
git = self.git
status, out, err = git.stash('drop', self.stash_ref)
if status == 0:
Interaction.log_status(status, out, err)
match = re.search(r'\((.*)\)', out)
if match:
return match.group(1)
return ''
title = N_('Error')
Interaction.command_error(
title, 'git stash drop ' + self.stash_ref, status, out, err
)
return ''
class SaveStash(cmds.ContextCommand):
def __init__(self, context, stash_name, keep_index):
super().__init__(context)
self.stash_name = stash_name
self.keep_index = keep_index
def do(self):
if self.keep_index:
args = ['push', '--keep-index', '-m', self.stash_name]
else:
args = ['push', '-m', self.stash_name]
status, out, err = self.git.stash(*args)
if status == 0:
Interaction.log_status(status, out, err)
else:
title = N_('Error')
cmdargs = core.list2cmdline(args)
Interaction.command_error(title, 'git stash ' + cmdargs, status, out, err)
self.model.update_status()
class RenameStash(cmds.ContextCommand):
"""Rename the stash"""
def __init__(self, context, stash_index, stash_name):
super().__init__(context)
self.context = context
self.stash_index = stash_index
self.stash_name = stash_name
def do(self):
# Drop the stash first and get the returned ref
ref = DropStash(self.context, self.stash_index).do()
# Store the stash with a new name
if ref:
args = ['store', '-m', self.stash_name, ref]
status, out, err = self.git.stash(*args)
if status == 0:
Interaction.log_status(status, out, err)
else:
title = N_('Error')
cmdargs = core.list2cmdline(args)
Interaction.command_error(
title, 'git stash ' + cmdargs, status, out, err
)
else:
title = N_('Error Renaming Stash')
msg = N_('"git stash drop" did not return a ref to rename.')
Interaction.critical(title, message=msg)
self.model.update_status()
class StashIndex(cmds.ContextCommand):
"""Stash the index away"""
def __init__(self, context, stash_name):
super().__init__(context)
self.stash_name = stash_name
def do(self):
# Manually create a stash representing the index state
context = self.context
git = self.git
name = self.stash_name
branch = gitcmds.current_branch(context)
head = gitcmds.rev_parse(context, 'HEAD')
message = f'On {branch}: {name}'
# Get the message used for the "index" commit
status, out, err = git.rev_list('HEAD', '--', oneline=True, n=1)
if status != 0:
stash_error('rev-list', status, out, err)
return
head_msg = out.strip()
# Create a commit representing the index
status, out, err = git.write_tree()
if status != 0:
stash_error('write-tree', status, out, err)
return
index_tree = out.strip()
status, out, err = git.commit_tree(
'-m', f'index on {branch}: {head_msg}', '-p', head, index_tree
)
if status != 0:
stash_error('commit-tree', status, out, err)
return
index_commit = out.strip()
# Create a commit representing the worktree
status, out, err = git.commit_tree(
'-p', head, '-p', index_commit, '-m', message, index_tree
)
if status != 0:
stash_error('commit-tree', status, out, err)
return
worktree_commit = out.strip()
# Record the stash entry
status, out, err = git.update_ref(
'-m', message, 'refs/stash', worktree_commit, create_reflog=True
)
if status != 0:
stash_error('update-ref', status, out, err)
return
# Sync the worktree with the post-stash state. We've created the
# stash ref, so now we have to remove the staged changes from the
# worktree. We do this by applying a reverse diff of the staged
# changes. The diff from stash->HEAD is a reverse diff of the stash.
patch = utils.tmp_filename('stash')
with core.xopen(patch, mode='wb') as patch_fd:
status, out, err = git.diff_tree(
'refs/stash', 'HEAD', '--', binary=True, _stdout=patch_fd
)
if status != 0:
stash_error('diff-tree', status, out, err)
return
# Apply the patch
status, out, err = git.apply(patch)
core.unlink(patch)
ok = status == 0
if ok:
# Finally, clear the index we just stashed
git.reset()
else:
stash_error('apply', status, out, err)
self.model.update_status()
def stash_error(cmd, status, out, err):
title = N_('Error creating stash')
Interaction.command_error(title, cmd, status, out, err)
|
