| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
|
| |
This makes the changes for 1.9 brought in by
bb645f8e489b9f50cd0aec7237ec9adb721797a8
optional. If the Mercurial version is 1.9 or greater, the new code is
used. Otherwise, the old code is used.
|
|
|
|
| |
The version comparison code will be useful for all VCSs.
|
|\ |
|
| |
| |
| |
| | |
(mercurial.dispatch.dispatch() now takes a single request object with option for capturing output stream)
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
bzr uses non-numeric tags to indicate prereleases; previously, this
triggers an exception in be's Bzr module as version comparison is only
supported between version strings that only contain numbers and dots.
This patch extends version_cmp to support a single non-numeric
pre-release string of arbitrary length (e.g. 'a', 'b', 'pre', 'rc'), and
extends the docstring tests to cover this extension.
Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>
|
|/
|
|
| |
testing.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
comments.
|
|
|
|
| |
This patch is based on Julien Muchembled's pwd suggestions.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rather than guessing from the output of `bzr tags`, I actually looked
in the realease notes and tracked the removal of run_direct() to
2.2b2, which is confirmed by the r5146 patch itself:
bzr.dev $ ./bzr log -p -n 0 -r 5146 | grep -1 deprec
+
+ @deprecated_method(deprecated_in((2, 2, 0)))
def run_direct(self, *args, **kwargs):
--
+
+ @deprecated_method(deprecated_in((2, 2, 0)))
def run_direct(self, *args, **kwargs):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Bug reported by Michael Chaffin:
> C:\XXX\ZZZ>be init
> Traceback (most recent call last):
> ...
> AttributeError: 'cmd_root' object has no attribute '_operation'
Due to changes in bzrlib:
revno: 5146 [merge]
committer: Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-04-12 04:09:46 +0100
So for versions of bzr since then, we don't have to worry about
calling cleanup_now() anymore.
|
|\ |
|
| |
| |
| |
| | |
This makes be-commit act more like git-commit.
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The old version returned [] (for Darcs 2.5) on
darcs show files --no-files --patch 'Initial commit' .be
(called in `be diff` for `test_usage.sh darcs`), because darcs
returned the paths prefixed with './' (e.g. `./.be`, not `.be`). By
calculating relative paths and using the relative paths to determine
which files belong to the directory, we can handle both prefixed and
plain paths.
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Otherwise
be remove ...
blocks if it needs to remove multiple files, since
bzrlib.builtins.cmd_remove needs write locks, and the second remove
will try to aquire the lock that the first aquire hadn't released. If
we force the release, the lock will be available for the second (and
later) removal.
It's not a problem to call cleanup_now() too often, because calling it
clears the cleanup command stack, so I just added explicit cleanups
after every bzr .run() call.
|
| |
|
|
|
|
| |
The old method failed with Windows-style \r\n endlines, etc.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
The previous implementation used
cwd=path
which would fail for non-directory paths.
The implementation before that was missing the not from
if not os.path.isdir(path):
dirname = os.path.dirname(path)
which meant it found the dirname when it didn't need to, and not when
it did ;).
|
|
|
|
|
|
|
| |
I'm not sure where the dirname manipulation came from, but it
was screwing things up ;).
Also some argument order and indentation cleanups.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes Chris'
======================================================================
ERROR: Adding entries with the same ID should not increase the number
of children.
----------------------------------------------------------------------
Traceback (most recent call last):
...
CommandError: Command failed (1):
mtn: misuse: workspace required but not found
while executing
['mtn', 'automate', 'get_workspace_root']
|
| |
|
|
|
|
| |
test_get_previous_children
|
|
|
|
|
|
|
|
| |
It had been catching exceptions from ._vcs_version, but ._vcs_version
should catch its own exceptions.
Also use cached results from .version in Darcs and
Bzr.version_cmp() rather than calling ._vcs_version directly.
|
| |
|
|
|
|
|
| |
From:
http://darcs.net/manual/node7.html#env:DARCS_EMAIL
|
|
|
|
| |
Thanks to Gour for pointing out that it should.
|
| |
|
|
|
|
|
|
|
|
| |
Versus previous hardcoded "~/.bugs_everywhere".
Also improve docstrings for
* libbe.storage.util.config.path
* libbe.ui.util.user.get_user_id
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
From: Chris Ball <cjb@laptop.org>
Subject: Test suite status
...
I ran the wking@drexel.edu-20100130162439-pmh5tg6kuq92x3l5 testsuite
on Fedora 13/Rawhide. Had to downgrade Mercurial (bzr-hg doesn't
support 1.4.2 yet) and bzr (my Fedora package contained a "b4" in the
version string, which breaks libbe/storage/vcs/bzr.py:version_cmp()).
...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
From: Chris Ball <cjb@laptop.org>
Subject: Test suite status
Date: Mon, 01 Feb 2010 11:27:53 -0500
Message-id: <m38wbcor92.fsf@pullcord.laptop.org>
...
I hit the "assert len(name) > 0" in libbe/ui/util/libbe.py, coming from
hg.py when running with no ~/.hgrc. Fixed by the following patch:
=== modified file 'libbe/storage/vcs/hg.py'
--- libbe/storage/vcs/hg.py 2010-01-21 17:45:49 +0000
+++ libbe/storage/vcs/hg.py 2010-02-01 16:17:03 +0000
@@ -87,7 +87,14 @@
return tmp_stdout.getvalue().rstrip('\n')
def _vcs_get_user_id(self):
- return self._u_invoke_client('showconfig', 'ui.username')
+ output = self._u_invoke_client('showconfig', 'ui.username')
+ if output != "":
+ return output.rstrip('\n')
+ else:
+ # guess missing info
+ name = libbe.ui.util.user.get_fallback_username()
+ email = libbe.ui.util.user.get_fallback_email()
+ return libbe.ui.util.user.create_user_id(name, email)
def _vcs_detect(self, path):
"""Detect whether a directory is revision-controlled using Mercurial"""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
See: https://bugs.launchpad.net/bzr/+bug/158690
Bug affected versions:
0.90.0 (reported)
1.3.1 (my test suite hit it)
Doesn't affect versions:
2.0+ (non_recursive -> recursive)
But I haven't isolated the source more specifically.
Working around it for everything < 2.0 should be safe, but the cutoff
could be fine-tuned if someone wants to dig through the bzr.dev
history...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixed in bzr.dev
revno: 3341.2.1
revision-id: bialix@ukr.net-20080407074826-5lwuyv4dn1qlijg4
parent: pqm@pqm.ubuntu.com-20080407044456-s1a9orh0kssphdh9
committer: Alexander Belchenko <bialix@ukr.net>
branch nick: cmd-cat
timestamp: Mon 2008-04-07 10:48:26 +0300
message: `bzr cat` no more internally used Tree.print_file().
Merged into bzr.dev's trunk
revno: 3512 [merge]
revision-id: pqm@pqm.ubuntu.com-20080626004245-dnw85so4xqg8r9hy
parent: pqm@pqm.ubuntu.com-20080625230724-lyux37pu8nx8tq34
parent: aaron@aaronbentley.com-20080626001706-wo3w74fwgliy12s4
committer: Canonical.com Patch Queue Manager <pqm@pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-06-26 01:42:45 +0100
message: (bialix) Deprectate (Branch|Repository).print_file, fix cmd_cat
Before bzr branch 1.6
bzr.dev$ bzr tags
...
bzr-1.5rc1 3418.6.3
bzr-1.6 3606.5.9
...
Fixes:
python test.py -q libbe.storage.vcs.bzr
...............................FSome value:1E..
======================================================================
ERROR: Get should be able to return the previous version.
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/wking/src/fun/be/be.wtk/libbe/storage/base.py", line 976, in test_
get_previous_version
ret = self.s.get(self.id, revision=revs[i])
File "/home/wking/src/fun/be/be.wtk/libbe/storage/base.py", line 335, in get
value = self._get(*args, **kwargs)
File "/home/wking/src/fun/be/be.wtk/libbe/storage/vcs/base.py", line 849, in _
get
raise InvalidID(id, revision)
InvalidID: unlikely id in revision 1
...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
$ python test.py libbe.storage.vcs.bzr
...
======================================================================
ERROR: Children list should be revision dependent.
----------------------------------------------------------------------
Traceback (most recent call last):
File ".../libbe/storage/base.py", line 997, in test_
get_previous_children
ret = sorted(self.s.children('parent', revision=revs[i]))
File ".../libbe/storage/base.py", line 314, in child
ren
return self._children(*args, **kwargs)
File ".../libbe/storage/vcs/base.py", line 811, in _
children
path = self.path(id, revision, relpath=False)
File ".../libbe/storage/vcs/base.py", line 716, in p
ath
path = self._vcs_path(id, revision)
File ".../libbe/storage/vcs/bzr.py", line 145, in _v
cs_path
self.repo, revision=revision, recursive=True)
File ".../libbe/storage/vcs/bzr.py", line 163, in _v
cs_listdir
cmd.run(revision=revision, path=path, recursive=recursive)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 800, in ignor
e_pipe
result = func(*args, **kwargs)
TypeError: run() got an unexpected keyword argument 'recursive'
...
The change is due to (in bzr.dev):
revno: 4206.2.1
revision-id: ian.clatworthy@canonical.com-20090326133831-orvicmmc6w29mpfp
parent: pqm@pqm.ubuntu.com-20090326063330-evutyvml3067dpsz
committer: Ian Clatworthy <ian.clatworthy@canonical.com>
branch nick: bzr.ls-recursive-off
timestamp: Thu 2009-03-26 23:38:31 +1000
message: ls should be non-recursive by default
Which occured between bzr-1.9rc1 and 2.0rc1.:
bzr.dev$ bzr tags
2.0rc1 4634.9.1
...
bzr-1.9rc1 3815.3.1
bzr-2.0.1 4634.73.2
...
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes VersionedStorage_commit_TestCase.test_get_previous_children.
Should have fixed
VersionedStorage_commit_TestCase.test_get_previous_version
too, but 'tla file-find' is buggy:
https://bugs.launchpad.net/ubuntu/+source/tla/+bug/513472
Also:
* sort children in test_get_previous_children, since we shouldn't
require a particular child order
* unescape filenames in Arch._diff()
* remove debugging prints from Arch._parse_diff()
* remove silly blank line in git.py I'd stumbled across ;).
|
|
|
|
| |
Fixes VersionedStorage_changed_TestCase.test_changed failure.
|
|
|
|
|
| |
Introduced in
wking@drexel.edu-20100127152727-nu58o4g6jea5or7w
|
|\ |
|