Rev 1761: (jamesh,
jam) fix external_diff to support any file-like object (#4047,
#48914) in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat Jun 17 03:18:49 BST 2006
------------------------------------------------------------
revno: 1761
revision-id: pqm at pqm.ubuntu.com-20060617021848-38906188fc2a0300
parent: pqm at pqm.ubuntu.com-20060616211230-988a8faa0753cf18
parent: john at arbash-meinel.com-20060617011815-9139c00d8b51e54b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-06-17 03:18:48 +0100
message:
(jamesh, jam) fix external_diff to support any file-like object (#4047, #48914)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
------------------------------------------------------------
merged: john at arbash-meinel.com-20060617011815-9139c00d8b51e54b
parent: john at arbash-meinel.com-20060617011313-d7db423ff0485c31
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-06-16 20:18:15 -0500
message:
Use osutils.pumpfile so we don't have to buffer everything in ram
------------------------------------------------------------
merged: john at arbash-meinel.com-20060617011313-d7db423ff0485c31
parent: john at arbash-meinel.com-20060617010457-46c340d4ad593550
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-06-16 20:13:13 -0500
message:
Allow external diff to write to a file without a fileno.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060617010457-46c340d4ad593550
parent: john at arbash-meinel.com-20060616235037-6c15c8f6aa4604ef
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-06-16 20:04:57 -0500
message:
Raise NoDiff if 'diff' not present.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060616235037-6c15c8f6aa4604ef
parent: john at arbash-meinel.com-20060616234311-6d99ad31c37c92d8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-06-16 18:50:37 -0500
message:
Update news to mention fix of bugs #4047, #48914
------------------------------------------------------------
merged: john at arbash-meinel.com-20060616234311-6d99ad31c37c92d8
parent: john at arbash-meinel.com-20060616232206-e6e327272d8cab33
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-06-16 18:43:11 -0500
message:
Use mkstemp instead of NamedTemporary file for external diff.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060616232206-e6e327272d8cab33
parent: john at arbash-meinel.com-20060616183754-c15966cd121fca69
parent: james.henstridge at canonical.com-20060612151723-9957f7e258567856
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-06-16 18:22:06 -0500
message:
[merge] James Henstridge bzr.smallfixes: allow redirecting external_diff to non stdout
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060612151723-9957f7e258567856
parent: james.henstridge at canonical.com-20060608154126-37cfdf7f42c36e22
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Mon 2006-06-12 23:17:23 +0800
message:
changes suggested by John Meinel
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060608154126-37cfdf7f42c36e22
parent: james.henstridge at canonical.com-20060607045210-18864dfc0536991a
parent: pqm at pqm.ubuntu.com-20060608063832-74b46cf8fdd4567a
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Thu 2006-06-08 23:41:26 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060607045210-18864dfc0536991a
parent: james.henstridge at canonical.com-20060505073920-b9a7c8914399eb63
parent: pqm at pqm.ubuntu.com-20060606231709-6d3f204cbe17b4c6
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Wed 2006-06-07 12:52:10 +0800
message:
merge from bzr.dev
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060505073920-b9a7c8914399eb63
parent: james.henstridge at canonical.com-20060504055129-db17482da5662d69
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Fri 2006-05-05 15:39:20 +0800
message:
move external_diff imports to top of file
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060504055129-db17482da5662d69
parent: james.henstridge at canonical.com-20060503153352-8eb15d278c909d52
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Thu 2006-05-04 13:51:29 +0800
message:
remove unneeded import in test
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060503153352-8eb15d278c909d52
parent: james.henstridge at canonical.com-20060503151902-d031eacbc6c42548
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Wed 2006-05-03 23:33:52 +0800
message:
add a test for sending external diff output to a file
------------------------------------------------------------
merged: james.henstridge at canonical.com-20060503151902-d031eacbc6c42548
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: James Henstridge <james.henstridge at canonical.com>
branch nick: bzr.smallfixes (James Henstridge)
timestamp: Wed 2006-05-03 23:19:02 +0800
message:
add support for redirecting external diff output to a file descriptor
More information about the bazaar-commits
mailing list