From a159000a3db1762da919b01115654317c05391b8 Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Sun, 31 Jul 2005 18:03:46 -0800 Subject: [PATCH] Attempt to yield names in sorted order when walking. This is an improvement in behaviour, but the walk and changes code still has some flaws that make sorted name presentation difficult: - changes returns tuples of names, instead of a sorted list of (name, status) pairs. - walk yields deleted names after all others. --- mercurial/hg.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mercurial/hg.py b/mercurial/hg.py index f0ee0b16a6..98a7c7a7e3 100644 --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -458,13 +458,17 @@ class dirstate: ds = os.path.join(nd, sd +'/') if self.ignore(ds) or not match(ds): subdirs.remove(sd) + subdirs.sort() + fl.sort() for fn in fl: fn = util.pconvert(os.path.join(d, fn)) yield 'f', fn else: yield 'f', f[len(self.root) + 1:] - for k in dc.keys(): + ks = dc.keys() + ks.sort() + for k in ks: yield 'm', k # yield only files that match: all in dirstate, others only if