--- a/mercurial/patch.py Sun Sep 11 18:49:54 2011 +0200
+++ b/mercurial/patch.py Mon Sep 12 23:02:45 2011 -0500
@@ -1199,7 +1199,7 @@
m = gitre.match(x)
if not m:
continue
- if gitpatches is None:
+ if not gitpatches:
# scan whole input for git metadata
gitpatches = [('a/' + gp.path, 'b/' + gp.path, gp) for gp
in scangitpatch(lr, x)]
--- a/mercurial/ui.py Sun Sep 11 18:49:54 2011 +0200
+++ b/mercurial/ui.py Mon Sep 12 23:02:45 2011 -0500
@@ -667,9 +667,9 @@
printed.'''
if self.tracebackflag:
if exc:
- traceback.print_exception(exc[0], exc[1], exc[2])
+ traceback.print_exception(exc[0], exc[1], exc[2], file=self.ferr)
else:
- traceback.print_exc()
+ traceback.print_exc(file=self.ferr)
return self.tracebackflag
def geteditor(self):
--- a/tests/test-setdiscovery.t Sun Sep 11 18:49:54 2011 +0200
+++ b/tests/test-setdiscovery.t Mon Sep 12 23:02:45 2011 -0500
@@ -288,7 +288,7 @@
reading DAG from stdin
$ hg heads -t --template . | wc -c
- 261
+ *261 (re)
$ hg clone -b a . a
adding changesets