1399 if ver < 2.19: |
1399 if ver < 2.19: |
1400 msg = ("The amend option is unavailable with hg versions < 2.2\n\n" |
1400 msg = ("The amend option is unavailable with hg versions < 2.2\n\n" |
1401 "Press any key to continue.") |
1401 "Press any key to continue.") |
1402 elif opts.get('amend') is None: |
1402 elif opts.get('amend') is None: |
1403 opts['amend'] = True |
1403 opts['amend'] = True |
1404 msg = ("Amend option is turned on -- commiting the currently " |
1404 msg = ("Amend option is turned on -- committing the currently " |
1405 "selected changes will not create a new changeset, but " |
1405 "selected changes will not create a new changeset, but " |
1406 "instead update the most recently committed changeset.\n\n" |
1406 "instead update the most recently committed changeset.\n\n" |
1407 "Press any key to continue.") |
1407 "Press any key to continue.") |
1408 elif opts.get('amend') is True: |
1408 elif opts.get('amend') is True: |
1409 opts['amend'] = None |
1409 opts['amend'] = None |
1410 msg = ("Amend option is turned off -- commiting the currently " |
1410 msg = ("Amend option is turned off -- committing the currently " |
1411 "selected changes will create a new changeset.\n\n" |
1411 "selected changes will create a new changeset.\n\n" |
1412 "Press any key to continue.") |
1412 "Press any key to continue.") |
1413 if not test: |
1413 if not test: |
1414 self.confirmationwindow(msg) |
1414 self.confirmationwindow(msg) |
1415 |
1415 |
1608 try: |
1608 try: |
1609 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize) |
1609 self.chunkpad = curses.newpad(self.numpadlines, self.xscreensize) |
1610 except curses.error: |
1610 except curses.error: |
1611 self.initerr = _('this diff is too large to be displayed') |
1611 self.initerr = _('this diff is too large to be displayed') |
1612 return |
1612 return |
1613 # initialize selecteitemendline (initial start-line is 0) |
1613 # initialize selecteditemendline (initial start-line is 0) |
1614 self.selecteditemendline = self.getnumlinesdisplayed( |
1614 self.selecteditemendline = self.getnumlinesdisplayed( |
1615 self.currentselecteditem, recursechildren=False) |
1615 self.currentselecteditem, recursechildren=False) |
1616 |
1616 |
1617 while True: |
1617 while True: |
1618 self.updatescreen() |
1618 self.updatescreen() |