diff options
| author | W. Trevor King <wking@drexel.edu> | 2009-12-15 06:44:20 -0500 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2009-12-15 06:44:20 -0500 |
| commit | 89b7a1411e4658e831f5d635534b24355dbb941d (patch) | |
| tree | 77f84979931ac4bf8bcf14d293154fe29e8491bc /libbe/command/merge.py | |
| parent | 380889988b6d7881c4e0b5968053f85676d27211 (diff) | |
| download | bugseverywhere-89b7a1411e4658e831f5d635534b24355dbb941d.tar.gz | |
Fixed libbe.command.diff + ugly BugDir.duplicate_bugdir implementation
duplicate_bugdir() works, but for the vcs backends, it could require
shelling out for _every_ file read. This could, and probably will, be
horribly slow. Still it works ;).
I'm not sure what a better implementation would be. The old
implementation checked out the entire earlier state into a temporary
directory
pros: single shell out, simple upgrade implementation
cons: wouldn't work well for HTTP backens
I think a good solution would run along the lines of the currently
commented out code in duplicate_bugdir(), where a
VersionedStorage.changed_since(revision)
call would give you a list of changed files. diff could work off of
that directly, without the need to generate a whole duplicate bugdir.
I'm stuck on how to handle upgrades though...
Also removed trailing whitespace from all python files.
Diffstat (limited to 'libbe/command/merge.py')
| -rw-r--r-- | libbe/command/merge.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libbe/command/merge.py b/libbe/command/merge.py index e3bf943..447b4ae 100644 --- a/libbe/command/merge.py +++ b/libbe/command/merge.py @@ -63,8 +63,8 @@ class Merge (libbe.command.Command): Short name : abc/a Severity : minor Status : open - Assigned : - Reporter : + Assigned : + Reporter : Creator : John Doe <jdoe@example.com> Created : ... Bug A @@ -109,8 +109,8 @@ class Merge (libbe.command.Command): Short name : abc/b Severity : minor Status : closed - Assigned : - Reporter : + Assigned : + Reporter : Creator : Jane Doe <jdoe@example.com> Created : ... Bug B @@ -168,7 +168,7 @@ class Merge (libbe.command.Command): comment.storage = None comment.alt_id = comment.uuid comment.storage = bugdir.storage - comment.uuid = libbe.util.id.uuid_gen() + comment.uuid = libbe.util.id.uuid_gen() comment.save() # force onto disk under bugA for comment in newCommTree: # just the child comments |