Robert Collins
robertc at robertcollins.net
Sat Oct 29 15:18:55 CDT 2005
------------------------------------------------------------
revno: 198
revision-id: robertc at robertcollins.net-20051029201852-175ac8c84b761054
parent: robertc at robertcollins.net-20051027211245-dfc7157d594714ae
parent: abentley at panoramicfeedback.com-20051027211356-0d4699554bcfbc7b
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-10-29 16:18:52 -0400
message:
merge from abentley
removed:
.bzrignore bzrignore-20050430072933-1fba2c2cbedbe7e7
__init__.py __init__.py-20050622190719-8f8857cdbb1f4d95
patches.py patches.py-20050614162304-e8ae67e7c29d3fee
shelf.py shelf.py-20050615151215-635eb76ccd7de4d1
added:
.bzrignore bzrignore-20051019101153-5d5eb01b764a7ab3
__init__.py __init__.py-20051019101947-f758f1a696725014
blackbox.py blackbox.py-20051024040435-607c5e197ca2b9d8
diffstat.py diffstat.py-20051024151608-a54f0687ba271711
hunk_selector.py hunk_selector.py-20051019101124-6aee8064c0395326
patches.py patches.py-20050525150501-f0e1e86635748af1
shelf.py shelf.py-20050525150501-c9479ac0bac3d0f6
shelf_tests.py tests.py-20051019130958-0edcded95321bddd
shell.py shell.py-20051027040441-2911d8e8e5673742
terminal.py terminal.py-20051027041425-fd236f327e614c41
modified:
INSTALL INSTALL-20050507104657-93be314e40bb52a9
push.py push.py-20050613212944-7a14fd8687480ba6
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027211356-0d4699554bcfbc7b
parent: abentley at panoramicfeedback.com-20051027205913-056a1ba7450ccad2
parent: abentley at panoramicfeedback.com-20051027151728-4c81bbe80663604c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 17:13:56 -0400
message:
Merge from mainline
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027151728-4c81bbe80663604c
parent: abentley at panoramicfeedback.com-20051027145103-f9f856a7ce4789a1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 11:17:28 -0400
message:
Enhanced shell completion
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027145103-f9f856a7ce4789a1
parent: abentley at panoramicfeedback.com-20051027144433-35196134f1cef1cf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 10:51:03 -0400
message:
Fixed system.exit printing 0 bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027144433-35196134f1cef1cf
parent: abentley at panoramicfeedback.com-20051027142609-c6fdf66ac5b86dc4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 10:44:33 -0400
message:
Added fallback to shell for lines with quotes and IO redirection
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027142609-c6fdf66ac5b86dc4
parent: abentley at panoramicfeedback.com-20051027131116-730f882183c03fe1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 10:26:09 -0400
message:
Prevented bzr's rm and ls from being invoked in the shell
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027131116-730f882183c03fe1
parent: aaron.bentley at utoronto.ca-20051027061453-3063e99e7ef854be
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 09:11:16 -0400
message:
Fixed dirctory completion in shell
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051027061453-3063e99e7ef854be
parent: aaron.bentley at utoronto.ca-20051027051916-0c47bc829ce54fdc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-27 02:14:53 -0400
message:
Got support for option completion
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051027051916-0c47bc829ce54fdc
parent: aaron.bentley at utoronto.ca-20051027044506-45f616c07537a1da
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-27 01:19:16 -0400
message:
Got command completion working
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051027044506-45f616c07537a1da
parent: aaron.bentley at utoronto.ca-20051027040517-5ba43a0b69ee0b0b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-27 00:45:06 -0400
message:
Got the shell basics working properly
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051027040517-5ba43a0b69ee0b0b
parent: abentley at panoramicfeedback.com-20051026143940-4d234a53b7d50349
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Thu 2005-10-27 00:05:17 -0400
message:
Initial import of Fai shell command
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026143940-4d234a53b7d50349
parent: abentley at panoramicfeedback.com-20051026143444-3bf99414170b7e97
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 10:39:40 -0400
message:
Renamed tests.py to shelf_tests.py
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051026143444-3bf99414170b7e97
parent: abentley at panoramicfeedback.com-20051024134844-d5800ef5213d622e
parent: michael at ellerman.id.au-20051026104538-845c51008fecc9d1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-26 10:34:44 -0400
message:
Merged shelf_v2
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026104538-845c51008fecc9d1
parent: michael at ellerman.id.au-20051026095014-6485314df5b6f284
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 20:45:38 +1000
message:
Update test with revision to actually test the shelf worked properly.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026095014-6485314df5b6f284
parent: michael at ellerman.id.au-20051026094908-ddd0626e7e5e12a1
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 19:50:14 +1000
message:
Fix shelve and unshelve to pass location to Shelf().
Fix revision handling in shelve.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026094908-ddd0626e7e5e12a1
parent: michael at ellerman.id.au-20051026094816-8441fb21a9fefce1
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 19:49:08 +1000
message:
Shelf() takes a location which specifies where to open the branch.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051026094816-8441fb21a9fefce1
parent: michael at ellerman.id.au-20051025140028-78a0a8a4cf86cf97
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 19:48:16 +1000
message:
Add (failing) tests of revision argument for shelve.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051025140028-78a0a8a4cf86cf97
parent: michael at ellerman.id.au-20051024153048-1214d3d40ad25fbb
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-26 00:00:28 +1000
message:
Remove x bit from diffstat.py
------------------------------------------------------------
merged: michael at ellerman.id.au-20051024153048-1214d3d40ad25fbb
parent: michael at ellerman.id.au-20051024153022-426a3e978c7a2a0d
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Tue 2005-10-25 01:30:48 +1000
message:
Use DiffStat rather than calling out to /bin/diffstat
------------------------------------------------------------
merged: michael at ellerman.id.au-20051024153022-426a3e978c7a2a0d
parent: michael at ellerman.id.au-20051024152943-96801381e8ca3cfe
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Tue 2005-10-25 01:30:22 +1000
message:
Make DiffStat work with bzr diff output :}
------------------------------------------------------------
merged: michael at ellerman.id.au-20051024152943-96801381e8ca3cfe
parent: michael at ellerman.id.au-20051024151633-ff7bda1c42c7bc3b
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Tue 2005-10-25 01:29:43 +1000
message:
Rename Diffstat to DiffStat, looks better :)
------------------------------------------------------------
merged: michael at ellerman.id.au-20051024151633-ff7bda1c42c7bc3b
parent: michael at ellerman.id.au-20051019135335-f8f9fa754da64acc
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Tue 2005-10-25 01:16:33 +1000
message:
Add Diffstat class to do diffstat internally.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019135335-f8f9fa754da64acc
parent: michael at ellerman.id.au-20051019133605-83ecac725f52de87
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 23:53:35 +1000
message:
- Keep our branch around, and use it directly instead of bzr_root.
- Call show_diff() on our branch directly, rather than calling run_bzr()
- Which means we don't need run_bzr() anymore.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019133605-83ecac725f52de87
parent: michael at ellerman.id.au-20051019131403-1a486e7fd9daa840
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 23:36:05 +1000
message:
Use Branch.base rather than running bzr root
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019131403-1a486e7fd9daa840
parent: michael at ellerman.id.au-20051019122916-5e6715d4b981080a
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 23:14:03 +1000
message:
Add basic tests for shelve --all, and unshelve.
Also test shelve with nothing to shelve.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019122916-5e6715d4b981080a
parent: michael at ellerman.id.au-20051019113439-193bca379eec5798
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 22:29:16 +1000
message:
Implement "bzr shelve --all".
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019113439-193bca379eec5798
parent: michael at ellerman.id.au-20051019113400-18752233d0e0f916
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 21:34:39 +1000
message:
Move all shelf functions into a class. Only logic change is we save the
bzr root dir rather than recomputing it again and again.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019113400-18752233d0e0f916
parent: michael at ellerman.id.au-20051019103816-98b14a541e362d29
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 21:34:00 +1000
message:
Add test to .bzrignore
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019103816-98b14a541e362d29
parent: michael at ellerman.id.au-20051019103416-d54f13e3a600efd8
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 20:38:16 +1000
message:
Remove support for running as an external command, plugin only now.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019103416-d54f13e3a600efd8
parent: michael at ellerman.id.au-20051019102135-591ed669b7f71d72
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 20:34:16 +1000
message:
Add plugin description
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019102135-591ed669b7f71d72
parent: michael at ellerman.id.au-20051019102001-e646913281320323
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 20:21:35 +1000
message:
Incorporate Aaron's changes from bzrtools.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019102001-e646913281320323
parent: michael at ellerman.id.au-20051019101743-8a1e9d9464db1567
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 20:20:01 +1000
message:
Add __init__.py, put cmd_shelve/unshelve in there.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019101743-8a1e9d9464db1567
parent: michael at ellerman.id.au-20051019101727-f3aafba47ad3d442
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 20:17:43 +1000
message:
Remove HunkSelector from shelf.py
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019101727-f3aafba47ad3d442
parent: michael at ellerman.id.au-20051019101233-a1dd9928d2787a0d
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 20:17:27 +1000
message:
Ignore bzrlib.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019101233-a1dd9928d2787a0d
parent: michael at ellerman.id.au-20051019101142-544d03b0b5c0cb96
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 20:12:33 +1000
message:
Make shelve & unshelve executable.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019101142-544d03b0b5c0cb96
parent: michael at ellerman.id.au-20051019093433-39720aedce6799e9
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 20:11:42 +1000
message:
Split out HunkSelector class.
------------------------------------------------------------
merged: michael at ellerman.id.au-20051019093433-39720aedce6799e9
parent: michael at concordia-20050617105735-80dc4222f01acf73
committer: Michael Ellerman <michael at ellerman.id.au>
timestamp: Wed 2005-10-19 19:34:33 +1000
message:
Upated patches.py to version from bzrtools-0.1.1
------------------------------------------------------------
merged: michael at concordia-20050617105735-80dc4222f01acf73
parent: michael at concordia-20050617003101-1d6bff2431415142
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-06-17 20:57:35 +1000
message:
Use patch -p0 not -p1 bzr diff
------------------------------------------------------------
merged: michael at concordia-20050617003101-1d6bff2431415142
parent: michael at concordia-20050617002835-41fbea2898845a9b
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-06-17 10:31:01 +1000
message:
Remove debugging printk.
------------------------------------------------------------
merged: michael at concordia-20050617002835-41fbea2898845a9b
parent: michael at concordia-20050617002035-af04ad8e68487c33
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-06-17 10:28:35 +1000
message:
Make help work properly based on options.
------------------------------------------------------------
merged: michael at concordia-20050617002035-af04ad8e68487c33
parent: michael at concordia-20050617001940-9ccb21a63a51a22d
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-06-17 10:20:35 +1000
message:
Make shelve and unshelve use new main() logic.
------------------------------------------------------------
merged: michael at concordia-20050617001940-9ccb21a63a51a22d
parent: michael at concordia-20050617001236-6fef1c2696c1cf59
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-06-17 10:19:40 +1000
message:
Move main() into shelf.py, make it choose shelfve/unshelve based on $0
------------------------------------------------------------
merged: michael at concordia-20050617001236-6fef1c2696c1cf59
parent: michael at concordia-20050617001216-66d44b8f9fbbe525
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-06-17 10:12:36 +1000
message:
Return immediately from select if there's no hunks.
------------------------------------------------------------
merged: michael at concordia-20050617001216-66d44b8f9fbbe525
parent: michael at concordia-20050617001104-114a35f1e9075623
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-06-17 10:12:16 +1000
message:
Count hunks properly.
------------------------------------------------------------
merged: michael at concordia-20050617001104-114a35f1e9075623
parent: michael at concordia-20050527101407-99f3f4212957ee7f
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-06-17 10:11:04 +1000
message:
Remove non-standard --hunks option to bzr diff
------------------------------------------------------------
merged: michael at concordia-20050527101407-99f3f4212957ee7f
parent: michael at concordia-20050527101302-aed446510387ca76
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-05-27 20:14:07 +1000
message:
Remove patches-invert.py
------------------------------------------------------------
merged: michael at concordia-20050527101302-aed446510387ca76
parent: michael at concordia-20050527000054-2f4e591471dc44f1
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-05-27 20:13:02 +1000
message:
- Make prompt code configurable
- Add prompt at end of hunks, with restart option
- On restart remember selectedness and set default option appropriately
- All patches selected by default, non undecided
------------------------------------------------------------
merged: michael at concordia-20050527000054-2f4e591471dc44f1
parent: michael at concordia-20050526120336-cd3110219cd9bf08
committer: Michael Ellerman <michael at concordia>
timestamp: Fri 2005-05-27 10:00:54 +1000
message:
Move selection code into HunkSelector class
------------------------------------------------------------
merged: michael at concordia-20050526120336-cd3110219cd9bf08
parent: michael at concordia-20050526120317-4b6a75b3a859d79c
committer: Michael Ellerman <michael at concordia>
timestamp: Thu 2005-05-26 22:03:36 +1000
message:
Add quit support to prompt
------------------------------------------------------------
merged: michael at concordia-20050526120317-4b6a75b3a859d79c
parent: michael at concordia-20050526120003-c82f10f98962ac9d
committer: Michael Ellerman <michael at concordia>
timestamp: Thu 2005-05-26 22:03:17 +1000
message:
Factor out prompting code, use getch()
------------------------------------------------------------
merged: michael at concordia-20050526120003-c82f10f98962ac9d
parent: michael at concordia-20050525150528-33fdc4603544954f
committer: Michael Ellerman <michael at concordia>
timestamp: Thu 2005-05-26 22:00:03 +1000
message:
Make shelf use -p1 for the moment
------------------------------------------------------------
merged: michael at concordia-20050525150528-33fdc4603544954f
parent: michael at concordia-20050525150508-1a4bafe21be59c70
committer: Michael Ellerman <michael at concordia>
timestamp: Thu 2005-05-26 01:05:28 +1000
message:
Add support for diff --hunks
------------------------------------------------------------
merged: michael at concordia-20050525150508-1a4bafe21be59c70
committer: Michael Ellerman <michael at concordia>
timestamp: Thu 2005-05-26 01:05:08 +1000
message:
Initial import
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024134844-d5800ef5213d622e
parent: abentley at panoramicfeedback.com-20051024133014-fef1b9cb59117324
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 09:48:44 -0400
message:
Turned overwrite into a local, not global, option
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051024133014-fef1b9cb59117324
parent: aaron.bentley at utoronto.ca-20051024045956-a6b714339c805e75
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Mon 2005-10-24 09:30:14 -0400
message:
Updated install directory
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024045956-a6b714339c805e75
parent: aaron.bentley at utoronto.ca-20051024043958-1930eb2010b70a00
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Mon 2005-10-24 00:59:56 -0400
message:
Made push self-disable when bzr has a builtin push
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024043958-1930eb2010b70a00
parent: aaron.bentley at utoronto.ca-20051024040755-2b574c6aff8ac6d2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Mon 2005-10-24 00:39:58 -0400
message:
Added tests for patch and fetch-ghosts
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024040755-2b574c6aff8ac6d2
parent: aaron.bentley at utoronto.ca-20051024001355-6b4bf80681d52f2d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Mon 2005-10-24 00:07:55 -0400
message:
Added blackbox tests for bzrtools
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20051024001355-6b4bf80681d52f2d
parent: abentley at panoramicfeedback.com-20051019201454-6bb9dca5d93af0e3
parent: abentley at lappy-20051018011544-a0752bf879920ee1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
timestamp: Sun 2005-10-23 20:13:55 -0400
message:
Merged clean-tree update
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051019201454-6bb9dca5d93af0e3
parent: abentley at panoramicfeedback.com-20051019190704-8d71f7a70bcd19c4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Wed 2005-10-19 16:14:54 -0400
message:
Fixed test case
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20051027205913-056a1ba7450ccad2
parent: aaron.bentley at utoronto.ca-20051024000803-0e9b59dee42d0460
committer: Aaron Bentley <abentley at panoramicfeedback.com>
timestamp: Thu 2005-10-27 16:59:13 -0400
message:
Removed junk file
More information about the bazaar-commits
mailing list