Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.py @ 9425:6cfea6e4c892

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Martin Geisler <mg@lazybytes.net>
date Fri, 04 Sep 2009 23:34:51 +0200
parents 94114ea3503d 1444a42f6052
children dafadd7ff07e
line wrap: on
line diff
--- a/mercurial/hg.py	Fri Sep 04 22:26:57 2009 +0200
+++ b/mercurial/hg.py	Fri Sep 04 23:34:51 2009 +0200
@@ -137,10 +137,12 @@
         if update is not True:
             checkout = update
         for test in (checkout, 'default', 'tip'):
+            if test is None:
+                continue
             try:
                 uprev = r.lookup(test)
                 break
-            except LookupError:
+            except error.RepoLookupError:
                 continue
         _update(r, uprev)
 
@@ -309,10 +311,12 @@
                 if update is not True:
                     checkout = update
                 for test in (checkout, 'default', 'tip'):
+                    if test is None:
+                        continue
                     try:
                         uprev = dest_repo.lookup(test)
                         break
-                    except:
+                    except error.RepoLookupError:
                         continue
                 _update(dest_repo, uprev)