FFe: Sync tortoisehg 1.1.1-1 (universe) from Debian unstable (main)

Bug #651514 reported by Dean Matzkov
36
This bug affects 5 people
Affects Status Importance Assigned to Milestone
tortoisehg (Ubuntu)
Fix Released
Medium
Unassigned

Bug Description

Description:
Please sync tortoisehg 1.1.1-1 (universe) from Debian unstable (main)

Explanation of FeatureFreeze exception:
Current tortoisehg doesn't work with Mercurial 1.6.x

Upstream Changelog:
TortoiseHg 1.1.1

Released July 12, 2010

This is a bug fix release. All 1.1 users are recommended to upgrade.
Packaged Versions

    Mercurial 1.6 + 23 stable changesets (6f44bd4cc4f2). hg will report version 1.6.1023

Bug Fixes

    #1340 - traceback from commit tool when viewing a subrepo
    #1344 - new help texts missing from installer
    #1345 - guess renames was broken by API change in Mercurial
    #1359 - thgpbranch was not expecting ui labels

Improvements

    Use Mercurial 1.6 optimized code to find file copies
    Overlays will recognize when files need manual inspection
    #1367 - Allow (R)emoved files to be added again (un-forget)

Installer

    Fixes to wincolor extension

TortoiseHg 1.1

Released July 1, 2010

This is a major feature release.
Packaged Versions

    Mercurial 1.6

Enhancements
Undo/Redo in text editor panes

Commit, email, and backout edit panes now support CTRL-Z/CTRL-R undo/redo (#1088)
Rollback description

Mercurial 1.6 adds transaction descriptions that provide an indication of what will be rolled back. The commit tool uses this data to allow the "Undo" feature to always be available if the last transaction was a commit (essentially allowing undo to survive commit tool restarts). The recovery tool uses this information to give better feedback of what will be rolled back. (#1151)
Color highlighting

In Mercurial 1.6, the color extension works natively on Windows consoles (cmd.exe). TortoiseHg also gets color markups directly from Mercurial so it can colorize it's output in command consoles and other windows. One notable example is the highlighting of search matches in the datamining tool. (#1122, #1156)
Support for pbranch extension

The Repository Explorer now has intrinsic support for the "patch branch" extension. See http://arrenbrecht.ch/mercurial/pbranch/
Bug fixes

    #1322, #1288, #1262, #1113 - status, chunks: try harder to prevent display of binary diffs
    #1317 - status: give name to exception
    #1303 - shelve: catch IOError from recovering backup files
    #1301 - status: do not add empty chunk lists to self.filechunks
    #1267, #1289 - commit: catch errors in refresh thread
    #1004 - history: fix display of tags and branch names with underscores
    #993 - shellext: fix tortoise icon in shell context menu on XP
    #969 - history, etc: add workarounds for all tracebacks reported in #969
    #937 - shellext: disable cmenu on "virtual" unavailable folders
    #240, #1169 - untruncatable Windows' hidden files

Minor Improvements

Repository Explorer:

    Show currently active filter type in window title
    #1208 - support for push --new-branch
    #1092 - highlight branch heads in graph
    #1033 - support import of SVN patches (-p0)

DataMine:

    #1229, #994 - improve handling of file patterns
    #732 - diff to local file

Commit:

    #1310 - status: add annotation to context menu
    #1309 - status: rename 'Log' context menu entry to 'File History'
    #1240 - optional auto-close after commit
    #1186 - allow 'guess renames' for added files
    #1084 - improve messages in branch dialogs

Shelve:

    #700 - Abandon shelf operation
    Improve error handling in general

General:

    #1294 - support for iniparse 0.4
    #1158 - progress bar for recovery tool
    #1020 - repo name and hashes available as visual diff labels
    Configure extensions from user settings tool
    Explorer overlays are now configurable

Installer Changes

    wincolor is obsolete, will be removed in the next release. In this release, it simply loads color.py
    unbundle pyreadline, no longer needed by wincolor
    bundle nntplib
    update to TortoiseOverlays 1.1.2

Debian Changelog entries since current maverick version 1.0.4-1:

tortoisehg (1.1.1-1) unstable; urgency=low

  * New upstream release.
  * Set minimum mercurial dependecy to version 1.6 (Closes: #589503).

 -- Ludovico Cavedon <email address hidden> Sun, 18 Jul 2010 16:41:12 +0200

tortoisehg (1.1-1) unstable; urgency=low

  * New upstream release.
  * Update copyright file.
  * Update Standards-Version to 3.9.0.

 -- Ludovico Cavedon <email address hidden> Fri, 02 Jul 2010 18:19:44 +0200

Tags: mercurial
Revision history for this message
Ludovico Cavedon (cavedon) wrote :

Mercurial was synced from Debian experimental 3 weeks ago. Therefore also tortoisehg need to be synced from Debian experimental.

Changed in tortoisehg (Ubuntu):
status: New → Confirmed
tags: added: mercurial
Revision history for this message
Micah Gersten (micahg) wrote :

Resetting to New awaiting freeze approval

summary: - tortoisehg-1.0.4 requires mercurial 1.4.x to 1.5.x, but only v1.6.3 is
- in the repos
+ FFe: Sync tortoisehg 1.1.1-1 (universe) from Debian unstable (main)
description: updated
Changed in tortoisehg (Ubuntu):
importance: Undecided → Medium
status: Confirmed → New
Revision history for this message
Micah Gersten (micahg) wrote :
Revision history for this message
Colin Watson (cjwatson) wrote :

FFe granted, and consider this a sponsor ack too. Subscribing archive team.

Changed in tortoisehg (Ubuntu):
status: New → Confirmed
Revision history for this message
Colin Watson (cjwatson) wrote :

2010-10-05 20:53:01 INFO - <tortoisehg_1.1.1.orig.tar.gz: downloading from http://ftp.debian.org/debian/>
[Updating] tortoisehg (1.0.4-1 [Ubuntu] < 1.1.1-1 [Debian])
 * Trying to add tortoisehg...
2010-10-05 20:53:03 INFO - <tortoisehg_1.1.1-1.dsc: downloading from http://ftp.debian.org/debian/>
2010-10-05 20:53:03 INFO - <tortoisehg_1.1.1-1.debian.tar.gz: downloading from http://ftp.debian.org/debian/>
I: tortoisehg [universe] -> tortoisehg_1.0.4-1 [universe].
I: tortoisehg [universe] -> tortoisehg-nautilus_1.0.4-1 [universe].

Changed in tortoisehg (Ubuntu):
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.