diff options
| author | W. Trevor King <wking@drexel.edu> | 2009-07-19 10:48:12 -0400 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2009-07-19 10:48:12 -0400 |
| commit | b3ce47285a66a35904e5e50636ce471ecb4ce29d (patch) | |
| tree | 5adefc61f75a30cd31a796d4bc8fc2470e3bdb23 /libbe | |
| parent | 0baf6034dba2178f4141d3fe87d0d41061946299 (diff) | |
| download | bugseverywhere-b3ce47285a66a35904e5e50636ce471ecb4ce29d.tar.gz | |
Added becommands/commit.py and minor fixes.
Now we can commit changes from the command line with a unified
interface. The interface is much less flexible than using your
particular version control system's commit command directly, so this
command is mostly intended for user-interfaces and other tools that
don't want to be bothered with the extra flexibility.
Normalized spacing in rcs.RCS.commit to produce:
summary
<BLANKLINE>
body
<TRAILING-ENDLINE>
messages regardless of the input string format.
Also fixed a "--complete" handline bug in cmdutil, and some minor
docstring typos in libbe.rcs and .editor.
Diffstat (limited to 'libbe')
| -rw-r--r-- | libbe/cmdutil.py | 2 | ||||
| -rw-r--r-- | libbe/editor.py | 2 | ||||
| -rw-r--r-- | libbe/rcs.py | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/libbe/cmdutil.py b/libbe/cmdutil.py index 36d5d96..bba3e0e 100644 --- a/libbe/cmdutil.py +++ b/libbe/cmdutil.py @@ -163,7 +163,7 @@ def default_complete(options, args, parser, bugid_args={}): """ for option,value in option_value_pairs(options, parser): if value == "--complete": - raise cmdutil.GetCompletions() + raise GetCompletions() if len(bugid_args.keys()) > 0: max_pos_arg = max(bugid_args.keys()) else: diff --git a/libbe/editor.py b/libbe/editor.py index 5e3f9a6..93144b8 100644 --- a/libbe/editor.py +++ b/libbe/editor.py @@ -31,7 +31,7 @@ class CantFindEditor(Exception): Exception.__init__(self, "Can't find editor to get string from") def editor_string(comment=None, encoding=None): - """Invokes the editor, and returns the user_produced text as a string + """Invokes the editor, and returns the user-produced text as a string >>> if "EDITOR" in os.environ: ... del os.environ["EDITOR"] diff --git a/libbe/rcs.py b/libbe/rcs.py index 1024249..7138d01 100644 --- a/libbe/rcs.py +++ b/libbe/rcs.py @@ -201,7 +201,7 @@ class RCS(object): """ Commit the current working directory, using the contents of commitfile as the comment. Return the name of the old - revision. + revision (or None if commits are not supported). """ return None def installed(self): @@ -370,8 +370,9 @@ class RCS(object): string summary and body. Return the name of the old revision (or None if versioning is not supported). """ + summary = summary.strip() if body is not None: - summary += '\n' + body + summary += '\n\n' + body.strip() + '\n' descriptor, filename = tempfile.mkstemp() revision = None try: |