Mercurial > hg

changeset 6409:47f4a47161b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 30 Mar 2008 20:31:35 +0200
parents 3f5f23ba18bc (diff) 1a726377c312 (current diff)
children 644a56c7ae79
files
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun Mar 30 20:25:22 2008 +0200
+++ b/mercurial/localrepo.py	Sun Mar 30 20:31:35 2008 +0200
@@ -2075,7 +2075,7 @@
         l = fp.readline()
         try:
             total_files, total_bytes = map(int, l.split(' ', 1))
-        except ValueError, TypeError:
+        except (ValueError, TypeError):
             raise util.UnexpectedOutput(
                 _('Unexpected response from remote server:'), l)
         self.ui.status(_('%d files to transfer, %s of data\n') %
--- a/mercurial/repair.py	Sun Mar 30 20:25:22 2008 +0200
+++ b/mercurial/repair.py	Sun Mar 30 20:31:35 2008 +0200
@@ -72,7 +72,6 @@
 def strip(ui, repo, node, backup="all"):
     cl = repo.changelog
     # TODO delete the undo files, and handle undo of merge sets
-    pp = cl.parents(node)
     striprev = cl.rev(node)
 
     # Some revisions with rev > striprev may not be descendants of striprev.