| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|
|
|
|
|
|
|
|
| |
Protects agaist the off chance that the user doesn't have Arch (tla)
installed ;).
Changed Arch.name from "Arch" to "arch" so that each VCSs .name
matches the module name. This allows us to use vcs.VCS_ORDER (a list
of module names) to set up the allowed values of BugDir.vcs_name.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This avoids the following error:
======================================================================
ERROR: Should get file contents as committed to specified revision.
----------------------------------------------------------------------
Traceback (most recent call last):
File ".../libbe/vcs.py", line 860, in test_revision_file_contents_as_committed
full_path, revision)
File ".../libbe/vcs.py", line 339, in get_file_contents
contents = self._vcs_get_file_contents(relpath,revision,binary=binary)
File ".../libbe/darcs.py", line 122, in _vcs_get_file_contents
status,output,error = self._u_invoke(args, stdin=major_patch)
File ".../libbe/vcs.py", line 488, in _u_invoke
raise CommandError(args, status, stdout, stderr)
CommandError: Command failed (2):
patch: **** Only garbage was found in the patch input.
while executing
['patch', '--reverse', 'a/text']
After adding the unicode_output=False lines, I adjusted the
VCS._u_invoke_client() definition to pass all it's kwargs
automatically through to VCS._u_invoke(). To make this simpler and
more consistent, I renamed the "directory" option to "cwd", and
adjusted *._u_invoke() calls appropriately in several VCS backends.
|
| |
|
|
|
|
|
| |
Corrects a mistake from using string replace to move output,error ->
stdout,stderr a few commits ago.
|
| |
|
|
|
|
|
|
|
|
| |
The YAML library produces Python string encodings of unicode objects.
There's no reason to try and convert them back into Python unicode
objects just to save them with binary=False, because the files are
only read in to be passed into the YAML parser, which can handle the
unicode characters correctly.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
For self.parsed_version[0] >= 2, was returning the entire output of
._u_invoke_client() (status, output, and error). Now it just returns
the output, which is what we want. This fixes Chris' failed test:
======================================================================
FAIL: Should get file contents as committed to specified revision.
----------------------------------------------------------------------
Traceback (most recent call last):
File "libbe/vcs.py", line 852, in test_revision_file_contents_as_committed
self.test_contents['rev_1'], committed_contents)
AssertionError: 'Lorem ipsum' != (0, 'Lorem ipsum', '')
----------------------------------------------------------------------
|
|
|
|
|
|
|
| |
The version string is useful information to have around, while the
help string is probably not. For example, we use it in
darcs.Darcs._vcs_get_file_contents() to construct an incantation
appropriate to the version we're dealing with.
|
|
|
|
|
|
|
|
|
| |
*.__del__() is run some unspecified time after the refcount for an
object is reduced to zero. Sometimes that means that the rest of the
world has already been deallocated, which makes life difficult,
especially when Python won't attempt to construct stack traces inside
*.__del__(). We were always (hopefully ;) calling del(*) anyway,
so we just replace those calls with *.cleanup()
|
| |
|
|
|
|
|
|
|
|
|
| |
"comments" should always be a directory if it exists, but if it is
something else, be should fail rather than return an empty comment
list.
This fix was inspired by some browsing around in response to Thomas
Habets' version of a fix for missing "bugs" directory.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Two major benefits:
1) Programatic access to the BE version. Previously the
version-string logic was internal to the commandline interface ./be,
which left the other interfaces hanging.
2) Simple to override auto-generated revision id version with any
string you like (by setting libbe.version._VERSION, if that's the way
you want to run things or the way your packaging system requires.
Note that other modules should never read libbe.version._VERSION,
since it may not be defined. Instead they should use the output of
libbe.version.version().
|
|
|
|
| |
Also a few minor tweaks to the module imports.
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Also moved pre-YAML mapfile handling in mapfile.parse() into
upgrade.Upgrade_1_0_to_2._upgrade_mapfile().
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
Previously:
$ be init
$ be list
...
File ".../libbe/bugdir.py", line 537, in list_uuids
for uuid in os.listdir(self.get_path("bugs")):
OSError: [Errno 2] No such file or directory: '.../.be/bugs'
|
| |
|
| |
|
|
|
|
|
|
|
|
| |
Also simple_bug_dir -> SimpleBugDir class, which allows me to add
utility.Dir cleanup to SimpleBugDir.cleanup().
Still having a bit of trouble with the becommand.new tests due to
bugdir loading though...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was causing strange "RCS not found" errors in the bzr and hg
unittests. For example, the bzr tests all passed:
wking@thor:be.wtk-rr$ python test.py bzr
...
Ran 12 tests in 24.143s
OK
Except when run after the bugdir tests:
wking@thor:be.wtk-rr$ python test.py bugdir bzr
...
Ran 19 tests in 1.862s
FAILED (errors=12)
Where the failures were all
AssertionError: bzr RCS not found
Fixed by returning to intial directory after SimpleBugDirTestCase
execution. Problem is due to Python issues with unlinked directories
though, so bzr/hg will _still_ not work from unlinked directories.
This is for Python 2.5.4 on Ubuntu 8.04.3, but probably effects other
pythons too.
Details:
Isolated problem to unlinked directories:
mkdir /tmp/a
cd /tmp/a
rmdir /tmp/a
python /home/wking/src/fun/be/be.wtk-rr/test.py bzr
which fails with the same "RCS not found" errors because bzr fails:
wking@thor:/$ mkdir /tmp/a; cd /tmp/a; rmdir /tmp/a; bzr --help; cd /;
rmdir: removing directory, /tmp/a
'import site' failed; use -v for traceback
bzr: ERROR: Couldn't import bzrlib and dependencies.
Please check bzrlib is on your PYTHONPATH.
Traceback (most recent call last):
File "/usr/bin/bzr", line 64, in <module>
import bzrlib
ImportError: No module named bzrlib
which fails becase 'import site' fails:
wking@thor:/$ mkdir /tmp/a; cd /tmp/a; rmdir /tmp/a; python -c 'import site'; cd /;
rmdir: removing directory, /tmp/a
'import site' failed; use -v for traceback
Traceback (most recent call last):
File "<string>", line 1, in <module>
File "/home/wking/lib/python/site.py", line 73, in <module>
__boot()
File "/home/wking/lib/python/site.py", line 33, in __boot
imp.load_module('site',stream,path,descr)
File "/usr/lib/python2.5/site.py", line 408, in <module>
main()
File "/usr/lib/python2.5/site.py", line 392, in main
paths_in_sys = removeduppaths()
File "/usr/lib/python2.5/site.py", line 96, in removeduppaths
dir, dircase = makepath(dir)
File "/usr/lib/python2.5/site.py", line 72, in makepath
dir = os.path.abspath(os.path.join(*paths))
File "/usr/lib/python2.5/posixpath.py", line 403, in abspath
path = join(os.getcwd(), path)
OSError: [Errno 2] No such file or directory
which fails because our cwd doesn't exist. That makes sense ;).
Still I think Python should be able to handle it, so I reported it
http://bugs.python.org/issue6612
|
|
|
|
|
|
| |
I'd done this already in
wking@drexel.edu-20090723154304-swmkxpfagdzff9ai
but for some reason the merge with the email branch brought it back.
|
| |
|
| |
|
|
|
|
| |
Only increment depth if data_part != None.
|
|\ |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previously, every node in the DiffTree created it's own attachment.
Now they're consolidated into a single attachment per bug. higher
level nodes are still one attachment per node.
Also:
* added send_pgp_mime.append_text()
* pulled guess_encoding() out of send_pgp_mime.encodedMIMEText().
* renamed data_string -> data_part in libbe.diff, since it needn't be a string.
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Now change_hook properties handle defaults, which allows them to avoid
an initial
None -> default
save hook trigger.
Removed the now-redundant read-only mode business in
becommands/diff.py.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Previous comment comparison had just been the default Tree.__cmp__.
Fleshed out so A == B ensures no meaningful differences between A and B.
Also added first line of comments to new comment output in libbe.diff,
and added a comment/"settings" node and .comment_mod_string() (to
mirror bugdir and bug).
|
| |
| |
| |
| |
| |
| | |
"Author" -> comment.author obeys settings_object.setting_name_to_attr_name(),
but all the current on-disk mapfiles talk about "From". Add a hack to accept
both forms of on-disk comment files.
|
| |
| |
| |
| |
| | |
This makes repeated .report() generation from the same tree more
efficient.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
To make the interface proposed by becommands/subscribers.py easier to
implement, I've moved the libbe.diff functionality into classes. Now
it should be easy two tweak the output as desired by subclassing these
classes. The basic idea is that Diff.report_tree() generates a
diff_tree tree of changes between two bugdirs, where diff_tree is some
subclass of DiffTree. Each type of change has a default .*_string()
method producing a string summary of the change. DiffTree.report()
moves through and generates a report by joining all those summary
strings to a single root, and DiffTree.report_string() serialized the
report to produce e.g. the output of becommands/diff.py.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In BugDir, only call bug.remove if bug.sync_with_disk==True. If it's
just in memory, automatic garbage collection is sufficient cleanup.
Comment.set_sync_with_disk() had been setting .sync_with_disk=True
regardless of the value passed in. Fixed now.
Also some minor textual adjustments.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
It was too confusing having three memory access levels:
1) syncronized
2) explicit
3) memory-only
with .sync_with_disk selecting between 1 and 2/3 and ._in_memory
selecting between 2/3.
Now there are only two:
1) syncronized
2) memory-only excepting explicit BugDir.save() calls.
I avoid the problem of non-syncronized loading of on-disk bugs in
simple_bug_dir by restricting .list_uuids() to in-memory bugs when
.sync_with_disk==True.
Beyond that, I shifted the order of the BugDir methods around a bit so
that they were better grouped according to general idea.
Note that the DiskAccessRequired exceptions on filesystem access when
.sync_with_disk==False should be propogated to the Bug and Comment
methods, but I haven't done that yet.
|