Patchwork [23,of,24] convert: report cvsps branchpoints sorted

login
register
mail settings
Submitter Mads Kiilerich
Date Dec. 16, 2012, 10:34 p.m.
Message ID <00316b792246e61edcc0.1355697258@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/146/
State Accepted
Commit cfbd3302006624f1472aaa72dc643b05b6696e7c
Headers show

Comments

Mads Kiilerich - Dec. 16, 2012, 10:34 p.m.
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1355687458 -3600
# Node ID 00316b792246e61edcc039945f878c501e5de250
# Parent  1a139a7c00d39c1c6db281347242cd4a46f614bd
convert: report cvsps branchpoints sorted
Bryan O'Sullivan - Dec. 17, 2012, 9:10 p.m.
On Sun, Dec 16, 2012 at 2:34 PM, Mads Kiilerich <mads at kiilerich.com> wrote:

> convert: report cvsps branchpoints sorted
>

Looks good, thanks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121217/c762382c/attachment.html>

Patch

diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py
+++ b/hgext/convert/cvsps.py
@@ -810,7 +810,8 @@ 
                                   ','.join(cs.tags) or '(none)')))
             branchpoints = getattr(cs, 'branchpoints', None)
             if branchpoints:
-                ui.write(('Branchpoints: %s \n' % ', '.join(branchpoints)))
+                ui.write(('Branchpoints: %s \n' %
+                         ', '.join(sorted(branchpoints))))
             if opts["parents"] and cs.parents:
                 if len(cs.parents) > 1:
                     ui.write(('Parents: %s\n' %
diff --git a/tests/test-convert-cvsnt-mergepoints.t b/tests/test-convert-cvsnt-mergepoints.t
--- a/tests/test-convert-cvsnt-mergepoints.t
+++ b/tests/test-convert-cvsnt-mergepoints.t
@@ -116,7 +116,7 @@ 
   Author: user
   Branch: HEAD
   Tag: (none) 
-  Branchpoints: MYBRANCH1_1, MYBRANCH1 
+  Branchpoints: MYBRANCH1, MYBRANCH1_1 
   Log:
   foo.txt