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 cc9cdcbb584d…

Parents 0daf64f6a97a…

Parents 7bf7897aec3c…

by Adrian Buehlmann

Changes to 11 files · Browse files at cc9cdcbb584d Showing diff from parent 0daf64f6a97a 7bf7897aec3c Diff from another changeset...

Change 1 of 1 Show Entire File doc/​source/​archive.txt Stacked
 
7
8
9
10
 
11
12
13
 
7
8
9
 
10
11
12
13
@@ -7,7 +7,7 @@
 You can choose from quite a lot of formats to make an archive of a repository.  There are the usual compressed formats. But it's also possible to make a plain  folder of files in another place than the Working Directory (it's like a clone, -but without the .hg folder). Can be useful for doing builds f.i. (think +but without the .hg folder). Can be useful for doing builds for example (think  'svn export'). One can make an archive with only the files of the selected rev.  Some people seem to use this to send changes to external people that do not have  access to the repository.
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​commit.py Stacked
 
976
977
978
979
 
 
 
 
 
 
 
976
977
978
 
979
980
981
982
983
984
@@ -976,4 +976,9 @@
  QDialog.reject(self)    def run(ui, *pats, **opts): - return CommitDialog(hglib.canonpaths(pats), opts) + from tortoisehg.util import paths + from tortoisehg.hgqt import thgrepo + repo = thgrepo.repository(ui, path=paths.find_root()) + pats = hglib.canonpaths(pats) + os.chdir(repo.root) + return CommitDialog(pats, opts)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​filelistview.py Stacked
 
139
140
141
142
143
144
145
 
139
140
141
 
142
143
144
@@ -139,7 +139,6 @@
  return   model = self.model()   pats = [filename] - rev = model._ctx.rev()   opts = {'change':model._ctx.rev()}   dlg = visdiff.visualdiff(model.repo.ui, model.repo, pats, opts)   if dlg:
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​manifestdialog.py Stacked
 
337
338
339
 
 
 
 
 
 
 
 
340
341
342
 
439
440
441
442
 
443
444
445
 
337
338
339
340
341
342
343
344
345
346
347
348
349
350
 
447
448
449
 
450
451
452
453
@@ -337,6 +337,14 @@
  # TODO   pass   + def setRepo(self, repo): + self._repo = repo + #self._fileview.setRepo(repo) + self._fileview.repo = repo + if len(repo) <= self._rev: + self._rev = len(repo)-1 + self._setupmodel() +   @property   def rev(self):   """Return current revision""" @@ -439,7 +447,7 @@
 class ManifestTaskWidget(ManifestWidget):   """Manifest widget designed for task tab"""   - def __init__(self, repo, rev=None, parent=None): + def __init__(self, repo, rev, parent):   super(ManifestTaskWidget, self).__init__(repo, rev, parent)   self.editSelected.connect(self._openInEditor)  
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​qtlib.py Stacked
 
440
441
442
443
 
444
445
446
 
440
441
442
 
443
444
445
446
@@ -440,7 +440,7 @@
  def keyPressEvent(self, event):   for k, btn in self.hotkeys.iteritems():   if event.text() == k: - btn.clicked.emit() + btn.clicked.emit(False)   super(CustomPrompt, self).keyPressEvent(event)    def setup_font_substitutions():
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​repomodel.py Stacked
 
530
531
532
 
533
534
535
536
 
 
 
537
538
539
 
530
531
532
533
534
 
 
 
535
536
537
538
539
540
@@ -530,10 +530,11 @@
  parts.append(qtlib.applyeffects(u' %s ' % branchu, effects))     for mark in ctx.bookmarks(): + style = 'log.bookmark'   if mark == self.repo._bookmarkcurrent: - style = 'log.curbookmark' - else: - style = 'log.bookmark' + bn = self.repo._bookmarks[self.repo._bookmarkcurrent] + if bn in self.repo.dirstate.parents(): + style = 'log.curbookmark'   marku = hglib.tounicode(mark)   effects = qtlib.geteffect(style)   parts.append(qtlib.applyeffects(u' %s ' % marku, effects))
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​repowidget.py Stacked
 
291
292
293
 
294
295
296
 
317
318
319
 
320
321
322
 
291
292
293
294
295
296
297
 
318
319
320
321
322
323
324
@@ -291,6 +291,7 @@
  bundle=self.bundle)   self.repoview.setRepo(self.repo)   self.revDetailsWidget.setRepo(self.repo) + self.manifestDemand.forward('setRepo', self.repo)   self.bundleAccept.setHidden(False)   self.bundleReject.setHidden(False)   self.filterbar.revsetle.setText('incoming()') @@ -317,6 +318,7 @@
  self.repo = thgrepo.repository(self.repo.ui, self.repo.root)   self.repoview.setRepo(self.repo)   self.revDetailsWidget.setRepo(self.repo) + self.manifestDemand.forward('setRepo', self.repo)     def acceptBundle(self):   self.taskTabsWidget.setCurrentIndex(self.syncTabIndex)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​status.py Stacked
 
775
776
777
 
 
 
 
 
778
 
775
776
777
778
779
780
781
782
783
@@ -775,4 +775,9 @@
  QDialog.reject(self)    def run(ui, *pats, **opts): + from tortoisehg.util import paths + from tortoisehg.hgqt import thgrepo + repo = thgrepo.repository(ui, path=paths.find_root()) + pats = hglib.canonpaths(pats) + os.chdir(repo.root)   return StatusDialog(pats, opts)
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​thgrepo.py Stacked
 
131
132
133
 
 
134
135
136
 
211
212
213
214
 
215
216
217
 
131
132
133
134
135
136
137
138
 
213
214
215
 
216
217
218
219
@@ -131,6 +131,8 @@
  def _getrepomtime(self):   'Return the last modification time for the repo'   watchedfiles = [self.repo.sjoin('00changelog.i')] + watchedfiles.append(self.repo.join('bookmarks')) + watchedfiles.append(self.repo.join('bookmarks.current'))   if hasattr(self.repo, 'mq'):   watchedfiles.append(self.repo.mq.join('series'))   watchedfiles.append(self.repo.mq.join('guards')) @@ -211,7 +213,7 @@
  deadbranches _exts _thghiddentags displayname summarylen   shortname mergetools namedbranches'''.split()  _thgrepoprops = '''_thgmqpatchnames thgmqunappliedpatches - _branchheads'''.split() + _branchheads _bookmarkcurrent'''.split()    def _extendrepo(repo):   class thgrepository(repo.__class__):
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​update.py Stacked
 
55
56
57
58
 
59
60
61
 
55
56
57
 
58
59
60
61
@@ -55,7 +55,7 @@
  for name in repo.namedbranches:   combo.addItem(name)   - tags = list(self.repo.tags()) + tags = list(self.repo.tags()) + repo._bookmarks.keys()   tags.sort(reverse=True)   for tag in tags:   combo.addItem(hglib.tounicode(tag))
Change 1 of 6 Show Entire File tortoisehg/​hgqt/​visdiff.py Stacked
 
171
172
173
174
 
175
176
177
 
417
418
419
420
 
421
422
423
 
462
463
464
 
465
466
467
 
553
554
555
556
 
557
558
559
 
564
565
566
567
 
568
569
570
 
575
576
577
578
 
579
580
581
 
171
172
173
 
174
175
176
177
 
417
418
419
 
420
421
422
423
 
462
463
464
465
466
467
468
 
554
555
556
 
557
558
559
560
 
565
566
567
 
568
569
570
571
 
576
577
578
 
579
580
581
582
@@ -171,7 +171,7 @@
     def visualdiff(ui, repo, pats, opts): - revs = opts.get('rev') + revs = opts.get('rev', [])   change = opts.get('change')     try: @@ -417,7 +417,7 @@
  callable = lambda row: self.fileSelect(row, repo, combo,   patterns, preferred)   list.currentRowChanged.connect(callable) - combo.currentIndexChanged.connect(self.toolSelect) + combo.currentIndexChanged['QString'].connect(self.toolSelect)     BB = QDialogButtonBox   bb = BB() @@ -462,6 +462,7 @@
  row = QString('%s %s' % (status, hglib.tounicode(f)))   self.list.addItem(row)   + @pyqtSlot(QString)   def toolSelect(self, tool):   'user selected a tool from the tool combo'   tool = hglib.fromunicode(tool) @@ -553,7 +554,7 @@
  args = ctx1b and self.mergeopts or self.diffopts   launchtool(self.diffpath, args, replace, False)   - def p1dirdiff(self, button): + def p1dirdiff(self):   dir1a, dir1b, dir2 = self.dirs   rev1a, rev1b, rev2 = self.revs   ctx1a, ctx1b, ctx2 = self.ctxs @@ -564,7 +565,7 @@
  parent2='', plabel2='', clabel=rev2, child=dir2)   launchtool(self.diffpath, self.diffopts, replace, False)   - def p2dirdiff(self, button): + def p2dirdiff(self):   dir1a, dir1b, dir2 = self.dirs   rev1a, rev1b, rev2 = self.revs   ctx1a, ctx1b, ctx2 = self.ctxs @@ -575,7 +576,7 @@
  parent2='', plabel2='', clabel=rev2, child=dir2)   launchtool(self.diffpath, self.diffopts, replace, False)   - def threewaydirdiff(self, button): + def threewaydirdiff(self):   dir1a, dir1b, dir2 = self.dirs   rev1a, rev1b, rev2 = self.revs   ctx1a, ctx1b, ctx2 = self.ctxs