Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset 6f8ea4eab7f0…

Parents aff0628998c0…

Parents 868ccf195869…

by Steve Borho

Changes to 39 files · Browse files at 6f8ea4eab7f0 Showing diff from parent aff0628998c0 868ccf195869 Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​conf.py Stacked
 
51
52
53
54
 
55
56
57
 
51
52
53
 
54
55
56
57
@@ -51,7 +51,7 @@
 # The short X.Y version.  version = '2.0'  # The full version, including alpha/beta/rc tags. -release = '2.0.0' +release = '2.0.3'    # The language for content autogenerated by Sphinx. Refer to documentation  # for a list of supported languages.
Show Entire File i18n/​tortoisehg/​ca.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​cs.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​da.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​de.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_AU.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​en_GB.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​es.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​et.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fa.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​fr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​he.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​hu.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​it.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ja.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ko.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nb.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​nn.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​oc.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pl.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​pt_BR.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​ru.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​sv.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​tr.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​uk.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_CN.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Show Entire File i18n/​tortoisehg/​zh_TW.po Stacked
This file's diff was not loaded because this changeset is very large. Load changes
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​filedata.py Stacked
 
104
105
106
107
 
108
109
110
111
 
 
 
 
 
 
 
 
 
 
 
 
 
112
113
114
 
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
 
104
105
106
 
107
108
109
110
 
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
 
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
@@ -104,11 +104,23 @@
  try:   from mercurial import subrepo, commands   - def genSubrepoRevChangedDescription(sfrom, sto): + def genSubrepoRevChangedDescription(subrelpath, sfrom, sto):   """Generate a subrepository revision change description"""   out = []   opts = {'date':None, 'user':None, 'rev':[sfrom]} - if not sfrom: + subabspath = os.path.join(repo.root, subrelpath) + missingsub = not os.path.isdir(subabspath) + def isinitialrevision(rev): + return all([el == '0' for el in rev]) + if isinitialrevision(sfrom): + sfrom = '' + if isinitialrevision(sto): + sto = '' + if not sfrom and not sto: + sstatedesc = 'new' + out.append(_('Subrepo created and set to initial revision.') + u'\n\n') + return out, sstatedesc + elif not sfrom:   sstatedesc = 'new'   out.append(_('Subrepo initialized to revision:') + u'\n\n')   elif not sto: @@ -117,52 +129,73 @@
  return out, sstatedesc   else:   sstatedesc = 'changed' +   out.append(_('Revision has changed from:') + u'\n\n') + if missingsub: + out.append(hglib.tounicode(_('changeset: %s') % sfrom + '\n')) + else: + _ui.pushbuffer() + commands.log(_ui, srepo, **opts) + out.append(hglib.tounicode(_ui.popbuffer())) + + out.append(_('To:') + u'\n') + if missingsub: + stolog = _('changeset: %s') % sto + '\n\n' + stolog += _('Subrepository not found in working directory.') + '\n' + stolog += _('Further subrepository revision information cannot be retrieved.') + '\n' + else: + opts['rev'] = [sto]   _ui.pushbuffer()   commands.log(_ui, srepo, **opts) - out.append(hglib.tounicode(_ui.popbuffer())) - out.append(_('To:') + u'\n') - opts['rev'] = [sto] - _ui.pushbuffer() - commands.log(_ui, srepo, **opts) - stolog = _ui.popbuffer() + stolog = _ui.popbuffer() +   if not stolog:   stolog = _('Initial revision')   out.append(hglib.tounicode(stolog)) +   return out, sstatedesc     srev = ctx.substate.get(wfile, subrepo.nullstate)[1] + srepo = None   try: - sub = ctx.sub(wfile) - if isinstance(sub, subrepo.hgsubrepo): - srepo = sub._repo - sactual = srepo['.'].hex() + subabspath = os.path.join(repo.root, wfile) + if not os.path.isdir(subabspath): + sactual = ''   else: - self.error = _('Not a Mercurial subrepo, not previewable') - return + sub = ctx.sub(wfile) + if isinstance(sub, subrepo.hgsubrepo): + srepo = sub._repo + sactual = srepo['.'].hex() + else: + self.error = _('Not a Mercurial subrepo, not previewable') + return   except (util.Abort), e: - sub = ctx.p1().sub(wfile) - srepo = sub._repo   sactual = '' +   out = []   _ui = uimod.ui() - _ui.pushbuffer() - commands.status(_ui, srepo) - data = _ui.popbuffer() - if data: - out.append(_('File Status:') + u'\n') - out.append(hglib.tounicode(data)) - out.append(u'\n') + + if srepo is None or ctx.rev() is not None: + data = [] + else: + _ui.pushbuffer() + commands.status(_ui, srepo) + data = _ui.popbuffer() + if data: + out.append(_('File Status:') + u'\n') + out.append(hglib.tounicode(data)) + out.append(u'\n') +   sstatedesc = 'changed'   if ctx.rev() is not None:   sparent = ctx.p1().substate.get(wfile, subrepo.nullstate)[1] - subrepochange, sstatedesc = genSubrepoRevChangedDescription(sparent, srev) + subrepochange, sstatedesc = genSubrepoRevChangedDescription(wfile, sparent, srev)   out += subrepochange   else:   sstatedesc = 'dirty'   if srev != sactual:   subrepochange, sstatedesc = \ - genSubrepoRevChangedDescription(srev, sactual) + genSubrepoRevChangedDescription(wfile, srev, sactual)   out += subrepochange   if data:   sstatedesc += ' and dirty'
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​filedialogs.py Stacked
 
132
133
134
 
135
136
137
 
264
265
266
 
267
268
269
 
132
133
134
135
136
137
138
 
265
266
267
268
269
270
271
@@ -132,6 +132,7 @@
    def setupUi(self, o):   self.editToolbar = QToolBar(self) + self.editToolbar.setContextMenuPolicy(Qt.PreventContextMenu)   self.addToolBar(Qt.ToolBarArea(Qt.TopToolBarArea), self.editToolbar)   self.actionClose = QAction(self, shortcut=QKeySequence.Close)   self.actionReload = QAction(self, shortcut=QKeySequence.Refresh) @@ -264,6 +265,7 @@
    def setupUi(self, o):   self.editToolbar = QToolBar(self) + self.editToolbar.setContextMenuPolicy(Qt.PreventContextMenu)   self.addToolBar(Qt.ToolBarArea(Qt.TopToolBarArea), self.editToolbar)   self.actionClose = QAction(self, shortcut=QKeySequence.Close)   self.actionReload = QAction(self, shortcut=QKeySequence.Refresh)
Show Entire File tortoisehg/​hgqt/​fileview.py Stacked
(No changes)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
270
271
272
 
273
274
275
 
312
313
314
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
 
270
271
272
273
274
275
276
 
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
@@ -270,6 +270,7 @@
  sw.outgoingNodes.connect(self.setOutgoingNodes)   sw.showMessage.connect(self.showMessage)   sw.incomingBundle.connect(self.setBundle) + sw.pullCompleted.connect(self.onPullCompleted)   sw.refreshTargets(self.rev)   return sw   @@ -312,24 +313,35 @@
  self.revDetailsWidget.setRepo(self.repo)   self.manifestDemand.forward('setRepo', self.repo)   + def onPullCompleted(self): + if self.bundle: + # create a new bundlerepo instance; revision numbers may change + brepo = thgrepo.repository(self.repo.ui, self.repo.root, + bundle=self.bundle) + repo = thgrepo.repository(self.repo.ui, self.repo.root) + if len(repo) == len(brepo): + # all bundle revisions pulled + self.clearBundle() + self.reload() + else: + # refresh revset with remaining revisions + self.revset = range(len(repo), len(brepo)) + self.repo = brepo + self.repoview.setRepo(brepo) + self.revDetailsWidget.setRepo(brepo) + self.manifestDemand.forward('setRepo', brepo) + self.reload() + self.repomodel.revset = self.revset + self.repoview.resetBrowseHistory(self.revset) + self._reload_rev = self.revset[0] +   def acceptBundle(self):   self.taskTabsWidget.setCurrentIndex(self.syncTabIndex)   self.syncDemand.pullBundle(self.bundle, None) - self.clearBundle()     def pullBundleToRev(self):   self.taskTabsWidget.setCurrentIndex(self.syncTabIndex)   self.syncDemand.pullBundle(self.bundle, self.rev) - removed = [self.repo[self.rev]] - while removed: - ctx = removed.pop() - if ctx.rev() in self.revset: - self.revset.remove(ctx.rev()) - removed.extend(ctx.parents()) - self.repomodel.revset = self.revset - if not self.revset: - self.clearBundle() - self.refresh()     def rejectBundle(self):   self.clearBundle()
Change 1 of 3 Show Entire File tortoisehg/​hgqt/​sync.py Stacked
 
56
57
58
 
59
60
61
 
721
722
723
 
724
725
726
 
755
756
757
 
 
 
 
 
758
759
760
 
761
762
763
 
56
57
58
59
60
61
62
 
722
723
724
725
726
727
728
 
757
758
759
760
761
762
763
764
765
766
 
767
768
769
770
@@ -56,6 +56,7 @@
  outgoingNodes = pyqtSignal(object)   incomingBundle = pyqtSignal(QString)   showMessage = pyqtSignal(unicode) + pullCompleted = pyqtSignal()     output = pyqtSignal(QString, QString)   progress = pyqtSignal(QString, object, QString, QString, object) @@ -721,6 +722,7 @@
  self.showMessage.emit(_('Pull from %s completed') % urlu)   else:   self.showMessage.emit(_('Pull from %s aborted, ret %d') % (urlu, ret)) + self.pullCompleted.emit()   # handle file conflicts during rebase   if self.opts.get('rebase'):   if os.path.exists(self.repo.join('rebasestate')): @@ -755,9 +757,14 @@
  urlu = hglib.tounicode(url)   self.showMessage.emit(_('Finding outgoing changesets to %s...') % urlu)   if self.embedded and not self.opts.get('subrepos'): + def verifyhash(hash): + if len(hash) != 40: + return False + bad = [c for c in hash if c not in '0123456789abcdef'] + return not bad   def outputnodes(ret, data):   if ret == 0: - nodes = [n for n in data.splitlines() if len(n) == 40] + nodes = [n for n in data.splitlines() if verifyhash(n)]   if nodes:   self.outgoingNodes.emit(nodes)   self.showMessage.emit(_('%d outgoing changesets to %s') %
Change 1 of 2 Show Entire File win32/​wix/​guids.wxi Stacked
 
18
19
20
21
 
22
23
24
 
43
44
45
46
 
47
48
49
 
18
19
20
 
21
22
23
24
 
43
44
45
 
46
47
48
49
@@ -18,7 +18,7 @@
  <?define helpFolder.guid = {4B71277D-72E9-48F2-8A06-C706E9C3B4C0} ?>     <!-- i18n.wxs --> - <?define i18nFolder.guid = {F88D7B07-D61C-4EE8-9BE0-B8CB6E8A52DB} ?> + <?define i18nFolder.guid = {5191051C-742F-470E-AD76-D83C2F1EDE4E} ?>     <!-- templates.wxs -->   <?define templates.root.guid = {6A82D0BF-6878-42F3-92FD-AB39F7A97EEF} ?> @@ -43,7 +43,7 @@
  <?define Icons.guid = {34369923-9610-461C-9FB3-26CA3A139836} ?>     <!-- thg-i18n.wxs --> - <?define thgI18nFolder.guid = {55DC742A-1E22-4A6C-B090-FD1E91AB8646} ?> + <?define thgI18nFolder.guid = {BC570E20-FB79-49B8-AFEF-B4BB867EE60F} ?>     <!-- tortoisehg.wxs -->   <?define ProductUpgradeCode = {838657CF-C9EC-452D-800D-0E70FC021D0A} ?>
Change 1 of 1 Show Entire File win32/​wix/​i18n.wxs Stacked
 
5
6
7
8
 
9
10
11
 
5
6
7
 
8
9
10
11
@@ -5,7 +5,7 @@
  <?include defines.wxi ?>     <?define hg_po_langs = - da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW + da;de;el;fr;it;ja;pt_BR;ro;sv;zh_CN;zh_TW   ?>     <Fragment>
Change 1 of 1 Show Entire File win32/​wix/​thg-i18n.wxs Stacked
 
5
6
7
8
 
9
10
11
 
5
6
7
 
8
9
10
11
@@ -5,7 +5,7 @@
  <?include defines.wxi ?>     <?define thg_po_langs = - cs;da;de;en_GB;es;fa;fr;he;hr;hu;it;ja;ko;nl;nn;oc;pl;pt;pt_BR;ru;sv;tr;uk;zh_CN;zh_TW + cs;da;de;en_AU;en_GB;es;et;fa;fr;he;hr;hu;it;ja;ko;nb;nl;nn;oc;pl;pt;pt_BR;ru;sr;sv;tr;uk;zh_CN;zh_TW   ?>   <!-- lang 'ca' is used for key path -->