Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 27 Apr 2009 18:35:45 +0100
changeset 539 c04db4a88523
parent 537 37a22db17285 (current diff)
parent 538 db71342ad29d (diff)
child 541 69c9e89471ae
Merge with stable
--- a/hgkw/keyword.py	Sun Apr 26 15:04:03 2009 +0100
+++ b/hgkw/keyword.py	Mon Apr 27 18:35:45 2009 +0100
@@ -379,7 +379,7 @@
     kwt = kwtools['templater']
     status = _status(ui, repo, kwt, opts.get('untracked'), *pats, **opts)
     modified, added, removed, deleted, unknown, ignored, clean = status
-    files = util.sort(modified + added + clean + unknown)
+    files = sorted(modified + added + clean + unknown)
     wctx = repo[None]
     kwfiles = [f for f in files if kwt.iskwfile(f, wctx.flags)]
     cwd = pats and repo.getcwd() or ''