copytrace: remove useless sorting

Summary: It was added by mistake, let's remove it.

Test Plan: arc unit

Reviewers: #mercurial, rmcelroy

Reviewed By: rmcelroy

Differential Revision: https://phabricator.intern.facebook.com/D5155301

Tasks: 18508761

Signature: t1:5155301:1496246623:a650cbffa7edf4311f96071e57c61697dae8014e
This commit is contained in:
Stanislau Hlebik 2017-05-31 09:04:59 -07:00
parent 699e45aef6
commit 72641e2afc

View File

@ -61,8 +61,7 @@ def _promptmerge(origfunc, repo, mynode, orig, fcd, fco, *args, **kwargs):
try:
ctx1 = _getctxfromfctx(fco)
ctx2 = _getctxfromfctx(fcd)
msg = sorted([(ctx1.phase(), _gethex(ctx1)),
(ctx2.phase(), _gethex(ctx2))])
msg = [(ctx1.phase(), _gethex(ctx1)), (ctx2.phase(), _gethex(ctx2))]
reporoot = repo.origroot if util.safehasattr(repo, 'origroot') else ''
reponame = ui.config('paths', 'default', reporoot)