We are currently indexing your data, so search results may be incomplete until we finish.
Merge with stable
by
Changes to 2 files · Browse files at 310a75dc9c7d Showing diff from parent 1bdcbb219a63 9f52addd5854 Diff from another changeset...
|
@@ -685,15 +685,15 @@ self.repo)
if commandlines is None:
return
- files = self.stwidget.getChecked('MAR?!S')
- if not (files or brcmd or newbranch):
+ self.files = self.stwidget.getChecked('MAR?!S')
+ if not (self.files or brcmd or newbranch):
qtlib.WarningMsgBox(_('No files checked'),
_('No modified files checkmarked for commit'),
parent=self)
self.stwidget.tv.setFocus()
return
if len(repo.parents()) > 1:
- files = []
+ self.files = []
user = qtlib.getCurrentUsername(self, self.repo, self.opts)
if not user:
@@ -743,7 +743,7 @@ dcmd = []
cmdline = ['commit', '--repository', repo.root, '--verbose',
'--user', user, '--message='+msg]
- cmdline += dcmd + brcmd + [repo.wjoin(f) for f in files]
+ cmdline += dcmd + brcmd + [repo.wjoin(f) for f in self.files]
if len(repo.parents()) == 1:
for fname in self.opts.get('autoinc', '').split(','):
fname = fname.strip()
@@ -786,6 +786,7 @@ self.addMessageToHistory(umsg)
self.setMessage('')
if self.currentAction == 'commit':
+ shlib.shell_notify(self.files)
self.commitComplete.emit()
class DetailsDialog(QDialog):
|
||
|
@@ -57,6 +57,9 @@ shell.SHChangeNotify(shellcon.SHCNE_UPDATEITEM,
shellcon.SHCNF_IDLIST | shellcon.SHCNF_FLUSH,
pidl, None)
+ shell.SHChangeNotify(shellcon.SHCNE_ASSOCCHANGED,
+ shellcon.SHCNF_FLUSH,
+ None, None)
def update_thgstatus(ui, root, wait=False):
'''Rewrite the file .hg/thgstatus
|
||
Add a tag
Loading...