Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.2, 1.9.3, and 2.0

rejects: make 'rejects' a thg command, and 'unshelve' and alias for 'shelve'

And fix the description for shelve.

Changeset 413c98846035…

Parent 677251ebf5f2…

by Steve Borho

Changes to 2 files · Browse files at 413c98846035 Showing diff from parent 677251ebf5f2 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​rejects.py Stacked
 
224
225
226
227
228
229
230
231
 
 
 
 
 
 
 
 
232
 
224
225
226
 
 
 
 
 
227
228
229
230
231
232
233
234
235
@@ -224,9 +224,12 @@
  self.markerAdd(i, self.removedColor)    def run(ui, *pats, **opts): - 'for testing purposes only' - from tortoisehg.util import paths - from tortoisehg.hgqt import thgrepo - repo = thgrepo.repository(ui, path=paths.find_root()) - dlg = RejectsDialog(pats[0], None) + if len(pats) != 1: + qtlib.ErrorMsgBox(_('Filename required'), + _('You must provide the path to a file')) + import sys; sys.exit() + path = pats[0] + if path.endswith('.rej'): + path = path[:-4] + dlg = RejectsDialog(path, None)   return dlg
Change 1 of 2 Show Entire File tortoisehg/​hgqt/​run.py Stacked
 
557
558
559
560
 
561
562
563
 
 
 
 
 
564
565
566
 
1007
1008
1009
1010
 
 
1011
1012
1013
 
557
558
559
 
560
561
562
563
564
565
566
567
568
569
570
571
 
1012
1013
1014
 
1015
1016
1017
1018
1019
@@ -557,10 +557,15 @@
  return qtrun(run, ui, *pats, **opts)    def shelve(ui, *pats, **opts): - """browse working copy status""" + """Move changes between working directory and patches"""   from tortoisehg.hgqt.shelve import run   return qtrun(run, ui, *pats, **opts)   +def rejects(ui, *pats, **opts): + """Manually resolve rejected patch chunks""" + from tortoisehg.hgqt.rejects import run + return qtrun(run, ui, *pats, **opts) +  def tag(ui, *pats, **opts):   """tag tool"""   from tortoisehg.hgqt.tag import run @@ -1007,7 +1012,8 @@
  ('', 'remove', None, _('remove a tag')),   ('m', 'message', '', _('use <text> as commit message')),],   _('thg tag [-f] [-l] [-m TEXT] [-r REV] [NAME]')), - "shelve": (shelve, [], _('thg shelve')), + "shelve|unshelve": (shelve, [], _('thg shelve')), + "rejects": (rejects, [], _('thg rejects [FILE]')),   "test": (test, [], _('thg test')),   "help": (help_, [], _('thg help [COMMAND]')),   "^purge": (purge, [], _('thg purge')),