Opened 9 years ago

Closed 9 years ago

#13175 closed defect (fixed)

Upgrade Mercurial

Reported by: jdemeyer Owned by: tbd
Priority: critical Milestone: sage-5.2
Component: packages: standard Keywords:
Cc: Merged in: sage-5.2.beta1
Authors: Jeroen Demeyer Reviewers: Volker Braun
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Status badges

Description (last modified by jdemeyer)

The current Mercurial doesn't work fully on Solaris SPARC. Upgrading fixes this.

I added a small sanity check in spkg-install that hg log works on the mercurial spkg repository.

spkg: http://boxen.math.washington.edu/home/jdemeyer/spkg/mercurial-2.2.2.p0.spkg

mercurial-2.2.2.p0 (Jeroen Demeyer, 28 June 2012)

  • Trac #13175: upgrade to mercurial-2.2.2.
  • Remove xcode.patch, which got upstreamed.
  • Rename posix.py.patch to etc_mercurial.patch; keep the spirit of the old patch but patch a different source file.
  • Don't delete python/python2.6 and python/python in $SAGE_LOCAL/lib, this is handled by the Python spkg.

Attachments (1)

mercurial-2.2.2.p0.diff (4.7 KB) - added by jdemeyer 9 years ago.
Diff between the 1.8.4.p1 and 2.2.2.p0 spkgs. For reference / review only.

Download all attachments as: .zip

Change History (6)

comment:1 Changed 9 years ago by jdemeyer

  • Description modified (diff)

Changed 9 years ago by jdemeyer

Diff between the 1.8.4.p1 and 2.2.2.p0 spkgs. For reference / review only.

comment:2 Changed 9 years ago by jdemeyer

  • Status changed from new to needs_review

comment:3 Changed 9 years ago by vbraun

  • Reviewers set to Volker Braun
  • Status changed from needs_review to positive_review

Fixes the bus error for me!

comment:4 Changed 9 years ago by jdemeyer

And it's notably faster than the old Mercurial.

Applying all patches in the merger script, using sage-5.0.1 as a base (user CPU time):

sage-5.1.beta5:               2m4.510s
sage-5.1.beta6:               2m9.640s
sage-5.1.rc0:                2m21.850s
sage-5.1 + mercurial-2.2.2:  1m36.400s

comment:5 Changed 9 years ago by jdemeyer

  • Merged in set to sage-5.2.beta1
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.