--- a/contrib/win32/win32-build.txt Fri Jul 17 11:52:53 2009 -0500
+++ b/contrib/win32/win32-build.txt Mon Jul 20 19:15:44 2009 -0500
@@ -21,6 +21,9 @@
The py2exe distutils extension
http://sourceforge.net/projects/py2exe/
+ GnuWin32 gettext utility
+ http://gnuwin32.sourceforge.net/packages/gettext.htm
+
Inno Setup
http://www.jrsoftware.org/isinfo.php
--- a/hgext/graphlog.py Fri Jul 17 11:52:53 2009 -0500
+++ b/hgext/graphlog.py Mon Jul 20 19:15:44 2009 -0500
@@ -22,9 +22,11 @@
ASCIIDATA = 'ASC'
-def asciiformat(ui, repo, revdag, opts):
+def asciiformat(ui, repo, revdag, opts, parentrepo=None):
"""formats a changelog DAG walk for ASCII output"""
- showparents = [ctx.node() for ctx in repo[None].parents()]
+ if parentrepo is None:
+ parentrepo = repo
+ showparents = [ctx.node() for ctx in parentrepo[None].parents()]
displayer = show_changeset(ui, repo, opts, buffered=True)
for (id, type, ctx, parentids) in revdag:
if type != graphmod.CHANGESET:
@@ -341,7 +343,7 @@
chlist = other.changelog.nodesbetween(incoming, revs)[0]
revdag = graphrevs(other, chlist, opts)
- fmtdag = asciiformat(ui, repo, revdag, opts)
+ fmtdag = asciiformat(ui, other, revdag, opts, parentrepo=repo)
ascii(ui, asciiedges(fmtdag))
finally:
--- a/mercurial/windows.py Fri Jul 17 11:52:53 2009 -0500
+++ b/mercurial/windows.py Mon Jul 20 19:15:44 2009 -0500
@@ -41,6 +41,7 @@
limit = 16000
l = len(s)
start = 0
+ self.softspace = 0;
while start < l:
end = start + limit
self.fp.write(s[start:end])
--- a/tests/test-demandimport.py Fri Jul 17 11:52:53 2009 -0500
+++ b/tests/test-demandimport.py Mon Jul 20 19:15:44 2009 -0500
@@ -36,5 +36,5 @@
print "fred =", f(fred)
print "re =", f(re)
-print "re.stdout =", f(re.stdout)
+print "re.stderr =", f(re.stderr)
print "re =", f(re)
--- a/tests/test-demandimport.py.out Fri Jul 17 11:52:53 2009 -0500
+++ b/tests/test-demandimport.py.out Mon Jul 20 19:15:44 2009 -0500
@@ -11,5 +11,5 @@
fred.sub = <function sub at 0x?>
fred = <proxied module 're'>
re = <unloaded module 'sys'>
-re.stdout = <open file '<stdout>', mode 'w' at 0x?>
+re.stderr = <open file '<stderr>', mode 'w' at 0x?>
re = <proxied module 'sys'>
--- a/tests/test-glog Fri Jul 17 11:52:53 2009 -0500
+++ b/tests/test-glog Mon Jul 20 19:15:44 2009 -0500
@@ -169,6 +169,6 @@
cd ..
hg clone -U -r31 repo repo2
cd repo2
-hg incoming -q --graph
+hg incoming --graph ../repo
cd ..
hg -R repo outgoing --graph repo2
--- a/tests/test-glog.out Fri Jul 17 11:52:53 2009 -0500
+++ b/tests/test-glog.out Mon Jul 20 19:15:44 2009 -0500
@@ -581,13 +581,33 @@
adding manifests
adding file changes
added 31 changesets with 31 changes to 1 files
-o 34:fea3ac5810e0
-|
-| o 33:68608f5145f9
+comparing with ../repo
+searching for changes
+o changeset: 34:fea3ac5810e0
+| tag: tip
+| parent: 32:d06dffa21a31
+| user: test
+| date: Thu Jan 01 00:00:34 1970 +0000
+| summary: (34) head
|
-o 32:d06dffa21a31
+| o changeset: 33:68608f5145f9
+| parent: 18:1aa84d96232a
+| user: test
+| date: Thu Jan 01 00:00:33 1970 +0000
+| summary: (33) head
|
-o 27:886ed638191b
+o changeset: 32:d06dffa21a31
+| parent: 27:886ed638191b
+| parent: 31:621d83e11f67
+| user: test
+| date: Thu Jan 01 00:00:32 1970 +0000
+| summary: (32) expand
+|
+o changeset: 27:886ed638191b
+ parent: 21:d42a756af44d
+ user: test
+ date: Thu Jan 01 00:00:27 1970 +0000
+ summary: (27) collapse
comparing with repo2
searching for changes