Mercurial > hg-stable
changeset 9134:a5c060b80082
merge with crew-stable
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 14 Jul 2009 20:10:23 +0200 |
| parents | a87bc6e2a907 (current diff) d3b995dd4eab (diff) |
| children | df881932362f |
| files | mercurial/localrepo.py |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Mon Jul 13 21:55:17 2009 +0900 +++ b/mercurial/cmdutil.py Tue Jul 14 20:10:23 2009 +0200 @@ -242,7 +242,10 @@ for p in pats: kind, name = _match._patsplit(p, None) if kind is None: - globbed = glob.glob(name) + try: + globbed = glob.glob(name) + except re.error: + globbed = [name] if globbed: ret.extend(globbed) continue
--- a/mercurial/localrepo.py Mon Jul 13 21:55:17 2009 +0900 +++ b/mercurial/localrepo.py Tue Jul 14 20:10:23 2009 +0200 @@ -473,9 +473,8 @@ latest = newnodes.pop() if latest not in bheads: continue - reachable = set() - for bh in bheads: - reachable |= self.changelog.reachable(latest, bh) + minbhrev = self[min([self[bh].rev() for bh in bheads])].node() + reachable = self.changelog.reachable(latest, minbhrev) bheads = [b for b in bheads if b not in reachable] newbheads.insert(0, latest) bheads.extend(newbheads)